1 This patch provides --fileflags, which preserves the st_flags stat() field.
2 Modified from a patch that was written by Rolf Grossmann.
4 To use this patch, run these commands for a successful build:
6 patch -p1 <patches/fileflags.diff
7 ./configure (optional if already run)
10 based-on: 603cf476ef5a1155203037d2127341cdbb8646d7
11 diff --git a/compat.c b/compat.c
14 @@ -40,6 +40,7 @@ extern int checksum_seed;
15 extern int basis_dir_cnt;
16 extern int prune_empty_dirs;
17 extern int protocol_version;
18 +extern int force_change;
19 extern int protect_args;
20 extern int preserve_uid;
21 extern int preserve_gid;
22 @@ -47,6 +48,7 @@ extern int preserve_atimes;
23 extern int preserve_crtimes;
24 extern int preserve_acls;
25 extern int preserve_xattrs;
26 +extern int preserve_fileflags;
27 extern int xfer_flags_as_varint;
28 extern int need_messages_from_generator;
29 extern int delete_mode, delete_before, delete_during, delete_after;
30 @@ -78,7 +80,7 @@ int do_negotiated_strings = 0;
31 int xmit_id0_names = 0;
33 /* These index values are for the file-list's extra-attribute array. */
34 -int pathname_ndx, depth_ndx, atimes_ndx, crtimes_ndx, uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
35 +int pathname_ndx, depth_ndx, atimes_ndx, crtimes_ndx, uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
37 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
38 int sender_symlink_iconv = 0; /* sender should convert symlink content */
39 @@ -572,6 +574,8 @@ void setup_protocol(int f_out,int f_in)
40 uid_ndx = ++file_extra_cnt;
42 gid_ndx = ++file_extra_cnt;
43 + if (preserve_fileflags || (force_change && !am_sender))
44 + fileflags_ndx = ++file_extra_cnt;
45 if (preserve_acls && !am_sender)
46 acls_ndx = ++file_extra_cnt;
48 @@ -732,6 +736,10 @@ void setup_protocol(int f_out,int f_in)
49 fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --crtimes.\n");
50 exit_cleanup(RERR_PROTOCOL);
52 + if (!xfer_flags_as_varint && preserve_fileflags) {
53 + fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --fileflags.\n");
54 + exit_cleanup(RERR_PROTOCOL);
57 receiver_symlink_times = am_server
58 ? strchr(client_info, 'L') != NULL
59 diff --git a/delete.c b/delete.c
64 extern int make_backups;
65 extern int max_delete;
66 +extern int force_change;
67 extern char *backup_dir;
68 extern char *backup_suffix;
69 extern int backup_suffix_len;
70 @@ -97,8 +98,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
73 strlcpy(p, fp->basename, remainder);
74 +#ifdef SUPPORT_FORCE_CHANGE
76 + make_mutable(fname, fp->mode, F_FFLAGS(fp), force_change);
78 if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
79 - do_chmod(fname, fp->mode | S_IWUSR);
80 + do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS);
81 /* Save stack by recursing to ourself directly. */
82 if (S_ISDIR(fp->mode)) {
83 if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
84 @@ -139,11 +144,18 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
87 if (flags & DEL_NO_UID_WRITE)
88 - do_chmod(fbuf, mode | S_IWUSR);
89 + do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS);
91 if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
92 /* This only happens on the first call to delete_item() since
93 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
94 +#ifdef SUPPORT_FORCE_CHANGE
97 + if (x_lstat(fbuf, &st, NULL) == 0)
98 + make_mutable(fbuf, st.st_mode, st.st_flags, force_change);
101 ignore_perishable = 1;
102 /* If DEL_RECURSE is not set, this just reports emptiness. */
103 ret = delete_dir_contents(fbuf, flags);
104 diff --git a/flist.c b/flist.c
107 @@ -52,6 +52,7 @@ extern int preserve_links;
108 extern int preserve_hard_links;
109 extern int preserve_devices;
110 extern int preserve_specials;
111 +extern int preserve_fileflags;
112 extern int delete_during;
113 extern int missing_args;
114 extern int eol_nulls;
115 @@ -383,6 +384,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
116 static time_t crtime;
119 +#ifdef SUPPORT_FILEFLAGS
120 + static uint32 fileflags;
122 #ifdef SUPPORT_HARD_LINKS
125 @@ -426,6 +430,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
126 xflags |= XMIT_SAME_MODE;
129 +#ifdef SUPPORT_FILEFLAGS
130 + if (preserve_fileflags) {
131 + if (F_FFLAGS(file) == fileflags)
132 + xflags |= XMIT_SAME_FLAGS;
134 + fileflags = F_FFLAGS(file);
138 if (preserve_devices && IS_DEVICE(mode)) {
139 if (protocol_version < 28) {
140 @@ -587,6 +599,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
142 if (!(xflags & XMIT_SAME_MODE))
143 write_int(f, to_wire_mode(mode));
144 +#ifdef SUPPORT_FILEFLAGS
145 + if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
146 + write_int(f, (int)fileflags);
148 if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
149 write_varlong(f, atime, 4);
150 if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
151 @@ -681,6 +697,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
152 static time_t crtime;
155 +#ifdef SUPPORT_FILEFLAGS
156 + static uint32 fileflags;
158 #ifdef SUPPORT_HARD_LINKS
161 @@ -797,6 +816,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
162 #ifdef SUPPORT_CRTIMES
164 crtime = F_CRTIME(first);
166 +#ifdef SUPPORT_FILEFLAGS
167 + if (preserve_fileflags)
168 + fileflags = F_FFLAGS(first);
171 uid = F_OWNER(first);
172 @@ -869,6 +892,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
174 if (chmod_modes && !S_ISLNK(mode) && mode)
175 mode = tweak_mode(mode, chmod_modes);
176 +#ifdef SUPPORT_FILEFLAGS
177 + if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
178 + fileflags = (uint32)read_int(f);
181 if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
182 if (protocol_version < 30)
183 @@ -1027,6 +1054,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
187 +#ifdef SUPPORT_FILEFLAGS
188 + if (preserve_fileflags)
189 + F_FFLAGS(file) = fileflags;
194 @@ -1428,6 +1459,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
197 file->mode = st.st_mode;
198 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
200 + F_FFLAGS(file) = st.st_flags;
203 F_OWNER(file) = st.st_uid;
205 diff --git a/generator.c b/generator.c
208 @@ -43,8 +43,10 @@ extern int write_devices;
209 extern int preserve_specials;
210 extern int preserve_hard_links;
211 extern int preserve_executability;
212 +extern int preserve_fileflags;
213 extern int preserve_perms;
214 extern int preserve_times;
215 +extern int force_change;
216 extern int delete_mode;
217 extern int delete_before;
218 extern int delete_during;
219 @@ -484,6 +486,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
221 if (perms_differ(file, sxp))
223 +#ifdef SUPPORT_FILEFLAGS
224 + if (preserve_fileflags && sxp->st.st_flags != F_FFLAGS(file))
227 if (ownership_differs(file, sxp))
230 @@ -545,6 +551,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
231 iflags |= ITEM_REPORT_OWNER;
232 if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
233 iflags |= ITEM_REPORT_GROUP;
234 +#ifdef SUPPORT_FILEFLAGS
235 + if (preserve_fileflags && !S_ISLNK(file->mode)
236 + && sxp->st.st_flags != F_FFLAGS(file))
237 + iflags |= ITEM_REPORT_FFLAGS;
240 if (preserve_acls && !S_ISLNK(file->mode)) {
241 if (!ACL_READY(*sxp))
242 @@ -1450,6 +1461,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
243 if (!preserve_perms) { /* See comment in non-dir code below. */
244 file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0);
246 +#ifdef SUPPORT_FORCE_CHANGE
247 + if (force_change && !preserve_fileflags)
248 + F_FFLAGS(file) = sx.st.st_flags;
250 if (statret != 0 && basis_dir[0] != NULL) {
251 int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code);
253 @@ -1492,10 +1507,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
254 * readable and writable permissions during the time we are
255 * putting files within them. This is then restored to the
256 * former permissions after the transfer is done. */
257 +#ifdef SUPPORT_FORCE_CHANGE
258 + if (force_change && F_FFLAGS(file) & force_change
259 + && make_mutable(fname, file->mode, F_FFLAGS(file), force_change))
260 + need_retouch_dir_perms = 1;
263 if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) {
264 mode_t mode = file->mode | S_IRWXU;
265 - if (do_chmod(fname, mode) < 0) {
266 + if (do_chmod(fname, mode, 0) < 0) {
267 rsyserr(FERROR_XFER, errno,
268 "failed to modify permissions on %s",
270 @@ -1530,6 +1550,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
271 int exists = statret == 0 && stype != FT_DIR;
272 file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, exists);
274 +#ifdef SUPPORT_FORCE_CHANGE
275 + if (force_change && !preserve_fileflags)
276 + F_FFLAGS(file) = sx.st.st_flags;
279 #ifdef SUPPORT_HARD_LINKS
280 if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
281 @@ -2099,17 +2123,25 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
283 fname = f_name(file, NULL);
285 - do_chmod(fname, file->mode);
286 + do_chmod(fname, file->mode, 0);
287 if (need_retouch_dir_times) {
289 if (link_stat(fname, &st, 0) == 0 && mtime_differs(&st, file)) {
290 st.st_mtime = file->modtime;
292 st.ST_MTIME_NSEC = F_MOD_NSEC_or_0(file);
294 +#ifdef SUPPORT_FORCE_CHANGE
295 + st.st_mode = file->mode;
298 set_times(fname, &st);
301 +#ifdef SUPPORT_FORCE_CHANGE
302 + if (force_change && F_FFLAGS(file) & force_change)
303 + undo_make_mutable(fname, F_FFLAGS(file));
305 if (counter >= loopchk_limit) {
307 maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
308 diff --git a/log.c b/log.c
311 @@ -725,7 +725,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
312 : iflags & ITEM_REPORT_ATIME ? 'u' : 'n';
313 c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
314 c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
316 + c[11] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
319 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
320 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
321 diff --git a/main.c b/main.c
326 #include <floss.h(floss_execlp)>
328 +#ifdef SUPPORT_FORCE_CHANGE
329 +#include <sys/sysctl.h>
333 extern int list_only;
334 @@ -48,6 +51,7 @@ extern int called_from_signal_handler;
335 extern int need_messages_from_generator;
336 extern int kluge_around_eof;
337 extern int got_xfer_error;
338 +extern int force_change;
339 extern int msgs2stderr;
340 extern int module_id;
341 extern int read_only;
342 @@ -973,6 +977,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
343 * points to an identical file won't be replaced by the referent. */
344 copy_links = copy_dirlinks = copy_unsafe_links = 0;
346 +#ifdef SUPPORT_FORCE_CHANGE
347 + if (force_change & SYS_IMMUTABLE) {
348 + /* Determine whether we'll be able to unlock a system immutable item. */
350 + int securityLevel = 0;
351 + size_t len = sizeof securityLevel;
354 + mib[1] = KERN_SECURELVL;
355 + if (sysctl(mib, 2, &securityLevel, &len, NULL, 0) == 0 && securityLevel > 0) {
356 + rprintf(FERROR, "System security level is too high to force mutability on system immutable files and directories.\n");
357 + exit_cleanup(RERR_UNSUPPORTED);
362 #ifdef SUPPORT_HARD_LINKS
363 if (preserve_hard_links && !inc_recurse)
364 match_hard_links(first_flist);
365 diff --git a/options.c b/options.c
368 @@ -53,6 +53,7 @@ int preserve_hard_links = 0;
369 int preserve_acls = 0;
370 int preserve_xattrs = 0;
371 int preserve_perms = 0;
372 +int preserve_fileflags = 0;
373 int preserve_executability = 0;
374 int preserve_devices = 0;
375 int preserve_specials = 0;
376 @@ -90,6 +91,7 @@ int numeric_ids = 0;
377 int msgs2stderr = 2; /* Default: send errors to stderr for local & remote-shell transfers */
378 int allow_8bit_chars = 0;
379 int force_delete = 0;
380 +int force_change = 0;
382 int prune_empty_dirs = 0;
384 @@ -614,6 +616,8 @@ static struct poptOption long_options[] = {
385 {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
386 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
387 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
388 + {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 },
389 + {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 },
390 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
391 {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
392 {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
393 @@ -711,6 +715,12 @@ static struct poptOption long_options[] = {
394 {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
395 {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
396 {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
397 + {"force-delete", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
398 + {"no-force-delete", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
399 + {"force-change", 0, POPT_ARG_VAL, &force_change, ALL_IMMUTABLE, 0, 0 },
400 + {"no-force-change", 0, POPT_ARG_VAL, &force_change, 0, 0, 0 },
401 + {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
402 + {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
403 {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
404 {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
405 {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
406 @@ -998,6 +1008,14 @@ static void set_refuse_options(void)
407 #ifndef SUPPORT_CRTIMES
408 parse_one_refuse_match(0, "crtimes", list_end);
410 +#ifndef SUPPORT_FILEFLAGS
411 + parse_one_refuse_match(0, "fileflags", list_end);
413 +#ifndef SUPPORT_FORCE_CHANGE
414 + parse_one_refuse_match(0, "force-change", list_end);
415 + parse_one_refuse_match(0, "force-uchange", list_end);
416 + parse_one_refuse_match(0, "force-schange", list_end);
419 /* Now we use the descrip values to actually mark the options for refusal. */
420 for (op = long_options; op != list_end; op++) {
421 @@ -2607,6 +2625,9 @@ void server_options(char **args, int *argc_p)
422 if (xfer_dirs && !recurse && delete_mode && am_sender)
423 args[ac++] = "--no-r";
425 + if (preserve_fileflags)
426 + args[ac++] = "--fileflags";
428 if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
429 if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
431 @@ -2715,6 +2736,16 @@ void server_options(char **args, int *argc_p)
432 args[ac++] = "--delete-excluded";
434 args[ac++] = "--force";
435 +#ifdef SUPPORT_FORCE_CHANGE
436 + if (force_change) {
437 + if (force_change == ALL_IMMUTABLE)
438 + args[ac++] = "--force-change";
439 + else if (force_change == USR_IMMUTABLE)
440 + args[ac++] = "--force-uchange";
441 + else if (force_change == SYS_IMMUTABLE)
442 + args[ac++] = "--force-schange";
446 args[ac++] = "--only-write-batch=X";
448 diff --git a/rsync.1.md b/rsync.1.md
451 @@ -361,6 +361,7 @@ detailed description below for a complete description.
452 --keep-dirlinks, -K treat symlinked dir on receiver as dir
453 --hard-links, -H preserve hard links
454 --perms, -p preserve permissions
455 +--fileflags preserve file-flags (aka chflags)
456 --executability, -E preserve executability
457 --chmod=CHMOD affect file and/or directory permissions
458 --acls, -A preserve ACLs (implies --perms)
459 @@ -401,7 +402,10 @@ detailed description below for a complete description.
460 --ignore-missing-args ignore missing source args without error
461 --delete-missing-args delete missing source args from destination
462 --ignore-errors delete even if there are I/O errors
463 ---force force deletion of dirs even if not empty
464 +--force-delete force deletion of directories even if not empty
465 +--force-change affect user-/system-immutable files/dirs
466 +--force-uchange affect user-immutable files/dirs
467 +--force-schange affect system-immutable files/dirs
468 --max-delete=NUM don't delete more than NUM files
469 --max-size=SIZE don't transfer any file larger than SIZE
470 --min-size=SIZE don't transfer any file smaller than SIZE
471 @@ -718,6 +722,7 @@ your home directory (remove the '=' for that).
472 recursion and want to preserve almost everything. Be aware that it does
473 **not** include preserving ACLs (`-A`), xattrs (`-X`), atimes (`-U`),
474 crtimes (`-N`), nor the finding and preserving of hardlinks (`-H`).
475 + It also does **not** imply `--fileflags`.
477 The only exception to the above equivalence is when
478 `--files-from` is specified, in which case `-r` is not implied.
479 @@ -1082,7 +1087,7 @@ your home directory (remove the '=' for that).
480 Without this option, if the sending side has replaced a directory with a
481 symlink to a directory, the receiving side will delete anything that is in
482 the way of the new symlink, including a directory hierarchy (as long as
483 - `--force` or `--delete` is in effect).
484 + `--force-delete` or `--delete` is in effect).
486 See also `--keep-dirlinks` for an analogous option for the receiving side.
488 @@ -1268,6 +1273,29 @@ your home directory (remove the '=' for that).
489 those used by `--fake-super`) unless you repeat the option (e.g. `-XX`).
490 This "copy all xattrs" mode cannot be used with `--fake-super`.
492 +0. `--fileflags` This option causes rsync to update the file-flags to be the
493 + same as the source files and directories (if your OS supports the
494 + **chflags**(2) system call). Some flags can only be altered by the
495 + super-user and some might only be unset below a certain secure-level
496 + (usually single-user mode). It will not make files alterable that are set
497 + to immutable on the receiver. To do that, see `--force-change`,
498 + `--force-uchange`, and `--force-schange`.
500 +0. `--force-change` This option causes rsync to disable both user-immutable
501 + and system-immutable flags on files and directories that are being updated
502 + or deleted on the receiving side. This option overrides `--force-uchange`
503 + and `--force-schange`.
505 +0. `--force-uchange` This option causes rsync to disable user-immutable flags
506 + on files and directories that are being updated or deleted on the receiving
507 + side. It does not try to affect system flags. This option overrides
508 + `--force-change` and `--force-schange`.
510 +0. `--force-schange` This option causes rsync to disable system-immutable
511 + flags on files and directories that are being updated or deleted on the
512 + receiving side. It does not try to affect user flags. This option
513 + overrides `--force-change` and `--force-uchange`.
517 This option tells rsync to apply one or more comma-separated "chmod" modes
518 @@ -1741,7 +1769,7 @@ your home directory (remove the '=' for that).
519 option a step farther: each missing arg will become a deletion request of
520 the corresponding destination file on the receiving side (should it exist).
521 If the destination file is a non-empty directory, it will only be
522 - successfully deleted if `--force` or `--delete` are in effect. Other than
523 + successfully deleted if `--force-delete` or `--delete` are in effect. Other than
524 that, this option is independent of any other type of delete processing.
526 The missing source files are represented by special file-list entries which
527 @@ -1752,15 +1780,16 @@ your home directory (remove the '=' for that).
528 Tells `--delete` to go ahead and delete files even when there are I/O
534 This option tells rsync to delete a non-empty directory when it is to be
535 replaced by a non-directory. This is only relevant if deletions are not
536 active (see `--delete` for details).
538 - Note for older rsync versions: `--force` used to still be required when
539 - using `--delete-after`, and it used to be non-functional unless the
540 - `--recursive` option was also enabled.
541 + This option can be abbreviated `--force` for backward compatibility. Note
542 + that some older rsync versions used to still require `--force` when using
543 + `--delete-after`, and it used to be non-functional unless the `--recursive`
544 + option was also enabled.
546 0. `--max-delete=NUM`
548 @@ -2712,7 +2741,7 @@ your home directory (remove the '=' for that).
549 output of other verbose messages).
551 The "%i" escape has a cryptic output that is 11 letters long. The general
552 - format is like the string `YXcstpoguax`, where **Y** is replaced by the type
553 + format is like the string `YXcstpoguaxf`, where **Y** is replaced by the type
554 of update being done, **X** is replaced by the file-type, and the other
555 letters represent attributes that may be output if they are being modified.
557 diff --git a/rsync.c b/rsync.c
560 @@ -31,6 +31,7 @@ extern int dry_run;
561 extern int preserve_acls;
562 extern int preserve_xattrs;
563 extern int preserve_perms;
564 +extern int preserve_fileflags;
565 extern int preserve_executability;
566 extern int preserve_times;
568 @@ -467,6 +468,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
572 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
573 +/* Set a file's st_flags. */
574 +static int set_fileflags(const char *fname, uint32 fileflags)
576 + if (do_chflags(fname, fileflags) != 0) {
577 + rsyserr(FERROR_XFER, errno,
578 + "failed to set file flags on %s",
579 + full_fname(fname));
586 +/* Remove immutable flags from an object, so it can be altered/removed. */
587 +int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags)
589 + if (S_ISLNK(mode) || !(fileflags & iflags))
591 + if (!set_fileflags(fname, fileflags & ~iflags))
596 +/* Undo a prior make_mutable() call that returned a 1. */
597 +int undo_make_mutable(const char *fname, uint32 fileflags)
599 + if (!set_fileflags(fname, fileflags))
605 static int same_mtime(struct file_struct *file, STRUCT_STAT *st, int extra_accuracy)
608 @@ -543,7 +577,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
610 uid_t uid = change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid;
611 gid_t gid = change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid;
612 - if (do_lchown(fname, uid, gid) != 0) {
613 + if (do_lchown(fname, uid, gid, sxp->st.st_mode, ST_FLAGS(sxp->st)) != 0) {
614 /* We shouldn't have attempted to change uid
615 * or gid unless have the privilege. */
616 rsyserr(FERROR_XFER, errno, "%s %s failed",
617 @@ -642,7 +676,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
620 if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
621 - int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode);
622 + int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode, ST_FLAGS(sxp->st));
624 rsyserr(FERROR_XFER, errno,
625 "failed to set permissions on %s",
626 @@ -654,6 +688,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
630 +#ifdef SUPPORT_FILEFLAGS
631 + if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode)
632 + && sxp->st.st_flags != F_FFLAGS(file)) {
633 + uint32 fileflags = F_FFLAGS(file);
634 + if (flags & ATTRS_DELAY_IMMUTABLE)
635 + fileflags &= ~ALL_IMMUTABLE;
636 + if (sxp->st.st_flags != fileflags
637 + && !set_fileflags(fname, fileflags))
643 if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
645 rprintf(FCLIENT, "%s\n", fname);
646 @@ -731,7 +778,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
648 /* Change permissions before putting the file into place. */
649 set_file_attrs(fnametmp, file, NULL, fnamecmp,
650 - ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
651 + ATTRS_DELAY_IMMUTABLE
652 + | (ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME));
654 /* move tmp file over real file */
655 if (DEBUG_GTE(RECV, 1))
656 @@ -748,6 +796,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
659 /* The file was moved into place (not copied), so it's done. */
660 +#ifdef SUPPORT_FILEFLAGS
661 + if (preserve_fileflags && F_FFLAGS(file) & ALL_IMMUTABLE)
662 + set_fileflags(fname, F_FFLAGS(file));
666 /* The file was copied, so tweak the perms of the copied file. If it
667 diff --git a/rsync.h b/rsync.h
672 /* The following XMIT flags require an rsync that uses a varint for the flag values */
674 -#define XMIT_RESERVED_16 (1<<16) /* reserved for future fileflags use */
675 +#define XMIT_SAME_FLAGS (1<<16) /* any protocol - restricted by command-line option */
676 #define XMIT_CRTIME_EQ_MTIME (1<<17) /* any protocol - restricted by command-line option */
678 /* These flags are used in the live flist data. */
680 #define ATTRS_SKIP_MTIME (1<<1)
681 #define ATTRS_ACCURATE_TIME (1<<2)
682 #define ATTRS_SKIP_ATIME (1<<3)
683 +#define ATTRS_DELAY_IMMUTABLE (1<<4)
684 #define ATTRS_SKIP_CRTIME (1<<5)
688 #define ITEM_REPORT_GROUP (1<<6)
689 #define ITEM_REPORT_ACL (1<<7)
690 #define ITEM_REPORT_XATTR (1<<8)
691 +#define ITEM_REPORT_FFLAGS (1<<9)
692 #define ITEM_REPORT_CRTIME (1<<10)
693 #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
694 #define ITEM_XNAME_FOLLOWS (1<<12)
695 @@ -591,6 +593,31 @@ typedef unsigned int size_t;
696 #define SUPPORT_CRTIMES 1
699 +#define NO_FFLAGS ((uint32)-1)
702 +#define SUPPORT_FILEFLAGS 1
703 +#define SUPPORT_FORCE_CHANGE 1
706 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
708 +#define UF_NOUNLINK 0
711 +#define SF_NOUNLINK 0
713 +#define USR_IMMUTABLE (UF_IMMUTABLE|UF_NOUNLINK|UF_APPEND)
714 +#define SYS_IMMUTABLE (SF_IMMUTABLE|SF_NOUNLINK|SF_APPEND)
715 +#define ALL_IMMUTABLE (USR_IMMUTABLE|SYS_IMMUTABLE)
716 +#define ST_FLAGS(st) ((st).st_flags)
718 +#define USR_IMMUTABLE 0
719 +#define SYS_IMMUTABLE 0
720 +#define ALL_IMMUTABLE 0
721 +#define ST_FLAGS(st) NO_FFLAGS
724 /* Find a variable that is either exactly 32-bits or longer.
725 * If some code depends on 32-bit truncation, it will need to
726 * take special action in a "#if SIZEOF_INT32 > 4" section. */
727 @@ -817,6 +844,7 @@ extern int pathname_ndx;
728 extern int depth_ndx;
731 +extern int fileflags_ndx;
733 extern int xattrs_ndx;
735 @@ -871,6 +899,11 @@ extern int xattrs_ndx;
736 /* When the associated option is on, all entries will have these present: */
737 #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
738 #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
739 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
740 +#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum
742 +#define F_FFLAGS(f) NO_FFLAGS
744 #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
745 #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
746 #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
747 diff --git a/syscall.c b/syscall.c
750 @@ -38,6 +38,7 @@ extern int am_root;
751 extern int am_sender;
752 extern int read_only;
753 extern int list_only;
754 +extern int force_change;
756 extern int preallocate_files;
757 extern int preserve_perms;
758 @@ -77,7 +78,23 @@ int do_unlink(const char *fname)
760 if (dry_run) return 0;
761 RETURN_ERROR_IF_RO_OR_LO;
762 - return unlink(fname);
763 + if (unlink(fname) == 0)
765 +#ifdef SUPPORT_FORCE_CHANGE
766 + if (force_change && errno == EPERM) {
769 + if (x_lstat(fname, &st, NULL) == 0
770 + && make_mutable(fname, st.st_mode, st.st_flags, force_change) > 0) {
771 + if (unlink(fname) == 0)
773 + undo_make_mutable(fname, st.st_flags);
775 + /* TODO: handle immutable directories */
783 @@ -142,14 +159,35 @@ int do_link(const char *old_path, const char *new_path)
787 -int do_lchown(const char *path, uid_t owner, gid_t group)
788 +int do_lchown(const char *path, uid_t owner, gid_t group, UNUSED(mode_t mode), UNUSED(uint32 fileflags))
790 if (dry_run) return 0;
791 RETURN_ERROR_IF_RO_OR_LO;
795 - return lchown(path, owner, group);
796 + if (lchown(path, owner, group) == 0)
798 +#ifdef SUPPORT_FORCE_CHANGE
799 + if (force_change && errno == EPERM) {
800 + if (fileflags == NO_FFLAGS) {
802 + if (x_lstat(path, &st, NULL) == 0) {
804 + fileflags = st.st_flags;
807 + if (fileflags != NO_FFLAGS
808 + && make_mutable(path, mode, fileflags, force_change) > 0) {
809 + int ret = lchown(path, owner, group);
810 + undo_make_mutable(path, fileflags);
820 int do_mknod(const char *pathname, mode_t mode, dev_t dev)
821 @@ -189,7 +227,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
825 - return do_chmod(pathname, mode);
826 + return do_chmod(pathname, mode, 0);
830 @@ -206,7 +244,22 @@ int do_rmdir(const char *pathname)
832 if (dry_run) return 0;
833 RETURN_ERROR_IF_RO_OR_LO;
834 - return rmdir(pathname);
835 + if (rmdir(pathname) == 0)
837 +#ifdef SUPPORT_FORCE_CHANGE
838 + if (force_change && errno == EPERM) {
841 + if (x_lstat(pathname, &st, NULL) == 0
842 + && make_mutable(pathname, st.st_mode, st.st_flags, force_change) > 0) {
843 + if (rmdir(pathname) == 0)
845 + undo_make_mutable(pathname, st.st_flags);
853 int do_open(const char *pathname, int flags, mode_t mode)
854 @@ -225,7 +278,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
858 -int do_chmod(const char *path, mode_t mode)
859 +int do_chmod(const char *path, mode_t mode, UNUSED(uint32 fileflags))
861 static int switch_step = 0;
863 @@ -256,17 +309,72 @@ int do_chmod(const char *path, mode_t mode)
864 code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
867 +#ifdef SUPPORT_FORCE_CHANGE
868 + if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) {
869 + if (fileflags == NO_FFLAGS) {
871 + if (x_lstat(path, &st, NULL) == 0)
872 + fileflags = st.st_flags;
874 + if (fileflags != NO_FFLAGS
875 + && make_mutable(path, mode, fileflags, force_change) > 0) {
876 + code = chmod(path, mode & CHMOD_BITS);
877 + undo_make_mutable(path, fileflags);
884 if (code != 0 && (preserve_perms || preserve_executability))
891 +int do_chflags(const char *path, uint32 fileflags)
893 + if (dry_run) return 0;
894 + RETURN_ERROR_IF_RO_OR_LO;
895 + return chflags(path, fileflags);
899 int do_rename(const char *old_path, const char *new_path)
901 if (dry_run) return 0;
902 RETURN_ERROR_IF_RO_OR_LO;
903 - return rename(old_path, new_path);
904 + if (rename(old_path, new_path) == 0)
906 +#ifdef SUPPORT_FORCE_CHANGE
907 + if (force_change && errno == EPERM) {
908 + STRUCT_STAT st1, st2;
909 + int became_mutable;
911 + if (x_lstat(old_path, &st1, NULL) != 0)
913 + became_mutable = make_mutable(old_path, st1.st_mode, st1.st_flags, force_change) > 0;
914 + if (became_mutable && rename(old_path, new_path) == 0)
916 + if (x_lstat(new_path, &st2, NULL) == 0
917 + && make_mutable(new_path, st2.st_mode, st2.st_flags, force_change) > 0) {
918 + if (rename(old_path, new_path) == 0) {
920 + if (became_mutable) /* Yes, use new_path and st1! */
921 + undo_make_mutable(new_path, st1.st_flags);
924 + undo_make_mutable(new_path, st2.st_flags);
926 + /* TODO: handle immutable directories */
927 + if (became_mutable)
928 + undo_make_mutable(old_path, st1.st_flags);
936 #ifdef HAVE_FTRUNCATE
937 diff --git a/t_stub.c b/t_stub.c
940 @@ -28,6 +28,8 @@ int protect_args = 0;
942 int relative_paths = 0;
943 int module_dirlen = 0;
944 +int force_change = 0;
945 +int preserve_acls = 0;
946 int preserve_times = 0;
947 int preserve_xattrs = 0;
948 int preserve_perms = 0;
949 @@ -110,3 +112,23 @@ filter_rule_list daemon_filter_list;
954 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
955 + int make_mutable(UNUSED(const char *fname), UNUSED(mode_t mode), UNUSED(uint32 fileflags), UNUSED(uint32 iflags))
960 +/* Undo a prior make_mutable() call that returned a 1. */
961 + int undo_make_mutable(UNUSED(const char *fname), UNUSED(uint32 fileflags))
967 +#ifdef SUPPORT_XATTRS
968 + int x_lstat(UNUSED(const char *fname), UNUSED(STRUCT_STAT *fst), UNUSED(STRUCT_STAT *xst))
973 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
974 --- a/testsuite/rsync.fns
975 +++ b/testsuite/rsync.fns
976 @@ -26,9 +26,9 @@ chkfile="$scratchdir/rsync.chk"
977 outfile="$scratchdir/rsync.out"
979 # For itemized output:
980 -all_plus='+++++++++'
982 -dots='.....' # trailing dots after changes
983 +all_plus='++++++++++'
985 +dots='......' # trailing dots after changes
986 tab_ch=' ' # a single tab character
989 diff --git a/usage.c b/usage.c
992 @@ -137,6 +137,11 @@ static void print_info_flags(enum logcode f)
996 +#ifndef SUPPORT_FILEFLAGS
1004 diff --git a/util1.c b/util1.c
1007 @@ -33,6 +33,7 @@ extern int relative_paths;
1008 extern int preserve_times;
1009 extern int preserve_xattrs;
1010 extern int preallocate_files;
1011 +extern int force_change;
1012 extern char *module_dir;
1013 extern unsigned int module_dirlen;
1014 extern char *partial_dir;
1015 @@ -115,6 +116,33 @@ void print_child_argv(const char *prefix, char **cmd)
1016 rprintf(FCLIENT, " (%d args)\n", cnt);
1019 +#ifdef SUPPORT_FORCE_CHANGE
1020 +static int try_a_force_change(const char *fname, STRUCT_STAT *stp)
1022 + uint32 fileflags = ST_FLAGS(*stp);
1023 + if (fileflags == NO_FFLAGS) {
1025 + if (x_lstat(fname, &st, NULL) == 0)
1026 + fileflags = st.st_flags;
1028 + if (fileflags != NO_FFLAGS && make_mutable(fname, stp->st_mode, fileflags, force_change) > 0) {
1029 + int ret, save_force_change = force_change;
1031 + force_change = 0; /* Make certain we can't come back here. */
1032 + ret = set_times(fname, stp);
1033 + force_change = save_force_change;
1035 + undo_make_mutable(fname, fileflags);
1046 /* This returns 0 for success, 1 for a symlink if symlink time-setting
1047 * is not possible, or -1 for any other error. */
1048 int set_times(const char *fname, STRUCT_STAT *stp)
1049 @@ -142,6 +170,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1051 if (do_utimensat(fname, stp) == 0)
1053 +#ifdef SUPPORT_FORCE_CHANGE
1054 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1057 if (errno != ENOSYS)
1060 @@ -151,6 +183,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1062 if (do_lutimes(fname, stp) == 0)
1064 +#ifdef SUPPORT_FORCE_CHANGE
1065 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1068 if (errno != ENOSYS)
1071 @@ -172,6 +208,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1072 if (do_utime(fname, stp) == 0)
1075 +#ifdef SUPPORT_FORCE_CHANGE
1076 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1082 diff --git a/xattrs.c b/xattrs.c
1085 @@ -1203,7 +1203,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
1086 mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
1087 | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
1088 if (fst.st_mode != mode)
1089 - do_chmod(fname, mode);
1090 + do_chmod(fname, mode, ST_FLAGS(fst));
1091 if (!IS_DEVICE(fst.st_mode))
1092 fst.st_rdev = 0; /* just in case */