./configure (optional if already run)
make
---- old/generator.c
-+++ new/generator.c
-@@ -44,6 +44,7 @@ extern int preserve_uid;
- extern int preserve_gid;
+based-on: 2ac35b45071c7bfd8be6be41bfd45326f1f57bce
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -44,6 +44,7 @@ extern int preserve_hard_links;
+ extern int preserve_executability;
+ extern int preserve_perms;
extern int preserve_times;
- extern int omit_dir_times;
+extern int omit_dir_changes;
extern int delete_mode;
extern int delete_before;
extern int delete_during;
-@@ -550,10 +551,11 @@ void itemize(struct file_struct *file, i
- iflags |= ITEM_REPORT_TIME;
- if ((unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+@@ -485,6 +486,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ const char *xname)
+ {
+ if (statret >= 0) { /* A from-dest-dir statret can == 1! */
++ int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
+ int keep_time = !preserve_times ? 0
+ : S_ISDIR(file->mode) ? preserve_times & PRESERVE_DIR_TIMES
+ : S_ISLNK(file->mode) ? preserve_times & PRESERVE_LINK_TIMES
+@@ -511,10 +513,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ } else if (preserve_executability
+ && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
iflags |= ITEM_REPORT_PERMS;
-- if (preserve_uid && am_root && F_UID(file) != st->st_uid)
-+ if (preserve_uid && am_root && F_UID(file) != st->st_uid
-+ && !(omit_dir_changes && S_ISDIR(st->st_mode)))
+- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
++ if (uid_ndx && am_root && !omit_changes
++ && (uid_t)F_OWNER(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
-- if (preserve_gid && F_GID(file) != GID_NONE
-- && st->st_gid != F_GID(file))
-+ if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file)
-+ && !(omit_dir_changes && S_ISDIR(st->st_mode)))
+- if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
+- && sxp->st.st_gid != (gid_t)F_GROUP(file))
++ if (gid_ndx && !omit_changes
++ && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
iflags |= ITEM_REPORT_GROUP;
- } else
- iflags |= ITEM_IS_NEW;
-@@ -1169,7 +1171,7 @@ static void recv_generator(char *fname,
-
- /* If we're not preserving permissions, change the file-list's
- * mode based on the local permissions and some heuristics. */
-- if (!preserve_perms) {
-+ if (!preserve_perms || (omit_dir_changes && S_ISDIR(st.st_mode))) {
- int exists = statret == 0
- && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
- file->mode = dest_mode(file->mode, st.st_mode, exists);
---- old/options.c
-+++ new/options.c
-@@ -55,6 +55,7 @@ int preserve_uid = 0;
+ #ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+@@ -1391,7 +1394,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ real_ret = statret;
+ if (file->flags & FLAG_DIR_CREATED)
+ statret = -1;
+- if (!preserve_perms) { /* See comment in non-dir code below. */
++ if (!preserve_perms || omit_dir_changes) { /* See comment in non-dir code below. */
+ file->mode = dest_mode(file->mode, sx.st.st_mode,
+ dflt_perms, statret == 0);
+ }
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -61,6 +61,7 @@ int preserve_specials = 0;
+ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
- int omit_dir_times = 0;
+int omit_dir_changes = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -309,6 +310,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");
+@@ -711,6 +712,7 @@ void usage(enum logcode F)
+ rprintf(F," -t, --times preserve modification times\n");
+ rprintf(F," -O, --omit-dir-times omit directories from --times\n");
+ rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
++ rprintf(F," --omit-dir-changes omit directories from any attribute changes\n");
rprintf(F," --super receiver attempts super-user activities\n");
- rprintf(F," -S, --sparse handle sparse files efficiently\n");
- rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -426,6 +428,7 @@ static struct poptOption long_options[]
- {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
- {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
- {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
+ #ifdef SUPPORT_XATTRS
+ rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
+@@ -873,6 +875,7 @@ static struct poptOption long_options[] = {
+ {"omit-link-times", 'J', POPT_ARG_VAL, &omit_link_times, 1, 0, 0 },
+ {"no-omit-link-times",0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
+ {"no-J", 0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
+ {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
{"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
-@@ -1286,6 +1289,9 @@ int parse_arguments(int *argc, const cha
- "P *%s", backup_suffix);
- parse_rule(&filter_list, backup_dir_buf, 0, 0);
+@@ -2157,6 +2160,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
-+
-+ if (omit_dir_changes)
-+ omit_dir_times = 2;
- if (make_backups && !backup_dir)
- omit_dir_times = 1;
-@@ -1519,6 +1525,8 @@ void server_options(char **args,int *arg
- argstr[x++] = 'm';
- if (omit_dir_times == 2)
++ if (omit_dir_changes)
++ omit_dir_times = 1;
++
+ if (preserve_times) {
+ preserve_times = PRESERVE_FILE_TIMES;
+ if (!omit_dir_times)
+@@ -2408,6 +2414,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'O';
+ if (omit_link_times)
+ argstr[x++] = 'J';
+ if (omit_dir_changes == 1)
+ args[ac++] = "--omit-dir-changes";
- } else {
- if (copy_links)
- argstr[x++] = 'L';
---- old/receiver.c
-+++ new/receiver.c
-@@ -37,6 +37,7 @@ extern int protocol_version;
- extern int relative_paths;
- extern int preserve_hard_links;
+ if (fuzzy_basis) {
+ argstr[x++] = 'y';
+ if (fuzzy_basis > 1)
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -33,6 +33,7 @@ extern int preserve_xattrs;
extern int preserve_perms;
-+extern int omit_dir_changes;
- extern int basis_dir_cnt;
- extern int make_backups;
- extern int cleanup_got_literal;
-@@ -543,7 +544,7 @@ int recv_files(int f_in, struct file_lis
-
- /* If we're not preserving permissions, change the file-list's
- * mode based on the local permissions and some heuristics. */
-- if (!preserve_perms) {
-+ if (!preserve_perms || (omit_dir_changes && S_ISDIR(st.st_mode))) {
- int exists = fd1 != -1;
- file->mode = dest_mode(file->mode, st.st_mode, exists);
- }
---- old/rsync.c
-+++ new/rsync.c
-@@ -36,6 +36,7 @@ extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
- extern int omit_dir_times;
+extern int omit_dir_changes;
extern int am_root;
extern int am_server;
- extern int am_sender;
-@@ -215,9 +216,11 @@ int set_file_attrs(char *fname, struct f
- updated = 1;
- }
+ extern int am_daemon;
+@@ -489,9 +490,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ get_acl(fname, sxp);
+ #endif
-- change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
-+ change_uid = am_root && preserve_uid && st->st_uid != F_UID(file)
-+ && !(omit_dir_changes && S_ISDIR(st->st_mode));
- change_gid = preserve_gid && F_GID(file) != GID_NONE
-- && st->st_gid != F_GID(file);
-+ && st->st_gid != F_GID(file)
-+ && !(omit_dir_changes && S_ISDIR(st->st_mode));
- #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
- if (S_ISLNK(st->st_mode))
+- change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
++ change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)
++ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
+ change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
+- && sxp->st.st_gid != (gid_t)F_GROUP(file);
++ && sxp->st.st_gid != (gid_t)F_GROUP(file)
++ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
+ #ifndef CAN_CHOWN_SYMLINK
+ if (S_ISLNK(sxp->st.st_mode)) {
;
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -374,6 +374,7 @@ to the detailed description below for a complete description. verb(
+ -t, --times preserve modification times
+ -O, --omit-dir-times omit directories from --times
+ -J, --omit-link-times omit symlinks from --times
++ --omit-dir-changes omit directories from any attribute changes
+ --super receiver attempts super-user activities
+ --fake-super store/recover privileged attrs using xattrs
+ -S, --sparse handle sparse files efficiently
+@@ -1197,6 +1198,10 @@ directories.
+ dit(bf(-J, --omit-link-times)) This tells rsync to omit symlinks when
+ it is preserving modification times (see bf(--times)).
+
++dit(bf(--omit-dir-changes)) This tells rsync to omit directories when applying
++any preserved attributes (owner, group, times, permissions) to already existing
++directories.
++
+ dit(bf(--super)) This tells the receiving side to attempt super-user
+ activities even if the receiving rsync wasn't run by the super-user. These
+ activities include: preserving users via the bf(--owner) option, preserving
git.samba.org / rsync-patches.git / blobdiff