Handle a solo_file of a directory for --delete-during.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 0ac8642..73dc163 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -697,8 +697,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
                        if (iflags & ITEM_XNAME_FOLLOWS)
                                write_vstring(sock_f_out, xname, strlen(xname));
 #ifdef SUPPORT_XATTRS
-                       if (iflags & ITEM_REPORT_XATTR && !dry_run)
-                               send_xattr_request(NULL, file, sock_f_out);
+                       if (preserve_xattrs && !dry_run
+                        && iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) {
+                               send_xattr_request(NULL, file,
+                                       iflags & ITEM_REPORT_XATTR ? sock_f_out : -1);
+                       }
 #endif
                } else if (ndx >= 0) {
                        enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
@@ -2207,7 +2210,10 @@ void generate_files(int f_out, const char *local_name)
 
                if (inc_recurse && cur_flist->parent_ndx >= 0) {
                        struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
-                       f_name(fp, fbuf);
+                       if (solo_file)
+                               strlcpy(fbuf, solo_file, sizeof fbuf);
+                       else
+                               f_name(fp, fbuf);
                        ndx = cur_flist->ndx_start - 1;
                        recv_generator(fbuf, fp, ndx, itemizing, code, f_out);
                        if (delete_during && dry_run < 2 && !list_only