From 6af518aa4bffb3514a0b430f5cd80baa0e2c2f56 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 23 Oct 2007 14:18:52 +0000 Subject: [PATCH] Mention option in the man-page. --- omit-dir-changes.diff | 47 +++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff index 05f7708..8bd9e2a 100644 --- a/omit-dir-changes.diff +++ b/omit-dir-changes.diff @@ -25,8 +25,8 @@ To use this patch, run these commands for a successful build: if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) iflags |= ITEM_REPORT_SIZE; -@@ -564,10 +566,11 @@ void itemize(const char *fnamecmp, struc - iflags |= ITEM_REPORT_TIME; +@@ -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 (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) @@ -40,7 +40,7 @@ To use this patch, run these commands for a successful build: iflags |= ITEM_REPORT_GROUP; #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { -@@ -1246,7 +1249,7 @@ static void recv_generator(char *fname, +@@ -1288,7 +1291,7 @@ static void recv_generator(char *fname, real_sx = sx; if (file->flags & FLAG_DIR_CREATED) statret = -1; @@ -51,7 +51,7 @@ To use this patch, run these commands for a successful build: } --- old/options.c +++ new/options.c -@@ -56,6 +56,7 @@ int preserve_specials = 0; +@@ -57,6 +57,7 @@ int preserve_specials = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; @@ -59,15 +59,15 @@ To use this patch, run these commands for a successful build: int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -345,6 +346,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 modification times\n"); rprintf(F," -O, --omit-dir-times omit directories from --times\n"); -+ rprintf(F," --omit-dir-changes omit directories any attribute changes\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"); -@@ -482,6 +484,7 @@ static struct poptOption long_options[] +@@ -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 }, @@ -75,8 +75,8 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1446,6 +1449,8 @@ int parse_arguments(int *argc_p, const c - 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) @@ -84,7 +84,7 @@ To use this patch, run these commands for a successful build: if (make_backups && !backup_dir) { omit_dir_times = 0; /* Implied, so avoid -O to sender. */ if (preserve_times > 1) -@@ -1681,6 +1686,8 @@ void server_options(char **args, int *ar +@@ -1687,6 +1692,8 @@ void server_options(char **args, int *ar argstr[x++] = 'm'; if (omit_dir_times) argstr[x++] = 'O'; @@ -95,7 +95,7 @@ To use this patch, run these commands for a successful build: argstr[x++] = 'L'; --- old/rsync.c +++ new/rsync.c -@@ -33,6 +33,7 @@ extern int preserve_xattrs; +@@ -34,6 +34,7 @@ extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; @@ -103,7 +103,7 @@ To use this patch, run these commands for a successful build: extern int am_root; extern int am_server; extern int am_sender; -@@ -327,9 +328,11 @@ int set_file_attrs(const char *fname, st +@@ -397,9 +398,11 @@ int set_file_attrs(const char *fname, st updated = 1; } @@ -115,5 +115,26 @@ To use this patch, run these commands for a successful build: + && 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 -- 2.34.1