A cuple more fixes for --xattrs combined with --backup, this time to

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index ed3db57..858305e 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -922,6 +922,7 @@ static int copy_altdest_file(const char *src, const char *dest, struct file_stru
 {
        char buf[MAXPATHLEN];
        const char *copy_to, *partialptr;
+       int save_preserve_xattrs = preserve_xattrs;
        int ok, fd_w;
 
        if (inplace) {
@@ -946,7 +947,9 @@ static int copy_altdest_file(const char *src, const char *dest, struct file_stru
                return -1;
        }
        partialptr = partial_dir ? partial_dir_fname(dest) : NULL;
+       preserve_xattrs = 0; /* xattrs were copied with file */
        ok = finish_transfer(dest, copy_to, src, partialptr, file, 1, 0);
+       preserve_xattrs = save_preserve_xattrs;
        cleanup_disable();
        return ok ? 0 : -1;
 }
@@ -1868,15 +1871,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        close(fd);
                        goto cleanup;
                }
-               if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0
-                && (errno != ENOENT || make_bak_dir(backupptr) < 0
-                 || (f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)) {
-                       rsyserr(FERROR_XFER, errno, "open %s",
-                               full_fname(backupptr));
-                       unmake_file(back_file);
-                       back_file = NULL;
-                       close(fd);
-                       goto cleanup;
+               if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
+                       int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+                       if (errno == ENOENT && make_bak_dir(backupptr) == 0) {
+                               if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)
+                                       save_errno = errno ? errno : save_errno;
+                               else
+                                       save_errno = 0;
+                       }
+                       if (save_errno) {
+                               rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(backupptr));
+                               unmake_file(back_file);
+                               back_file = NULL;
+                               close(fd);
+                               goto cleanup;
+                       }
                }
                fnamecmp_type = FNAMECMP_BACKUP;
        }
@@ -1938,9 +1947,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
   cleanup:
        if (back_file) {
+               int save_preserve_xattrs = preserve_xattrs;
                if (f_copy >= 0)
                        close(f_copy);
+#ifdef SUPPORT_XATTRS
+               if (preserve_xattrs) {
+                       copy_xattrs(fname, backupptr);
+                       preserve_xattrs = 0;
+               }
+#endif
                set_file_attrs(backupptr, back_file, NULL, NULL, 0);
+               preserve_xattrs = save_preserve_xattrs;
                if (verbose > 1) {
                        rprintf(FINFO, "backed up %s to %s\n",
                                fname, backupptr);