Commit | Line | Data |
---|---|---|
59d64e0b WD |
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. | |
3 | ||
03019e41 WD |
4 | To 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 | ||
59d64e0b WD |
10 | --- old/generator.c |
11 | +++ new/generator.c | |
8f0fca7a | 12 | @@ -46,6 +46,7 @@ extern int preserve_uid; |
59d64e0b WD |
13 | extern int preserve_gid; |
14 | extern int preserve_times; | |
15 | extern int omit_dir_times; | |
16 | +extern int omit_dir_changes; | |
17 | extern int delete_mode; | |
18 | extern int delete_before; | |
19 | extern int delete_during; | |
8f0fca7a | 20 | @@ -555,6 +556,7 @@ void itemize(const char *fnamecmp, struc |
eab3568b WD |
21 | int keep_time = !preserve_times ? 0 |
22 | : S_ISDIR(file->mode) ? !omit_dir_times | |
23 | : !S_ISLNK(file->mode); | |
24 | + int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode); | |
25 | ||
26 | if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) | |
27 | iflags |= ITEM_REPORT_SIZE; | |
8f0fca7a | 28 | @@ -565,10 +567,11 @@ void itemize(const char *fnamecmp, struc |
59d64e0b | 29 | iflags |= ITEM_REPORT_TIME; |
ffc18846 | 30 | if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) |
59d64e0b | 31 | iflags |= ITEM_REPORT_PERMS; |
19036ed8 | 32 | - if (preserve_uid && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) |
eab3568b | 33 | + if (preserve_uid && am_root && !omit_changes |
19036ed8 | 34 | + && (uid_t)F_OWNER(file) != sxp->st.st_uid) |
59d64e0b | 35 | iflags |= ITEM_REPORT_OWNER; |
8f0fca7a | 36 | - if (preserve_gid && !(file->flags & FLAG_SKIP_GROUP) |
19036ed8 | 37 | - && sxp->st.st_gid != (gid_t)F_GROUP(file)) |
eab3568b | 38 | + if (preserve_gid && !omit_changes |
30c5d6b4 | 39 | + && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file)) |
59d64e0b | 40 | iflags |= ITEM_REPORT_GROUP; |
ffc18846 WD |
41 | #ifdef SUPPORT_ACLS |
42 | if (preserve_acls && !S_ISLNK(file->mode)) { | |
8f0fca7a | 43 | @@ -1228,7 +1231,7 @@ static void recv_generator(char *fname, |
2f999b32 WD |
44 | statret = -1; |
45 | new_root_dir = 0; | |
46 | } | |
47 | - if (!preserve_perms) { /* See comment in non-dir code below. */ | |
48 | + if (!preserve_perms || omit_dir_changes) { /* See comment in non-dir code below. */ | |
ffc18846 WD |
49 | file->mode = dest_mode(file->mode, sx.st.st_mode, |
50 | dflt_perms, statret == 0); | |
2f999b32 | 51 | } |
59d64e0b WD |
52 | --- old/options.c |
53 | +++ new/options.c | |
8f0fca7a | 54 | @@ -56,6 +56,7 @@ int preserve_uid = 0; |
59d64e0b WD |
55 | int preserve_gid = 0; |
56 | int preserve_times = 0; | |
57 | int omit_dir_times = 0; | |
58 | +int omit_dir_changes = 0; | |
59 | int update_only = 0; | |
60 | int cvs_exclude = 0; | |
61 | int dry_run = 0; | |
8f0fca7a | 62 | @@ -336,6 +337,7 @@ void usage(enum logcode F) |
59d64e0b WD |
63 | rprintf(F," -D same as --devices --specials\n"); |
64 | rprintf(F," -t, --times preserve times\n"); | |
65 | rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); | |
66 | + rprintf(F," --omit-dir-changes omit directories when preserving any attributes\n"); | |
67 | rprintf(F," --super receiver attempts super-user activities\n"); | |
8f0fca7a WD |
68 | #ifdef SUPPORT_XATTRS |
69 | rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); | |
70 | @@ -469,6 +471,7 @@ static struct poptOption long_options[] | |
59d64e0b WD |
71 | {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, |
72 | {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, | |
73 | {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 }, | |
74 | + {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 }, | |
75 | {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, | |
76 | {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 }, | |
77 | {"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 }, | |
8f0fca7a | 78 | @@ -1397,6 +1400,9 @@ int parse_arguments(int *argc, const cha |
59d64e0b | 79 | "P *%s", backup_suffix); |
ffc18846 | 80 | parse_rule(&filter_list, backup_dir_buf, 0, 0); |
59d64e0b WD |
81 | } |
82 | + | |
83 | + if (omit_dir_changes) | |
84 | + omit_dir_times = 2; | |
85 | if (make_backups && !backup_dir) | |
86 | omit_dir_times = 1; | |
87 | ||
8f0fca7a | 88 | @@ -1626,6 +1632,8 @@ void server_options(char **args,int *arg |
59d64e0b WD |
89 | argstr[x++] = 'm'; |
90 | if (omit_dir_times == 2) | |
91 | argstr[x++] = 'O'; | |
92 | + if (omit_dir_changes == 1) | |
93 | + args[ac++] = "--omit-dir-changes"; | |
94 | } else { | |
95 | if (copy_links) | |
96 | argstr[x++] = 'L'; | |
59d64e0b WD |
97 | --- old/rsync.c |
98 | +++ new/rsync.c | |
8f0fca7a | 99 | @@ -34,6 +34,7 @@ extern int preserve_perms; |
59d64e0b WD |
100 | extern int preserve_executability; |
101 | extern int preserve_times; | |
102 | extern int omit_dir_times; | |
103 | +extern int omit_dir_changes; | |
104 | extern int am_root; | |
105 | extern int am_server; | |
106 | extern int am_sender; | |
8f0fca7a | 107 | @@ -322,9 +323,11 @@ int set_file_attrs(const char *fname, st |
59d64e0b WD |
108 | updated = 1; |
109 | } | |
110 | ||
19036ed8 WD |
111 | - change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file); |
112 | + change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file) | |
8f0fca7a WD |
113 | + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode)); |
114 | change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP) | |
19036ed8 WD |
115 | - && sxp->st.st_gid != (gid_t)F_GROUP(file); |
116 | + && sxp->st.st_gid != (gid_t)F_GROUP(file) | |
8f0fca7a | 117 | + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode)); |
59d64e0b | 118 | #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK |
ffc18846 | 119 | if (S_ISLNK(sxp->st.st_mode)) |
59d64e0b | 120 | ; |