--- old/generator.c
+++ new/generator.c
-@@ -45,6 +45,7 @@ extern int preserve_uid;
- extern int preserve_gid;
+@@ -43,6 +43,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
extern int preserve_times;
- extern int omit_dir_times;
+extern int omit_dir_changes;
+ extern int uid_ndx;
+ extern int gid_ndx;
extern int delete_mode;
- extern int delete_before;
- extern int delete_during;
-@@ -554,10 +555,11 @@ void itemize(const char *fname, struct f
- iflags |= ITEM_REPORT_TIME;
+@@ -554,6 +555,7 @@ void itemize(const char *fnamecmp, struc
+ int keep_time = !preserve_times ? 0
+ : S_ISDIR(file->mode) ? preserve_times > 1
+ : !S_ISLNK(file->mode);
++ int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
+
+ if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
+ iflags |= ITEM_REPORT_SIZE;
+@@ -569,10 +571,11 @@ void itemize(const char *fnamecmp, struc
+ #endif
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
-- if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
-+ if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid
-+ && !(omit_dir_changes && S_ISDIR(sxp->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
-- && sxp->st.st_gid != F_GID(file))
-+ if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file)
-+ && !(omit_dir_changes && S_ISDIR(sxp->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;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1193,7 +1195,7 @@ static void recv_generator(char *fname,
- statret = -1;
- new_root_dir = 0;
- }
+@@ -1288,7 +1291,7 @@ static void recv_generator(char *fname,
+ real_sx = sx;
+ 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,
}
--- old/options.c
+++ new/options.c
-@@ -55,6 +55,7 @@ int preserve_uid = 0;
+@@ -57,6 +57,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;
-@@ -317,6 +318,7 @@ void usage(enum logcode F)
+@@ -346,6 +347,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 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");
-@@ -437,6 +439,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");
+@@ -483,6 +485,7 @@ static struct poptOption long_options[]
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
+ {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
+ {"no-O", 0, POPT_ARG_VAL, &omit_dir_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 },
-@@ -1322,6 +1325,9 @@ int parse_arguments(int *argc, const cha
- "P *%s", backup_suffix);
- parse_rule(&filter_list, backup_dir_buf, 0, 0);
+@@ -1451,6 +1454,8 @@ int parse_arguments(int *argc_p, const c
+ parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
-+
-+ if (omit_dir_changes)
-+ omit_dir_times = 2;
- if (make_backups && !backup_dir)
- omit_dir_times = 1;
-@@ -1551,6 +1557,8 @@ void server_options(char **args,int *arg
++ if (omit_dir_changes)
++ omit_dir_times = 1;
+ if (make_backups && !backup_dir) {
+ omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+ if (preserve_times > 1)
+@@ -1687,6 +1692,8 @@ void server_options(char **args, int *ar
argstr[x++] = 'm';
- if (omit_dir_times == 2)
+ if (omit_dir_times)
argstr[x++] = 'O';
+ if (omit_dir_changes == 1)
+ args[ac++] = "--omit-dir-changes";
argstr[x++] = 'L';
--- old/rsync.c
+++ new/rsync.c
-@@ -36,6 +36,7 @@ extern int preserve_perms;
+@@ -34,6 +34,7 @@ extern int preserve_xattrs;
+ 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;
-@@ -275,9 +276,11 @@ int set_file_attrs(char *fname, struct f
+@@ -397,9 +398,11 @@ int set_file_attrs(const char *fname, st
updated = 1;
}
-- change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
-+ change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file)
-+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
- change_gid = preserve_gid && F_GID(file) != GID_NONE
-- && sxp->st.st_gid != F_GID(file);
-+ && sxp->st.st_gid != F_GID(file)
-+ && !(omit_dir_changes && S_ISDIR(sxp->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));
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
- if (S_ISLNK(sxp->st.st_mode))
+ if (S_ISLNK(sxp->st.st_mode)) {
;
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -349,6 +349,7 @@ to the detailed description below for a
+ -D same as --devices --specials
+ -t, --times preserve modification times
+ -O, --omit-dir-times omit directories 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
+@@ -965,6 +966,10 @@ it is preserving modification times (see
+ the directories on the receiving side, it is a good idea to use bf(-O).
+ This option is inferred if you use bf(--backup) without bf(--backup-dir).
+
++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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff