diff options
author | Wayne Davison <wayned@samba.org> | 2009-04-12 12:51:20 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2009-04-12 12:51:20 -0700 |
commit | d510e82fc6503bfb56212eda9d9b6d4d1896331a (patch) | |
tree | b274508799e2b48448ffe744bdf854ff5187e2fb | |
parent | 4e9c7fae8f6feb2fecaea811b318cf416d23dd9a (diff) | |
download | android_external_rsync-d510e82fc6503bfb56212eda9d9b6d4d1896331a.tar.gz android_external_rsync-d510e82fc6503bfb56212eda9d9b6d4d1896331a.tar.bz2 android_external_rsync-d510e82fc6503bfb56212eda9d9b6d4d1896331a.zip |
Fixed the use of --xattrs with --only-write-batch.
-rw-r--r-- | generator.c | 2 | ||||
-rw-r--r-- | receiver.c | 4 | ||||
-rw-r--r-- | sender.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/generator.c b/generator.c index 53ba16f6..f3929ed7 100644 --- a/generator.c +++ b/generator.c @@ -507,7 +507,7 @@ 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 (preserve_xattrs && !dry_run + if (preserve_xattrs && do_xfers && iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) { send_xattr_request(NULL, file, iflags & ITEM_REPORT_XATTR ? sock_f_out : -1); @@ -491,14 +491,14 @@ int recv_files(int f_in, char *local_name) rprintf(FINFO, "recv_files(%s)\n", fname); #ifdef SUPPORT_XATTRS - if (iflags & ITEM_REPORT_XATTR && !dry_run) + if (iflags & ITEM_REPORT_XATTR && do_xfers) recv_xattr_request(file, f_in); #endif if (!(iflags & ITEM_TRANSFER)) { maybe_log_item(file, iflags, itemizing, xname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) set_file_attrs(fname, file, NULL, fname, 0); #endif if (iflags & ITEM_IS_NEW) { @@ -22,7 +22,6 @@ #include "rsync.h" #include "inums.h" -extern int dry_run; extern int do_xfers; extern int am_server; extern int am_daemon; @@ -152,7 +151,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags, if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(f_out, buf, len); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) send_xattr_request(fname, file, f_out); #endif } @@ -226,7 +225,7 @@ void send_files(int f_in, int f_out) rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) recv_xattr_request(file, f_in); #endif |