extern int uid_ndx;
extern int gid_ndx;
extern int delete_mode;
-@@ -555,6 +556,7 @@ void itemize(const char *fnamecmp, struc
+@@ -556,6 +557,7 @@ void itemize(const char *fnamecmp, struc
int keep_time = !preserve_times ? 0
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
iflags |= ITEM_REPORT_SIZE;
-@@ -565,10 +567,11 @@ void itemize(const char *fnamecmp, struc
+@@ -566,10 +568,11 @@ void itemize(const char *fnamecmp, struc
iflags |= ITEM_REPORT_TIME;
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1228,7 +1231,7 @@ static void recv_generator(char *fname,
+@@ -1229,7 +1232,7 @@ static void recv_generator(char *fname,
statret = -1;
new_root_dir = 0;
}
int dry_run = 0;
@@ -337,6 +338,7 @@ void usage(enum logcode F)
rprintf(F," -D same as --devices --specials\n");
- rprintf(F," -t, --times preserve times\n");
- rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
-+ rprintf(F," --omit-dir-changes omit directories when preserving any attributes\n");
+ rprintf(F," -t, --times preserve modification times\n");
+ rprintf(F," -O, --omit-dir-times omit directories from --times\n");
++ rprintf(F," --omit-dir-changes omit directories any attribute changes\n");
rprintf(F," --super receiver attempts super-user activities\n");
#ifdef SUPPORT_XATTRS
rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
extern int am_root;
extern int am_server;
extern int am_sender;
-@@ -326,9 +327,11 @@ int set_file_attrs(const char *fname, st
+@@ -325,9 +326,11 @@ int set_file_attrs(const char *fname, st
updated = 1;
}