Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make get_xattr_names() even safer at fetching the list of attr names.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
33d5b94
..
7ec17b4
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-229,7
+229,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
rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR)
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR
&& !dry_run
)
recv_xattr_request(file, f_in);
#endif
recv_xattr_request(file, f_in);
#endif
@@
-265,7
+265,8
@@
void send_files(int f_in, int f_out)
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
- stats.current_file_index = ndx;
+ if (!am_server && do_progress)
+ set_current_file_index(file, ndx);
stats.num_transferred_files++;
stats.total_transferred_size += F_LENGTH(file);
stats.num_transferred_files++;
stats.total_transferred_size += F_LENGTH(file);