Matt McCutchen's Web Site / rsync / rsync-patches.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Fix alignment issue on 64-bit. Solution from Steve Ortiz.
[rsync/rsync-patches.git] / omit-dir-changes.diff
CommitLineData
59d64e0b
WD		 1This patch from Antti Tapaninen added the --omit-dir-changes option, which
2tells rsync to not affect any attributes on the directories in the transfer.
3
03019e41
WD		 4To use this patch, run these commands for a successful build:
5
6 patch -p1 <patches/omit-dir-changes.diff
7 ./configure (optional if already run)
8 make
9
c1ff70aa 10based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
cc3e685d
WD		 11diff --git a/generator.c b/generator.c
12--- a/generator.c
13+++ b/generator.c
c0c7984e 14@@ -44,6 +44,7 @@ extern int preserve_hard_links;
85096e5e 15 extern int preserve_executability;
898a2112 16 extern int preserve_perms;
59d64e0b 17 extern int preserve_times;
59d64e0b 18+extern int omit_dir_changes;
898a2112
WD		 19 extern int uid_ndx;
20 extern int gid_ndx;
59d64e0b 21 extern int delete_mode;
c1ff70aa 22@@ -436,6 +437,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
c0c7984e
WD		 23 const char *xname)
24 {
25 if (statret >= 0) { /* A from-dest-dir statret can == 1! */
eab3568b 26+ int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
c0c7984e
WD		 27 int keep_time = !preserve_times ? 0
28 : S_ISDIR(file->mode) ? preserve_times > 1 :
72e5645e 29 #ifdef CAN_SET_SYMLINK_TIMES
c1ff70aa 30@@ -465,10 +467,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
c0c7984e
WD		 31 } else if (preserve_executability
32 && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
59d64e0b 33 iflags |= ITEM_REPORT_PERMS;
898a2112
WD		 34- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
35+ if (uid_ndx && am_root && !omit_changes
19036ed8 36+ && (uid_t)F_OWNER(file) != sxp->st.st_uid)
59d64e0b 37 iflags |= ITEM_REPORT_OWNER;
898a2112 38- if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
19036ed8 39- && sxp->st.st_gid != (gid_t)F_GROUP(file))
898a2112 40+ if (gid_ndx && !omit_changes
30c5d6b4 41+ && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
59d64e0b 42 iflags |= ITEM_REPORT_GROUP;
ffc18846
WD		 43 #ifdef SUPPORT_ACLS
44 if (preserve_acls && !S_ISLNK(file->mode)) {
c1ff70aa 45@@ -1260,7 +1263,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
f2acdf8c
WD		 46 real_sx = sx;
47 if (file->flags & FLAG_DIR_CREATED)
48 statret = -1;
2f999b32
WD		 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. */
ffc18846
WD		 51 file->mode = dest_mode(file->mode, sx.st.st_mode,
52 dflt_perms, statret == 0);
2f999b32 53 }
cc3e685d
WD		 54diff --git a/options.c b/options.c
55--- a/options.c
56+++ b/options.c
c0c7984e 57@@ -59,6 +59,7 @@ int preserve_specials = 0;
a54a2c4d 58 int preserve_uid = 0;
59d64e0b
WD		 59 int preserve_gid = 0;
60 int preserve_times = 0;
59d64e0b
WD		 61+int omit_dir_changes = 0;
62 int update_only = 0;
63 int cvs_exclude = 0;
64 int dry_run = 0;
72e5645e 65@@ -699,6 +700,7 @@ void usage(enum logcode F)
59d64e0b 66 rprintf(F," -D same as --devices --specials\n");
671e613f
WD		 67 rprintf(F," -t, --times preserve modification times\n");
68 rprintf(F," -O, --omit-dir-times omit directories from --times\n");
6af518aa 69+ rprintf(F," --omit-dir-changes omit directories from any attribute changes\n");
59d64e0b 70 rprintf(F," --super receiver attempts super-user activities\n");
8f0fca7a
WD		 71 #ifdef SUPPORT_XATTRS
72 rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
72e5645e 73@@ -849,6 +851,7 @@ static struct poptOption long_options[] = {
a54a2c4d
WD		 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 },
59d64e0b
WD		 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 },
c1ff70aa 81@@ -2072,6 +2075,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
7170ca8d 82 parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
59d64e0b 83 }
59d64e0b 84
a54a2c4d
WD		 85+ if (omit_dir_changes)
86+ omit_dir_times = 1;
87 if (make_backups && !backup_dir) {
88 omit_dir_times = 0; /* Implied, so avoid -O to sender. */
89 if (preserve_times > 1)
c1ff70aa 90@@ -2315,6 +2320,8 @@ void server_options(char **args, int *argc_p)
59d64e0b 91 argstr[x++] = 'm';
a54a2c4d 92 if (omit_dir_times)
59d64e0b
WD		 93 argstr[x++] = 'O';
94+ if (omit_dir_changes == 1)
95+ args[ac++] = "--omit-dir-changes";
96 } else {
97 if (copy_links)
98 argstr[x++] = 'L';
cc3e685d
WD		 99diff --git a/rsync.c b/rsync.c
100--- a/rsync.c
101+++ b/rsync.c
fc557362 102@@ -33,6 +33,7 @@ extern int preserve_xattrs;
a54a2c4d 103 extern int preserve_perms;
59d64e0b
WD		 104 extern int preserve_executability;
105 extern int preserve_times;
59d64e0b
WD		 106+extern int omit_dir_changes;
107 extern int am_root;
108 extern int am_server;
109 extern int am_sender;
5214a41b 110@@ -505,9 +506,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
85096e5e 111 file->flags |= FLAG_TIME_FAILED;
59d64e0b
WD		 112 }
113
898a2112
WD		 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)
8f0fca7a 116+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
898a2112 117 change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
19036ed8
WD		 118- && sxp->st.st_gid != (gid_t)F_GROUP(file);
119+ && sxp->st.st_gid != (gid_t)F_GROUP(file)
8f0fca7a 120+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
59d64e0b 121 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
6af518aa 122 if (S_ISLNK(sxp->st.st_mode)) {
59d64e0b 123 ;
cc3e685d
WD		 124diff --git a/rsync.yo b/rsync.yo
125--- a/rsync.yo
126+++ b/rsync.yo
fc557362 127@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb(
6af518aa
WD		 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
7170ca8d 135@@ -1078,6 +1079,10 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
6af518aa
WD		 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).
138
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
141+directories.
142+
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
Matt McCutchen's repository for the maintained patches to rsync, the fast and versatile remote file copier