./configure (optional if already run)
make
-based-on: d64bda1c1e79dc385f194d74f7957ce7cd118654
+based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -44,6 +44,7 @@ extern int preserve_hard_links;
+@@ -45,6 +45,7 @@ extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_perms;
- extern int preserve_times;
+ extern int preserve_mtimes;
+extern int omit_dir_changes;
- extern int uid_ndx;
- extern int gid_ndx;
+ extern int omit_dir_times;
+ extern int omit_link_times;
extern int delete_mode;
-@@ -433,6 +434,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
-@@ -459,10 +461,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -510,6 +511,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ : S_ISDIR(file->mode) ? !omit_dir_times
+ : S_ISLNK(file->mode) ? !omit_link_times
+ : 1;
++ int omit_uid_gid = 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;
+@@ -543,9 +545,9 @@ 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 (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)
++ if (uid_ndx && !omit_uid_gid && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
-- 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))
+- if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
++ if (gid_ndx && !omit_uid_gid && !(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)) {
-@@ -1260,7 +1263,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
- real_sx = sx;
+@@ -1451,7 +1453,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);
+ file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0);
}
+ if (statret != 0 && basis_dir[0] != NULL) {
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -59,6 +59,7 @@ int preserve_specials = 0;
- int preserve_uid = 0;
- int preserve_gid = 0;
- int preserve_times = 0;
+@@ -64,6 +64,7 @@ int preserve_gid = 0;
+ int preserve_mtimes = 0;
+ int preserve_atimes = 0;
+ int preserve_crtimes = 0;
+int omit_dir_changes = 0;
- int update_only = 0;
- int cvs_exclude = 0;
- int dry_run = 0;
-@@ -701,6 +702,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");
- #ifdef SUPPORT_XATTRS
- rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
-@@ -854,6 +856,7 @@ static struct poptOption long_options[] = {
+ int omit_dir_times = 0;
+ int omit_link_times = 0;
+ int trust_sender = 0;
+@@ -646,6 +647,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 },
+ {"modify-window", '@', 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 },
-@@ -2077,6 +2080,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2302,7 +2304,7 @@ 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 = 1;
-+
- if (preserve_times) {
- preserve_times = PRESERVE_FILE_TIMES;
- if (!omit_dir_times)
-@@ -2328,6 +2334,8 @@ void server_options(char **args, int *argc_p)
- argstr[x++] = 'O';
- if (omit_link_times)
- argstr[x++] = 'J';
-+ if (omit_dir_changes == 1)
+- if (make_backups && !backup_dir)
++ if (omit_dir_changes || (make_backups && !backup_dir))
+ omit_dir_times = -1; /* Implied, so avoid -O to sender. */
+
+ if (stdout_format) {
+@@ -2815,6 +2817,8 @@ void server_options(char **args, int *argc_p)
+ args[ac++] = "--size-only";
+ if (do_stats)
+ args[ac++] = "--stats";
++ if (omit_dir_changes)
+ args[ac++] = "--omit-dir-changes";
} else {
- if (copy_links)
- argstr[x++] = 'L';
+ if (skip_compress)
+ args[ac++] = safe_arg("--skip-compress", skip_compress);
+diff --git a/rsync.1.md b/rsync.1.md
+--- a/rsync.1.md
++++ b/rsync.1.md
+@@ -427,6 +427,7 @@ has its own detailed description later in this manpage.
+ --crtimes, -N preserve create times (newness)
+ --omit-dir-times, -O omit directories from --times
+ --omit-link-times, -J 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
+ --sparse, -S turn sequences of nulls into sparse blocks
+@@ -1604,6 +1605,11 @@ expand it.
+ This tells rsync to omit symlinks when it is preserving modification,
+ access, and create times.
+
++0. `--omit-dir-changes`
++
++ This tells rsync to omit directories when applying any preserved attributes
++ (owner, group, times, permissions) to already existing directories.
++
+ 0. `--super`
+
+ This tells the receiving side to attempt super-user activities even if the
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 preserve_executability;
- extern int preserve_times;
+@@ -35,6 +35,7 @@ extern int preserve_executability;
+ extern int preserve_mtimes;
+ extern int omit_dir_times;
+ extern int omit_link_times;
+extern int omit_dir_changes;
extern int am_root;
extern int am_server;
- extern int am_sender;
-@@ -507,9 +508,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
- file->flags |= FLAG_TIME_FAILED;
- }
+ extern int am_daemon;
+@@ -490,6 +491,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ stat_x sx2;
+ int change_uid, change_gid;
+ mode_t new_mode = file->mode;
++ int omit_uid_gid;
+ int inherit;
+
+ if (!sxp) {
+@@ -520,9 +522,10 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ get_acl(fname, sxp);
+ #endif
- 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)
+- 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
++ omit_uid_gid = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
++ change_uid = am_root && !omit_uid_gid && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
++ change_gid = gid_ndx && !omit_uid_gid && !(file->flags & FLAG_SKIP_GROUP)
++ && sxp->st.st_gid != (gid_t)F_GROUP(file);
+ #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
-@@ -357,6 +357,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
-@@ -1118,6 +1119,10 @@ This option is inferred if you use bf(--backup) without bf(--backup-dir).
- 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.git / patches.git / blobdiff