./configure (optional if already run)
make
-based-on: 1e9ee19a716b72454dfeab663802c626b81cdf2e
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
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 delete_mode;
extern int delete_before;
extern int delete_during;
-@@ -481,6 +482,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -504,6 +505,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 keep_time = !preserve_times ? 0
: S_ISDIR(file->mode) ? preserve_times & PRESERVE_DIR_TIMES
: S_ISLNK(file->mode) ? preserve_times & PRESERVE_LINK_TIMES
-@@ -507,10 +509,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -541,9 +543,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 && am_root && !omit_changes && (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_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)) {
-@@ -1379,7 +1382,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1447,7 +1449,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;
+@@ -73,6 +73,7 @@ int delete_before = 0;
+ int delete_after = 0;
+ int delete_excluded = 0;
+ int remove_source_files = 0;
+int omit_dir_changes = 0;
- int update_only = 0;
- int cvs_exclude = 0;
- int dry_run = 0;
-@@ -710,6 +711,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");
-@@ -871,6 +873,7 @@ static struct poptOption long_options[] = {
+ int one_file_system = 0;
+ int protocol_version = PROTOCOL_VERSION;
+ int sparse_files = 0;
+@@ -638,6 +639,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 },
-@@ -2146,6 +2149,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2255,6 +2257,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
if (preserve_times) {
preserve_times = PRESERVE_FILE_TIMES;
if (!omit_dir_times)
-@@ -2397,6 +2403,8 @@ void server_options(char **args, int *argc_p)
+@@ -2500,6 +2505,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'O';
if (omit_link_times)
argstr[x++] = 'J';
if (fuzzy_basis) {
argstr[x++] = 'y';
if (fuzzy_basis > 1)
+diff --git a/rsync.1.md b/rsync.1.md
+--- a/rsync.1.md
++++ b/rsync.1.md
+@@ -376,6 +376,7 @@ detailed description below for a complete description.
+ --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
+@@ -1411,6 +1412,11 @@ your home directory (remove the '=' for that).
+ This tells rsync to omit symlinks when it is preserving modification times
+ (see `--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
extern int am_root;
extern int am_server;
extern int am_daemon;
-@@ -514,9 +515,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
- file->flags |= FLAG_TIME_FAILED;
- }
+@@ -519,9 +520,11 @@ 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)
#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
-@@ -371,6 +371,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
-@@ -1170,6 +1171,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-patches.git / blobdiff