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 diff --git a/generator.c b/generator.c
11 index 12007a1..29c9297 100644
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 @@ -437,6 +438,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 #if defined HAVE_LUTIMES && defined HAVE_UTIMES
30 @@ -466,10 +468,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 @@ -1254,7 +1257,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
55 index e7c6c61..03588fd 100644
58 @@ -59,6 +59,7 @@ int preserve_specials = 0;
61 int preserve_times = 0;
62 +int omit_dir_changes = 0;
66 @@ -698,6 +699,7 @@ void usage(enum logcode F)
67 rprintf(F," -D same as --devices --specials\n");
68 rprintf(F," -t, --times preserve modification times\n");
69 rprintf(F," -O, --omit-dir-times omit directories from --times\n");
70 + rprintf(F," --omit-dir-changes omit directories from any attribute changes\n");
71 rprintf(F," --super receiver attempts super-user activities\n");
73 rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
74 @@ -848,6 +850,7 @@ static struct poptOption long_options[] = {
75 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
76 {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
77 {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
78 + {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 },
79 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
80 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
81 {"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
82 @@ -2020,6 +2023,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
83 parse_rule(&filter_list, backup_dir_buf, 0, 0);
86 + if (omit_dir_changes)
88 if (make_backups && !backup_dir) {
89 omit_dir_times = 0; /* Implied, so avoid -O to sender. */
90 if (preserve_times > 1)
91 @@ -2263,6 +2268,8 @@ void server_options(char **args, int *argc_p)
95 + if (omit_dir_changes == 1)
96 + args[ac++] = "--omit-dir-changes";
100 diff --git a/rsync.c b/rsync.c
101 index 2c026a2..caf3204 100644
104 @@ -33,6 +33,7 @@ extern int preserve_xattrs;
105 extern int preserve_perms;
106 extern int preserve_executability;
107 extern int preserve_times;
108 +extern int omit_dir_changes;
110 extern int am_server;
111 extern int am_sender;
112 @@ -438,9 +439,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
113 file->flags |= FLAG_TIME_FAILED;
116 - change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
117 + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)
118 + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
119 change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
120 - && sxp->st.st_gid != (gid_t)F_GROUP(file);
121 + && sxp->st.st_gid != (gid_t)F_GROUP(file)
122 + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
123 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
124 if (S_ISLNK(sxp->st.st_mode)) {
126 diff --git a/rsync.yo b/rsync.yo
127 index 941f7a5..9aef20a 100644
130 @@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb(
131 -D same as --devices --specials
132 -t, --times preserve modification times
133 -O, --omit-dir-times omit directories from --times
134 + --omit-dir-changes omit directories from any attribute changes
135 --super receiver attempts super-user activities
136 --fake-super store/recover privileged attrs using xattrs
137 -S, --sparse handle sparse files efficiently
138 @@ -1071,6 +1072,10 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
139 the directories on the receiving side, it is a good idea to use bf(-O).
140 This option is inferred if you use bf(--backup) without bf(--backup-dir).
142 +dit(bf(--omit-dir-changes)) This tells rsync to omit directories when applying
143 +any preserved attributes (owner, group, times, permissions) to already existing
146 dit(bf(--super)) This tells the receiving side to attempt super-user
147 activities even if the receiving rsync wasn't run by the super-user. These
148 activities include: preserving users via the bf(--owner) option, preserving