Fixed several issues with preserving xattrs when using --backup.

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index a92b2a6..c3f66eb 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -2,7 +2,7 @@
  * Backup handling code.
  *
  * Copyright (C) 1999 Andrew Tridgell
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 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
@@ -97,7 +97,7 @@ int make_bak_dir(const char *fullpath)
        char fbuf[MAXPATHLEN], *rel, *end, *p;
        struct file_struct *file;
        int len = backup_dir_len;
-       statx sx;
+       stat_x sx;
 
        while (*fullpath == '.' && fullpath[1] == '/') {
                fullpath += 2;
@@ -180,10 +180,19 @@ int make_bak_dir(const char *fullpath)
 /* robustly move a file, creating new directory structures if necessary */
 static int robust_move(const char *src, char *dst)
 {
-       if (robust_rename(src, dst, NULL, 0755) < 0
-        && (errno != ENOENT || make_bak_dir(dst) < 0
-         || robust_rename(src, dst, NULL, 0755) < 0))
-               return -1;
+       if (robust_rename(src, dst, NULL, 0755) < 0) {
+               int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+               if (errno == ENOENT && make_bak_dir(dst) == 0) {
+                       if (robust_rename(src, dst, NULL, 0755) < 0)
+                               save_errno = errno ? errno : save_errno;
+                       else
+                               save_errno = 0;
+               }
+               if (save_errno) {
+                       errno = save_errno;
+                       return -1;
+               }
+       }
        return 0;
 }
 
@@ -192,9 +201,10 @@ static int robust_move(const char *src, char *dst)
  * We will move the file to be deleted into a parallel directory tree. */
 static int keep_backup(const char *fname)
 {
-       statx sx;
+       stat_x sx;
        struct file_struct *file;
        char *buf;
+       int save_preserve_xattrs = preserve_xattrs;
        int kept = 0;
        int ret_code;
 
@@ -237,11 +247,18 @@ static int keep_backup(const char *fname)
                uint32 *devp = F_RDEV_P(file);
                dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
                do_unlink(buf);
-               if (do_mknod(buf, file->mode, rdev) < 0
-                   && (errno != ENOENT || make_bak_dir(buf) < 0
-                    || do_mknod(buf, file->mode, rdev) < 0)) {
-                       rsyserr(FERROR, errno, "mknod %s failed",
-                               full_fname(buf));
+               if (do_mknod(buf, file->mode, rdev) < 0) {
+                       int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+                       if (errno == ENOENT && make_bak_dir(buf) == 0) {
+                               if (do_mknod(buf, file->mode, rdev) < 0)
+                                       save_errno = errno ? errno : save_errno;
+                               else
+                                       save_errno = 0;
+                       }
+                       if (save_errno) {
+                               rsyserr(FERROR, save_errno, "mknod %s failed",
+                                       full_fname(buf));
+                       }
                } else if (verbose > 2) {
                        rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
                                fname);
@@ -252,11 +269,18 @@ static int keep_backup(const char *fname)
 
        if (!kept && S_ISDIR(file->mode)) {
                /* make an empty directory */
-               if (do_mkdir(buf, file->mode) < 0
-                   && (errno != ENOENT || make_bak_dir(buf) < 0
-                    || do_mkdir(buf, file->mode) < 0)) {
-                       rsyserr(FINFO, errno, "mkdir %s failed",
-                               full_fname(buf));
+               if (do_mkdir(buf, file->mode) < 0) {
+                       int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+                       if (errno == ENOENT && make_bak_dir(buf) == 0) {
+                               if (do_mkdir(buf, file->mode) < 0)
+                                       save_errno = errno ? errno : save_errno;
+                               else
+                                       save_errno = 0;
+                       }
+                       if (save_errno) {
+                               rsyserr(FINFO, save_errno, "mkdir %s failed",
+                                       full_fname(buf));
+                       }
                }
 
                ret_code = do_rmdir(fname);
@@ -278,11 +302,18 @@ static int keep_backup(const char *fname)
                        kept = 1;
                } else {
                        do_unlink(buf);
-                       if (do_symlink(sl, buf) < 0
-                           && (errno != ENOENT || make_bak_dir(buf) < 0
-                            || do_symlink(sl, buf) < 0)) {
-                               rsyserr(FERROR, errno, "link %s -> \"%s\"",
-                                       full_fname(buf), sl);
+                       if (do_symlink(sl, buf) < 0) {
+                               int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+                               if (errno == ENOENT && make_bak_dir(buf) == 0) {
+                                       if (do_symlink(sl, buf) < 0)
+                                               save_errno = errno ? errno : save_errno;
+                                       else
+                                               save_errno = 0;
+                               }
+                               if (save_errno) {
+                                       rsyserr(FERROR, save_errno, "link %s -> \"%s\"",
+                                               full_fname(buf), sl);
+                               }
                        }
                        do_unlink(fname);
                        kept = 1;
@@ -308,7 +339,9 @@ static int keep_backup(const char *fname)
                        robust_unlink(fname); /* Just in case... */
                }
        }
+       preserve_xattrs = 0;
        set_file_attrs(buf, file, NULL, fname, 0);
+       preserve_xattrs = save_preserve_xattrs;
        unmake_file(file);
 
        if (verbose > 1) {