1 This patch from Antti Tapaninen added the --omit-dir-changes option, which
2 tells rsync to not affect any attributes on the directories in the transfer.
4 To use this patch, run these commands for a successful build:
6 patch -p1 <patches/omit-dir-changes.diff
7 ./configure (optional if already run)
10 based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
11 diff --git a/generator.c b/generator.c
14 @@ -44,6 +44,7 @@ extern int preserve_hard_links;
15 extern int preserve_executability;
16 extern int preserve_perms;
17 extern int preserve_times;
18 +extern int omit_dir_changes;
21 extern int delete_mode;
22 @@ -436,6 +437,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
25 if (statret >= 0) { /* A from-dest-dir statret can == 1! */
26 + int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
27 int keep_time = !preserve_times ? 0
28 : S_ISDIR(file->mode) ? preserve_times > 1 :
29 #ifdef CAN_SET_SYMLINK_TIMES
30 @@ -465,10 +467,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
31 } else if (preserve_executability
32 && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
33 iflags |= ITEM_REPORT_PERMS;
34 - if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
35 + if (uid_ndx && am_root && !omit_changes
36 + && (uid_t)F_OWNER(file) != sxp->st.st_uid)
37 iflags |= ITEM_REPORT_OWNER;
38 - if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
39 - && sxp->st.st_gid != (gid_t)F_GROUP(file))
40 + if (gid_ndx && !omit_changes
41 + && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
42 iflags |= ITEM_REPORT_GROUP;
44 if (preserve_acls && !S_ISLNK(file->mode)) {
45 @@ -1260,7 +1263,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
47 if (file->flags & FLAG_DIR_CREATED)
49 - if (!preserve_perms) { /* See comment in non-dir code below. */
50 + if (!preserve_perms || omit_dir_changes) { /* See comment in non-dir code below. */
51 file->mode = dest_mode(file->mode, sx.st.st_mode,
52 dflt_perms, statret == 0);
54 diff --git a/options.c b/options.c
57 @@ -59,6 +59,7 @@ int preserve_specials = 0;
60 int preserve_times = 0;
61 +int omit_dir_changes = 0;
65 @@ -699,6 +700,7 @@ void usage(enum logcode F)
66 rprintf(F," -D same as --devices --specials\n");
67 rprintf(F," -t, --times preserve modification times\n");
68 rprintf(F," -O, --omit-dir-times omit directories from --times\n");
69 + rprintf(F," --omit-dir-changes omit directories from any attribute changes\n");
70 rprintf(F," --super receiver attempts super-user activities\n");
72 rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
73 @@ -849,6 +851,7 @@ static struct poptOption long_options[] = {
74 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
75 {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
76 {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
77 + {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 },
78 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
79 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
80 {"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
81 @@ -2072,6 +2075,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
82 parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
85 + if (omit_dir_changes)
87 if (make_backups && !backup_dir) {
88 omit_dir_times = 0; /* Implied, so avoid -O to sender. */
89 if (preserve_times > 1)
90 @@ -2315,6 +2320,8 @@ void server_options(char **args, int *argc_p)
94 + if (omit_dir_changes == 1)
95 + args[ac++] = "--omit-dir-changes";
99 diff --git a/rsync.c b/rsync.c
102 @@ -33,6 +33,7 @@ extern int preserve_xattrs;
103 extern int preserve_perms;
104 extern int preserve_executability;
105 extern int preserve_times;
106 +extern int omit_dir_changes;
108 extern int am_server;
109 extern int am_sender;
110 @@ -505,9 +506,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
111 file->flags |= FLAG_TIME_FAILED;
114 - change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
115 + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)
116 + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
117 change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
118 - && sxp->st.st_gid != (gid_t)F_GROUP(file);
119 + && sxp->st.st_gid != (gid_t)F_GROUP(file)
120 + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
121 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
122 if (S_ISLNK(sxp->st.st_mode)) {
124 diff --git a/rsync.yo b/rsync.yo
127 @@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb(
128 -D same as --devices --specials
129 -t, --times preserve modification times
130 -O, --omit-dir-times omit directories from --times
131 + --omit-dir-changes omit directories from any attribute changes
132 --super receiver attempts super-user activities
133 --fake-super store/recover privileged attrs using xattrs
134 -S, --sparse handle sparse files efficiently
135 @@ -1078,6 +1079,10 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
136 the directories on the receiving side, it is a good idea to use bf(-O).
137 This option is inferred if you use bf(--backup) without bf(--backup-dir).
139 +dit(bf(--omit-dir-changes)) This tells rsync to omit directories when applying
140 +any preserved attributes (owner, group, times, permissions) to already existing
143 dit(bf(--super)) This tells the receiving side to attempt super-user
144 activities even if the receiving rsync wasn't run by the super-user. These
145 activities include: preserving users via the bf(--owner) option, preserving