Restored write_ndx_and_attrs() and made it public.

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index 11011cf..2ca53fa 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -1,27 +1,27 @@
 /*
-   Copyright (C) Andrew Tridgell 1999
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* backup handling code */
+ * Backup handling code.
+ *
+ * Copyright (C) 1999 Andrew Tridgell
+ * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #include "rsync.h"
 
 extern int verbose;
-extern int backup_suffix_len;
 extern int backup_dir_len;
 extern unsigned int backup_dir_remainder;
 extern char backup_dir_buf[MAXPATHLEN];
@@ -32,12 +32,10 @@ extern int am_root;
 extern int preserve_devices;
 extern int preserve_specials;
 extern int preserve_links;
-extern int preserve_hard_links;
-extern int orig_umask;
 extern int safe_symlinks;
 
 /* make a complete pathname for backup file */
-char *get_backup_name(char *fname)
+char *get_backup_name(const char *fname)
 {
        if (backup_dir) {
                if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
@@ -54,10 +52,10 @@ char *get_backup_name(char *fname)
 }
 
 /* simple backup creates a backup with a suffix in the same directory */
-static int make_simple_backup(char *fname)
+static int make_simple_backup(const char *fname)
 {
        int rename_errno;
-       char *fnamebak = get_backup_name(fname);
+       const char *fnamebak = get_backup_name(fname);
 
        if (!fnamebak)
                return 0;
@@ -112,7 +110,7 @@ static int make_bak_dir(char *fullpath)
                }
                if (*p == '/') {
                        *p = '\0';
-                       if (do_mkdir(fullpath, 0777 & ~orig_umask) == 0)
+                       if (mkdir_defmode(fullpath) == 0)
                                break;
                        if (errno != ENOENT) {
                                rsyserr(FERROR, errno,
@@ -134,14 +132,16 @@ static int make_bak_dir(char *fullpath)
                                        full_fname(rel));
                        } else {
                                do_lchown(fullpath, st.st_uid, st.st_gid);
+#ifdef HAVE_CHMOD
                                do_chmod(fullpath, st.st_mode);
+#endif
                        }
                }
                *p = '/';
                p += strlen(p);
                if (p == end)
                        break;
-               if (do_mkdir(fullpath, 0777 & ~orig_umask) < 0) {
+               if (mkdir_defmode(fullpath) < 0) {
                        rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
                                full_fname(fullpath));
                        goto failure;
@@ -158,10 +158,11 @@ static int make_bak_dir(char *fullpath)
 }
 
 /* robustly move a file, creating new directory structures if necessary */
-static int robust_move(char *src, char *dst)
+static int robust_move(const char *src, char *dst)
 {
-       if (robust_rename(src, dst, 0755) < 0 && (errno != ENOENT
-           || make_bak_dir(dst) < 0 || robust_rename(src, dst, 0755) < 0))
+       if (robust_rename(src, dst, NULL, 0755) < 0
+        && (errno != ENOENT || make_bak_dir(dst) < 0
+         || robust_rename(src, dst, NULL, 0755) < 0))
                return -1;
        return 0;
 }
@@ -169,7 +170,7 @@ static int robust_move(char *src, char *dst)
 
 /* If we have a --backup-dir, then we get here from make_backup().
  * We will move the file to be deleted into a parallel directory tree. */
-static int keep_backup(char *fname)
+static int keep_backup(const char *fname)
 {
        STRUCT_STAT st;
        struct file_struct *file;
@@ -261,7 +262,7 @@ static int keep_backup(char *fname)
                        robust_unlink(fname); /* Just in case... */
                }
        }
-       set_perms(buf, file, NULL, 0);
+       set_file_attrs(buf, file, NULL, 0);
        free(file);
 
        if (verbose > 1) {
@@ -273,7 +274,7 @@ static int keep_backup(char *fname)
 
 
 /* main backup switch routine */
-int make_backup(char *fname)
+int make_backup(const char *fname)
 {
        if (backup_dir)
                return keep_backup(fname);