Call mkdir_defmode() instead of do_mkdir().

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index 11011cf..1e6b915 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -33,7 +33,6 @@ 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 */
@@ -112,7 +111,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,
@@ -141,7 +140,7 @@ static int make_bak_dir(char *fullpath)
                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;
@@ -160,8 +159,9 @@ 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)
 {
-       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;
 }
@@ -261,7 +261,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) {