Commit | Line | Data |
---|---|---|
31611b92 | 1 | This patch provides --flags, which preserves the st_flags field. |
9f62ddf8 | 2 | Modified from a patch that was written by Rolf Grossmann. |
31611b92 | 3 | |
03019e41 | 4 | To use this patch, run these commands for a successful build: |
9f62ddf8 | 5 | |
03019e41 | 6 | patch -p1 <patches/flags.diff |
9f62ddf8 WD |
7 | ./prepare-source |
8 | ./configure | |
9 | make | |
31611b92 | 10 | |
5bafda30 WD |
11 | TODO: fix --delete-delay to work with --flags option. |
12 | ||
31611b92 WD |
13 | --- old/configure.in |
14 | +++ new/configure.in | |
f813befd | 15 | @@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd |
31611b92 WD |
16 | memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \ |
17 | strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ | |
18 | setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ | |
19 | - strerror putenv iconv_open locale_charset nl_langinfo \ | |
20 | + chflags strerror putenv iconv_open locale_charset nl_langinfo \ | |
21 | sigaction sigprocmask) | |
22 | ||
23 | AC_CHECK_FUNCS(getpgrp tcgetpgrp) | |
24 | --- old/flist.c | |
25 | +++ new/flist.c | |
1898c899 | 26 | @@ -44,6 +44,7 @@ extern int preserve_links; |
31611b92 WD |
27 | extern int preserve_hard_links; |
28 | extern int preserve_devices; | |
29 | extern int preserve_specials; | |
5e3c6c93 | 30 | +extern int preserve_fileflags; |
31611b92 WD |
31 | extern int preserve_uid; |
32 | extern int preserve_gid; | |
33 | extern int relative_paths; | |
1aa236e1 | 34 | @@ -312,6 +313,9 @@ static void send_file_entry(struct file_ |
31611b92 WD |
35 | unsigned short flags; |
36 | static time_t modtime; | |
37 | static mode_t mode; | |
38 | +#ifdef SUPPORT_FLAGS | |
39 | + static uint32 fileflags; | |
40 | +#endif | |
41 | static int64 dev; | |
42 | static dev_t rdev; | |
43 | static uint32 rdev_major; | |
1aa236e1 | 44 | @@ -342,6 +346,12 @@ static void send_file_entry(struct file_ |
31611b92 WD |
45 | flags |= XMIT_SAME_MODE; |
46 | else | |
47 | mode = file->mode; | |
48 | +#ifdef SUPPORT_FLAGS | |
49 | + if (file->fileflags == fileflags) | |
50 | + flags |= XMIT_SAME_FLAGS; | |
51 | + else | |
52 | + fileflags = file->fileflags; | |
53 | +#endif | |
54 | if ((preserve_devices && IS_DEVICE(mode)) | |
55 | || (preserve_specials && IS_SPECIAL(mode))) { | |
56 | if (protocol_version < 28) { | |
1aa236e1 | 57 | @@ -428,6 +438,10 @@ static void send_file_entry(struct file_ |
31611b92 WD |
58 | write_int(f, modtime); |
59 | if (!(flags & XMIT_SAME_MODE)) | |
60 | write_int(f, to_wire_mode(mode)); | |
61 | +#ifdef SUPPORT_FLAGS | |
5e3c6c93 | 62 | + if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) |
31611b92 WD |
63 | + write_int(f, (int)fileflags); |
64 | +#endif | |
65 | if (preserve_uid && !(flags & XMIT_SAME_UID)) { | |
66 | if (!numeric_ids) | |
67 | add_uid(uid); | |
1aa236e1 | 68 | @@ -496,6 +510,9 @@ static struct file_struct *recv_file_ent |
31611b92 WD |
69 | { |
70 | static time_t modtime; | |
71 | static mode_t mode; | |
72 | +#ifdef SUPPORT_FLAGS | |
73 | + static uint32 fileflags; | |
74 | +#endif | |
75 | static int64 dev; | |
76 | static dev_t rdev; | |
77 | static uint32 rdev_major; | |
1aa236e1 | 78 | @@ -570,9 +587,12 @@ static struct file_struct *recv_file_ent |
31611b92 WD |
79 | modtime = (time_t)read_int(f); |
80 | if (!(flags & XMIT_SAME_MODE)) | |
81 | mode = from_wire_mode(read_int(f)); | |
82 | - | |
83 | if (chmod_modes && !S_ISLNK(mode)) | |
84 | mode = tweak_mode(mode, chmod_modes); | |
85 | +#ifdef SUPPORT_FLAGS | |
5e3c6c93 | 86 | + if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) |
31611b92 WD |
87 | + fileflags = (uint32)read_int(f); |
88 | +#endif | |
89 | ||
90 | if (preserve_uid && !(flags & XMIT_SAME_UID)) | |
91 | uid = (uid_t)read_int(f); | |
1aa236e1 WD |
92 | @@ -650,6 +670,10 @@ static struct file_struct *recv_file_ent |
93 | OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); | |
94 | } | |
31611b92 WD |
95 | file->mode = mode; |
96 | +#ifdef SUPPORT_FLAGS | |
70891d26 WD |
97 | + if (preserve_fileflags) |
98 | + F_FFLAGS(file) = fileflags; | |
31611b92 | 99 | +#endif |
70891d26 WD |
100 | if (preserve_uid) |
101 | F_UID(file) = uid; | |
102 | if (preserve_gid) | |
1aa236e1 WD |
103 | @@ -926,6 +950,10 @@ struct file_struct *make_file(const char |
104 | OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); | |
105 | } | |
31611b92 WD |
106 | file->mode = st.st_mode; |
107 | +#ifdef SUPPORT_FLAGS | |
70891d26 WD |
108 | + if (preserve_fileflags) |
109 | + F_FFLAGS(file) = st.st_flags; | |
31611b92 | 110 | +#endif |
70891d26 WD |
111 | if (preserve_uid) |
112 | F_UID(file) = st.st_uid; | |
113 | if (preserve_gid) | |
31611b92 WD |
114 | --- old/generator.c |
115 | +++ new/generator.c | |
1aa236e1 | 116 | @@ -99,6 +99,12 @@ int non_perishable_cnt = 0; |
87d0091c | 117 | static int deletion_count = 0; /* used to implement --max-delete */ |
f813befd | 118 | static FILE *delete_delay_fp = NULL; |
f90a882e WD |
119 | |
120 | +#ifdef SUPPORT_FLAGS | |
121 | +#define FILEFLAGS(ff) ff | |
122 | +#else | |
123 | +#define FILEFLAGS(ff) 0 | |
124 | +#endif | |
125 | + | |
d16b5fd6 | 126 | /* For calling delete_item() and delete_dir_contents(). */ |
87d0091c | 127 | #define DEL_RECURSE (1<<1) /* recurse */ |
d16b5fd6 | 128 | #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ |
1aa236e1 | 129 | @@ -114,7 +120,6 @@ enum delret { |
87d0091c WD |
130 | /* Forward declaration for delete_item(). */ |
131 | static enum delret delete_dir_contents(char *fname, int flags); | |
f90a882e | 132 | |
87d0091c WD |
133 | - |
134 | static int is_backup_file(char *fn) | |
135 | { | |
136 | int k = strlen(fn) - backup_suffix_len; | |
1aa236e1 | 137 | @@ -127,17 +132,20 @@ static int is_backup_file(char *fn) |
f813befd | 138 | * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's |
f90a882e WD |
139 | * a directory! (The buffer is used for recursion, but returned unchanged.) |
140 | */ | |
f813befd WD |
141 | -static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) |
142 | +static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags) | |
f90a882e | 143 | { |
87d0091c WD |
144 | enum delret ret; |
145 | char *what; | |
146 | int ok; | |
147 | ||
148 | if (verbose > 2) { | |
149 | - rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", | |
f813befd | 150 | - fbuf, mode, flags); |
87d0091c | 151 | + rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n", |
f813befd | 152 | + fbuf, mode, fileflags, flags); |
87d0091c WD |
153 | } |
154 | ||
31611b92 | 155 | +#ifdef SUPPORT_FLAGS |
f813befd | 156 | + make_mutable(fbuf, mode, fileflags); |
31611b92 | 157 | +#endif |
d16b5fd6 WD |
158 | if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { |
159 | ignore_perishable = 1; | |
160 | /* If DEL_RECURSE is not set, this just reports emptiness. */ | |
1aa236e1 | 161 | @@ -249,7 +257,7 @@ static enum delret delete_dir_contents(c |
d16b5fd6 WD |
162 | if (S_ISDIR(fp->mode) |
163 | && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) | |
164 | ret = DR_NOT_EMPTY; | |
165 | - if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) | |
166 | + if (delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags) != DR_SUCCESS) | |
167 | ret = DR_NOT_EMPTY; | |
f90a882e | 168 | } |
d16b5fd6 | 169 | |
1aa236e1 | 170 | @@ -401,10 +409,10 @@ static void delete_in_dir(struct file_li |
87d0091c | 171 | } |
f90a882e WD |
172 | if (flist_find(flist, fp) < 0) { |
173 | f_name(fp, delbuf); | |
f813befd WD |
174 | - if (delete_delay_fp) |
175 | + if (delete_delay_fp) /* XXX need to output fileflags value here too */ | |
5bafda30 | 176 | fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0'); |
f813befd WD |
177 | else |
178 | - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); | |
179 | + delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE); | |
f90a882e WD |
180 | } |
181 | } | |
182 | ||
1aa236e1 | 183 | @@ -1099,7 +1107,7 @@ static void recv_generator(char *fname, |
0461b869 | 184 | * we need to delete it. If it doesn't exist, then |
f90a882e WD |
185 | * (perhaps recursively) create it. */ |
186 | if (statret == 0 && !S_ISDIR(st.st_mode)) { | |
87d0091c WD |
187 | - if (delete_item(fname, st.st_mode, "directory", del_opts) != 0) |
188 | + if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "directory", del_opts) != 0) | |
f90a882e WD |
189 | return; |
190 | statret = -1; | |
191 | } | |
1aa236e1 | 192 | @@ -1193,7 +1201,7 @@ static void recv_generator(char *fname, |
f90a882e WD |
193 | } |
194 | /* Not the right symlink (or not a symlink), so | |
195 | * delete it. */ | |
87d0091c WD |
196 | - if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0) |
197 | + if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "symlink", del_opts) != 0) | |
f90a882e | 198 | return; |
05031682 WD |
199 | } else if (basis_dir[0] != NULL) { |
200 | int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, | |
1aa236e1 | 201 | @@ -1265,7 +1273,7 @@ static void recv_generator(char *fname, |
05031682 WD |
202 | goto return_with_success; |
203 | return; | |
204 | } | |
87d0091c WD |
205 | - if (delete_item(fname, st.st_mode, t, del_opts) != 0) |
206 | + if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), t, del_opts) != 0) | |
f90a882e | 207 | return; |
05031682 WD |
208 | } else if (basis_dir[0] != NULL) { |
209 | int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, | |
1aa236e1 | 210 | @@ -1351,7 +1359,7 @@ static void recv_generator(char *fname, |
f90a882e WD |
211 | fnamecmp_type = FNAMECMP_FNAME; |
212 | ||
213 | if (statret == 0 && !S_ISREG(st.st_mode)) { | |
87d0091c WD |
214 | - if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0) |
215 | + if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "regular file", del_opts) != 0) | |
f90a882e WD |
216 | return; |
217 | statret = -1; | |
218 | stat_errno = ENOENT; | |
31611b92 WD |
219 | --- old/options.c |
220 | +++ new/options.c | |
1898c899 | 221 | @@ -48,6 +48,7 @@ int copy_links = 0; |
31611b92 WD |
222 | int preserve_links = 0; |
223 | int preserve_hard_links = 0; | |
224 | int preserve_perms = 0; | |
5e3c6c93 | 225 | +int preserve_fileflags = 0; |
31611b92 WD |
226 | int preserve_executability = 0; |
227 | int preserve_devices = 0; | |
228 | int preserve_specials = 0; | |
03019e41 | 229 | @@ -201,6 +202,7 @@ static void print_rsync_version(enum log |
31611b92 WD |
230 | char const *hardlinks = "no "; |
231 | char const *links = "no "; | |
232 | char const *ipv6 = "no "; | |
5e3c6c93 | 233 | + char const *fileflags = "no "; |
31611b92 WD |
234 | STRUCT_STAT *dumstat; |
235 | ||
236 | #ifdef HAVE_SOCKETPAIR | |
03019e41 | 237 | @@ -223,6 +225,10 @@ static void print_rsync_version(enum log |
31611b92 WD |
238 | ipv6 = ""; |
239 | #endif | |
240 | ||
241 | +#ifdef SUPPORT_FLAGS | |
5e3c6c93 | 242 | + fileflags = ""; |
31611b92 WD |
243 | +#endif |
244 | + | |
245 | rprintf(f, "%s version %s protocol version %d\n", | |
246 | RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); | |
247 | rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); | |
5e3c6c93 WD |
248 | @@ -233,8 +239,8 @@ static void print_rsync_version(enum log |
249 | (int)(sizeof (int64) * 8)); | |
250 | rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", | |
251 | got_socketpair, hardlinks, links, ipv6, have_inplace); | |
252 | - rprintf(f, " %sappend\n", | |
253 | - have_inplace); | |
254 | + rprintf(f, " %sappend, %sfile-flags\n", | |
255 | + have_inplace, fileflags); | |
256 | ||
31611b92 | 257 | #ifdef MAINTAINER_MODE |
5e3c6c93 WD |
258 | rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); |
259 | @@ -300,6 +306,7 @@ void usage(enum logcode F) | |
31611b92 WD |
260 | rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); |
261 | rprintf(F," -H, --hard-links preserve hard links\n"); | |
262 | rprintf(F," -p, --perms preserve permissions\n"); | |
5e3c6c93 | 263 | + rprintf(F," --fileflags preserve file-flags\n"); |
31611b92 | 264 | rprintf(F," -E, --executability preserve the file's executability\n"); |
063cf77b | 265 | rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); |
31611b92 | 266 | rprintf(F," -o, --owner preserve owner (super-user only)\n"); |
5e3c6c93 | 267 | @@ -421,6 +428,8 @@ static struct poptOption long_options[] |
31611b92 WD |
268 | {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, |
269 | {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, | |
270 | {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, | |
5e3c6c93 WD |
271 | + {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 }, |
272 | + {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 }, | |
31611b92 WD |
273 | {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 }, |
274 | {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, | |
275 | {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, | |
5e3c6c93 | 276 | @@ -1126,6 +1135,15 @@ int parse_arguments(int *argc, const cha |
31611b92 WD |
277 | } |
278 | #endif | |
279 | ||
280 | +#ifndef SUPPORT_FLAGS | |
5e3c6c93 | 281 | + if (preserve_fileflags) { |
31611b92 WD |
282 | + snprintf(err_buf, sizeof err_buf, |
283 | + "file flags are not supported on this %s\n", | |
284 | + am_server ? "server" : "client"); | |
285 | + return 0; | |
286 | + } | |
287 | +#endif | |
288 | + | |
289 | if (write_batch && read_batch) { | |
290 | snprintf(err_buf, sizeof err_buf, | |
291 | "--write-batch and --read-batch can not be used together\n"); | |
70891d26 | 292 | @@ -1223,6 +1241,8 @@ int parse_arguments(int *argc, const cha |
1aa236e1 | 293 | preserve_uid = ++flist_extra_cnt; |
70891d26 | 294 | if (preserve_gid) |
1aa236e1 | 295 | preserve_gid = ++flist_extra_cnt; |
70891d26 | 296 | + if (preserve_fileflags) |
1aa236e1 | 297 | + preserve_fileflags = ++flist_extra_cnt; |
70891d26 WD |
298 | |
299 | *argv = poptGetArgs(pc); | |
300 | *argc = count_args(*argv); | |
301 | @@ -1585,6 +1605,9 @@ void server_options(char **args,int *arg | |
31611b92 WD |
302 | if (xfer_dirs && !recurse && delete_mode && am_sender) |
303 | args[ac++] = "--no-r"; | |
304 | ||
5e3c6c93 | 305 | + if (preserve_fileflags) |
31611b92 WD |
306 | + args[ac++] = "--flags"; |
307 | + | |
308 | if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { | |
309 | if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) | |
310 | goto oom; | |
311 | --- old/rsync.c | |
312 | +++ new/rsync.c | |
f90a882e WD |
313 | @@ -30,9 +30,12 @@ |
314 | #include <langinfo.h> | |
315 | #endif | |
316 | ||
317 | +#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) | |
318 | + | |
ff318e90 | 319 | extern int verbose; |
31611b92 | 320 | extern int dry_run; |
31611b92 | 321 | extern int preserve_perms; |
5e3c6c93 | 322 | +extern int preserve_fileflags; |
31611b92 WD |
323 | extern int preserve_executability; |
324 | extern int preserve_times; | |
325 | extern int omit_dir_times; | |
70891d26 | 326 | @@ -176,6 +179,41 @@ mode_t dest_mode(mode_t flist_mode, mode |
f90a882e WD |
327 | return new_mode; |
328 | } | |
329 | ||
330 | +#ifdef SUPPORT_FLAGS | |
331 | +/* Set a file's st_flags. */ | |
332 | +static int set_fileflags(const char *fname, uint32 fileflags) | |
333 | +{ | |
334 | + if (do_chflags(fname, fileflags) != 0) { | |
335 | + rsyserr(FERROR, errno, | |
336 | + "failed to set file flags on %s", | |
337 | + full_fname(fname)); | |
338 | + return 0; | |
339 | + } | |
340 | + | |
341 | + return 1; | |
342 | +} | |
343 | + | |
344 | +/* Remove immutable flags from an object, so it can be altered/removed. */ | |
345 | +void make_mutable(char *fname, mode_t mode, uint32 fileflags) | |
346 | +{ | |
5e3c6c93 | 347 | + if (!preserve_fileflags && S_ISLNK(mode)) |
f90a882e WD |
348 | + return; |
349 | + | |
350 | + if (fileflags & NOCHANGE_FLAGS) | |
351 | + set_fileflags(fname, fileflags & ~NOCHANGE_FLAGS); | |
352 | +} | |
353 | + | |
354 | +/* Undo a prior make_mutable() call. */ | |
355 | +void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags) | |
356 | +{ | |
5e3c6c93 | 357 | + if (!preserve_fileflags && S_ISLNK(mode)) |
f90a882e WD |
358 | + return; |
359 | + | |
360 | + if (fileflags & NOCHANGE_FLAGS) | |
361 | + set_fileflags(fname, fileflags); | |
362 | +} | |
363 | +#endif | |
364 | + | |
365 | int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, | |
366 | int flags) | |
367 | { | |
70891d26 | 368 | @@ -274,6 +312,15 @@ int set_file_attrs(char *fname, struct f |
31611b92 WD |
369 | } |
370 | #endif | |
371 | ||
372 | +#ifdef SUPPORT_FLAGS | |
5e3c6c93 | 373 | + if (preserve_fileflags && !S_ISLNK(st->st_mode) |
31611b92 | 374 | + && st->st_flags != file->fileflags) { |
f90a882e | 375 | + if (!set_fileflags(fname, file->fileflags)) |
31611b92 | 376 | + return 0; |
31611b92 WD |
377 | + updated = 1; |
378 | + } | |
379 | +#endif | |
380 | + | |
381 | if (verbose > 1 && flags & ATTRS_REPORT) { | |
ff318e90 WD |
382 | if (updated) |
383 | rprintf(FCLIENT, "%s\n", fname); | |
70891d26 | 384 | @@ -321,6 +368,9 @@ void finish_transfer(char *fname, char * |
f90a882e WD |
385 | set_file_attrs(fnametmp, file, NULL, |
386 | ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); | |
31611b92 WD |
387 | |
388 | +#ifdef SUPPORT_FLAGS | |
9f62ddf8 | 389 | + make_mutable(fnametmp, file->mode, file->fileflags); |
31611b92 | 390 | +#endif |
f90a882e WD |
391 | /* move tmp file over real file */ |
392 | if (verbose > 2) | |
393 | rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); | |
70891d26 | 394 | @@ -335,6 +385,9 @@ void finish_transfer(char *fname, char * |
f90a882e WD |
395 | } |
396 | if (ret == 0) { | |
397 | /* The file was moved into place (not copied), so it's done. */ | |
31611b92 | 398 | +#ifdef SUPPORT_FLAGS |
f90a882e | 399 | + undo_make_mutable(fname, file->mode, file->fileflags); |
31611b92 | 400 | +#endif |
f90a882e WD |
401 | return; |
402 | } | |
403 | /* The file was copied, so tweak the perms of the copied file. If it | |
31611b92 WD |
404 | --- old/rsync.h |
405 | +++ new/rsync.h | |
406 | @@ -54,6 +54,7 @@ | |
407 | #define XMIT_HAS_IDEV_DATA (1<<9) | |
408 | #define XMIT_SAME_DEV (1<<10) | |
409 | #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) | |
410 | +#define XMIT_SAME_FLAGS (1<<12) | |
411 | ||
412 | /* These flags are used in the live flist data. */ | |
413 | ||
1aa236e1 | 414 | @@ -348,6 +349,10 @@ enum msgcode { |
6e6f514c WD |
415 | #define schar char |
416 | #endif | |
417 | ||
418 | +#ifdef HAVE_CHFLAGS | |
419 | +#define SUPPORT_FLAGS 1 | |
420 | +#endif | |
421 | + | |
422 | /* Find a variable that is either exactly 32-bits or longer. | |
423 | * If some code depends on 32-bit truncation, it will need to | |
424 | * take special action in a "#if SIZEOF_INT32 > 4" section. */ | |
1aa236e1 WD |
425 | @@ -551,6 +556,7 @@ extern int preserve_gid; |
426 | /* When the associated option is on, all entries will have these present: */ | |
427 | #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid | |
428 | #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid | |
429 | +#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags).num | |
70891d26 WD |
430 | |
431 | /* These are per-entry optional and mutally exclusive: */ | |
1aa236e1 | 432 | #define F_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev |
31611b92 WD |
433 | --- old/rsync.yo |
434 | +++ new/rsync.yo | |
03019e41 | 435 | @@ -321,6 +321,7 @@ to the detailed description below for a |
1ed0b5c9 WD |
436 | -K, --keep-dirlinks treat symlinked dir on receiver as dir |
437 | -H, --hard-links preserve hard links | |
31611b92 | 438 | -p, --perms preserve permissions |
31611b92 | 439 | + --flags preserve file flags |
1ed0b5c9 | 440 | -E, --executability preserve executability |
063cf77b | 441 | --chmod=CHMOD affect file and/or directory permissions |
31611b92 | 442 | -o, --owner preserve owner (super-user only) |
f813befd | 443 | @@ -510,7 +511,9 @@ specified, in which case bf(-r) is not i |
31611b92 WD |
444 | |
445 | Note that bf(-a) bf(does not preserve hardlinks), because | |
446 | finding multiply-linked files is expensive. You must separately | |
447 | -specify bf(-H). | |
448 | +specify bf(-H). Note also that for compatibility, bf(-a) | |
449 | +currently bf(does not include --flags) (see there) to include preserving | |
450 | +change file flags (if supported by the OS). | |
451 | ||
452 | dit(--no-OPTION) You may turn off one or more implied options by prefixing | |
453 | the option name with "no-". Not all options may be prefixed with a "no-": | |
f813befd | 454 | @@ -805,6 +808,13 @@ quote(itemization( |
31611b92 WD |
455 | |
456 | If bf(--perms) is enabled, this option is ignored. | |
457 | ||
458 | +dit(bf(--flags)) This option causes rsync to update the change file flags | |
f90a882e | 459 | +to be the same as the source file, if your OS supports the bf(chflags)(2) |
31611b92 WD |
460 | +system call. In any case, an attempt is made to remove flags that would |
461 | +prevent a file to be altered. Some flags can only be altered by the | |
462 | +super-user and can only be unset below a certain secure-level (usually | |
463 | +single-user mode). | |
464 | + | |
465 | dit(bf(--chmod)) This option tells rsync to apply one or more | |
466 | comma-separated "chmod" strings to the permission of the files in the | |
467 | transfer. The resulting value is treated as though it was the permissions | |
468 | --- old/syscall.c | |
469 | +++ new/syscall.c | |
f813befd | 470 | @@ -153,6 +153,15 @@ int do_chmod(const char *path, mode_t mo |
31611b92 WD |
471 | } |
472 | #endif | |
473 | ||
474 | +#ifdef SUPPORT_FLAGS | |
475 | +int do_chflags(const char *path, u_long flags) | |
476 | +{ | |
477 | + if (dry_run) return 0; | |
478 | + RETURN_ERROR_IF_RO_OR_LO; | |
479 | + return chflags(path, flags); | |
480 | +} | |
481 | +#endif | |
482 | + | |
483 | int do_rename(const char *fname1, const char *fname2) | |
484 | { | |
485 | if (dry_run) return 0; |