./configure (optional if already run)
make
-based-on: a3377921ebe651cb7d2b969853cb9fe0e135ff75
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
extern int delete_mode;
extern int delete_before;
extern int delete_during;
-@@ -491,6 +492,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
-@@ -520,10 +522,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)) {
-@@ -1408,7 +1411,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
-@@ -75,6 +75,7 @@ int delete_before = 0;
+@@ -73,6 +73,7 @@ int delete_before = 0;
int delete_after = 0;
int delete_excluded = 0;
int remove_source_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
-@@ -775,6 +776,7 @@ void usage(enum logcode F)
- rprintf(F," --open-noatime avoid changing the atime on opened files\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");
-@@ -947,6 +949,7 @@ static struct poptOption long_options[] = {
+@@ -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 },
{"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 },
-@@ -2349,6 +2352,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)
-@@ -2601,6 +2607,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';
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -371,6 +371,7 @@ detailed description below for a complete description.
- --open-noatime avoid changing the atime on opened files
- --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
-@@ -1354,6 +1355,11 @@ your home directory (remove the '=' for that).
+@@ -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`).
extern int am_root;
extern int am_server;
extern int am_daemon;
-@@ -505,9 +506,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -519,9 +520,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
get_acl(fname, sxp);
#endif
git.samba.org / rsync-patches.git / blobdiff