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: c3cf174e5ed52e709ecdfd65c7d5da34c7574b96
11 diff --git a/compat.c b/compat.c
14 @@ -39,6 +39,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 @@ -46,6 +47,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 @@ -77,7 +79,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 @@ -566,6 +568,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 @@ -726,6 +730,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 @@ -868,6 +891,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 @@ -1026,6 +1053,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 @@ -1427,6 +1458,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 @@ -487,6 +489,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 @@ -548,6 +554,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 @@ -1442,6 +1453,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 @@ -1484,10 +1499,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 @@ -1522,6 +1542,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
271 int exists = statret == 0 && !S_ISDIR(sx.st.st_mode);
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 @@ -2102,17 +2126,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 @@ -965,6 +969,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 @@ -57,6 +57,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 @@ -94,6 +95,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 @@ -682,6 +684,11 @@ static void print_info_flags(enum logcode f)
388 +#ifndef SUPPORT_FILEFLAGS
396 @@ -835,6 +842,8 @@ static struct poptOption long_options[] = {
397 {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
398 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
399 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
400 + {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 },
401 + {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 },
402 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
403 {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
404 {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
405 @@ -932,6 +941,12 @@ static struct poptOption long_options[] = {
406 {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
407 {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
408 {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
409 + {"force-delete", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
410 + {"no-force-delete", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
411 + {"force-change", 0, POPT_ARG_VAL, &force_change, ALL_IMMUTABLE, 0, 0 },
412 + {"no-force-change", 0, POPT_ARG_VAL, &force_change, 0, 0, 0 },
413 + {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
414 + {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
415 {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
416 {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
417 {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
418 @@ -1231,6 +1246,14 @@ static void set_refuse_options(void)
419 #ifndef SUPPORT_CRTIMES
420 parse_one_refuse_match(0, "crtimes", list_end);
422 +#ifndef SUPPORT_FILEFLAGS
423 + parse_one_refuse_match(0, "fileflags", list_end);
425 +#ifndef SUPPORT_FORCE_CHANGE
426 + parse_one_refuse_match(0, "force-change", list_end);
427 + parse_one_refuse_match(0, "force-uchange", list_end);
428 + parse_one_refuse_match(0, "force-schange", list_end);
431 /* Now we use the descrip values to actually mark the options for refusal. */
432 for (op = long_options; op != list_end; op++) {
433 @@ -2868,6 +2891,9 @@ void server_options(char **args, int *argc_p)
434 if (xfer_dirs && !recurse && delete_mode && am_sender)
435 args[ac++] = "--no-r";
437 + if (preserve_fileflags)
438 + args[ac++] = "--fileflags";
440 if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
441 if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
443 @@ -2976,6 +3002,16 @@ void server_options(char **args, int *argc_p)
444 args[ac++] = "--delete-excluded";
446 args[ac++] = "--force";
447 +#ifdef SUPPORT_FORCE_CHANGE
448 + if (force_change) {
449 + if (force_change == ALL_IMMUTABLE)
450 + args[ac++] = "--force-change";
451 + else if (force_change == USR_IMMUTABLE)
452 + args[ac++] = "--force-uchange";
453 + else if (force_change == SYS_IMMUTABLE)
454 + args[ac++] = "--force-schange";
458 args[ac++] = "--only-write-batch=X";
460 diff --git a/rsync.1.md b/rsync.1.md
463 @@ -361,6 +361,7 @@ detailed description below for a complete description.
464 --keep-dirlinks, -K treat symlinked dir on receiver as dir
465 --hard-links, -H preserve hard links
466 --perms, -p preserve permissions
467 +--fileflags preserve file-flags (aka chflags)
468 --executability, -E preserve executability
469 --chmod=CHMOD affect file and/or directory permissions
470 --acls, -A preserve ACLs (implies --perms)
471 @@ -401,7 +402,10 @@ detailed description below for a complete description.
472 --ignore-missing-args ignore missing source args without error
473 --delete-missing-args delete missing source args from destination
474 --ignore-errors delete even if there are I/O errors
475 ---force force deletion of dirs even if not empty
476 +--force-delete force deletion of directories even if not empty
477 +--force-change affect user-/system-immutable files/dirs
478 +--force-uchange affect user-immutable files/dirs
479 +--force-schange affect system-immutable files/dirs
480 --max-delete=NUM don't delete more than NUM files
481 --max-size=SIZE don't transfer any file larger than SIZE
482 --min-size=SIZE don't transfer any file smaller than SIZE
483 @@ -708,6 +712,8 @@ your home directory (remove the '=' for that).
485 Note that `-a` **does not preserve hardlinks**, because finding
486 multiply-linked files is expensive. You must separately specify `-H`.
487 + Note also that for backward compatibility, `-a` currently does **not**
488 + imply the `--fileflags` option.
492 @@ -1066,7 +1072,7 @@ your home directory (remove the '=' for that).
493 Without this option, if the sending side has replaced a directory with a
494 symlink to a directory, the receiving side will delete anything that is in
495 the way of the new symlink, including a directory hierarchy (as long as
496 - `--force` or `--delete` is in effect).
497 + `--force-delete` or `--delete` is in effect).
499 See also `--keep-dirlinks` for an analogous option for the receiving side.
501 @@ -1252,6 +1258,29 @@ your home directory (remove the '=' for that).
502 those used by `--fake-super`) unless you repeat the option (e.g. `-XX`).
503 This "copy all xattrs" mode cannot be used with `--fake-super`.
505 +0. `--fileflags` This option causes rsync to update the file-flags to be the
506 + same as the source files and directories (if your OS supports the
507 + **chflags**(2) system call). Some flags can only be altered by the
508 + super-user and some might only be unset below a certain secure-level
509 + (usually single-user mode). It will not make files alterable that are set
510 + to immutable on the receiver. To do that, see `--force-change`,
511 + `--force-uchange`, and `--force-schange`.
513 +0. `--force-change` This option causes rsync to disable both user-immutable
514 + and system-immutable flags on files and directories that are being updated
515 + or deleted on the receiving side. This option overrides `--force-uchange`
516 + and `--force-schange`.
518 +0. `--force-uchange` This option causes rsync to disable user-immutable flags
519 + on files and directories that are being updated or deleted on the receiving
520 + side. It does not try to affect system flags. This option overrides
521 + `--force-change` and `--force-schange`.
523 +0. `--force-schange` This option causes rsync to disable system-immutable
524 + flags on files and directories that are being updated or deleted on the
525 + receiving side. It does not try to affect user flags. This option
526 + overrides `--force-change` and `--force-uchange`.
530 This option tells rsync to apply one or more comma-separated "chmod" modes
531 @@ -1719,7 +1748,7 @@ your home directory (remove the '=' for that).
532 option a step farther: each missing arg will become a deletion request of
533 the corresponding destination file on the receiving side (should it exist).
534 If the destination file is a non-empty directory, it will only be
535 - successfully deleted if `--force` or `--delete` are in effect. Other than
536 + successfully deleted if `--force-delete` or `--delete` are in effect. Other than
537 that, this option is independent of any other type of delete processing.
539 The missing source files are represented by special file-list entries which
540 @@ -1730,15 +1759,16 @@ your home directory (remove the '=' for that).
541 Tells `--delete` to go ahead and delete files even when there are I/O
547 This option tells rsync to delete a non-empty directory when it is to be
548 replaced by a non-directory. This is only relevant if deletions are not
549 active (see `--delete` for details).
551 - Note for older rsync versions: `--force` used to still be required when
552 - using `--delete-after`, and it used to be non-functional unless the
553 - `--recursive` option was also enabled.
554 + This option can be abbreviated `--force` for backward compatibility. Note
555 + that some older rsync versions used to still require `--force` when using
556 + `--delete-after`, and it used to be non-functional unless the `--recursive`
557 + option was also enabled.
559 0. `--max-delete=NUM`
561 @@ -2651,7 +2681,7 @@ your home directory (remove the '=' for that).
562 output of other verbose messages).
564 The "%i" escape has a cryptic output that is 11 letters long. The general
565 - format is like the string `YXcstpoguax`, where **Y** is replaced by the type
566 + format is like the string `YXcstpoguaxf`, where **Y** is replaced by the type
567 of update being done, **X** is replaced by the file-type, and the other
568 letters represent attributes that may be output if they are being modified.
570 diff --git a/rsync.c b/rsync.c
573 @@ -31,6 +31,7 @@ extern int dry_run;
574 extern int preserve_acls;
575 extern int preserve_xattrs;
576 extern int preserve_perms;
577 +extern int preserve_fileflags;
578 extern int preserve_executability;
579 extern int preserve_times;
581 @@ -467,6 +468,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
585 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
586 +/* Set a file's st_flags. */
587 +static int set_fileflags(const char *fname, uint32 fileflags)
589 + if (do_chflags(fname, fileflags) != 0) {
590 + rsyserr(FERROR_XFER, errno,
591 + "failed to set file flags on %s",
592 + full_fname(fname));
599 +/* Remove immutable flags from an object, so it can be altered/removed. */
600 +int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags)
602 + if (S_ISLNK(mode) || !(fileflags & iflags))
604 + if (!set_fileflags(fname, fileflags & ~iflags))
609 +/* Undo a prior make_mutable() call that returned a 1. */
610 +int undo_make_mutable(const char *fname, uint32 fileflags)
612 + if (!set_fileflags(fname, fileflags))
618 static int same_mtime(struct file_struct *file, STRUCT_STAT *st, int extra_accuracy)
621 @@ -543,7 +577,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
623 uid_t uid = change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid;
624 gid_t gid = change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid;
625 - if (do_lchown(fname, uid, gid) != 0) {
626 + if (do_lchown(fname, uid, gid, sxp->st.st_mode, ST_FLAGS(sxp->st)) != 0) {
627 /* We shouldn't have attempted to change uid
628 * or gid unless have the privilege. */
629 rsyserr(FERROR_XFER, errno, "%s %s failed",
630 @@ -642,7 +676,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
633 if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
634 - int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode);
635 + int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode, ST_FLAGS(sxp->st));
637 rsyserr(FERROR_XFER, errno,
638 "failed to set permissions on %s",
639 @@ -654,6 +688,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
643 +#ifdef SUPPORT_FILEFLAGS
644 + if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode)
645 + && sxp->st.st_flags != F_FFLAGS(file)) {
646 + uint32 fileflags = F_FFLAGS(file);
647 + if (flags & ATTRS_DELAY_IMMUTABLE)
648 + fileflags &= ~ALL_IMMUTABLE;
649 + if (sxp->st.st_flags != fileflags
650 + && !set_fileflags(fname, fileflags))
656 if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
658 rprintf(FCLIENT, "%s\n", fname);
659 @@ -731,7 +778,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
661 /* Change permissions before putting the file into place. */
662 set_file_attrs(fnametmp, file, NULL, fnamecmp,
663 - ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
664 + ATTRS_DELAY_IMMUTABLE
665 + | (ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME));
667 /* move tmp file over real file */
668 if (DEBUG_GTE(RECV, 1))
669 @@ -748,6 +796,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
672 /* The file was moved into place (not copied), so it's done. */
673 +#ifdef SUPPORT_FILEFLAGS
674 + if (preserve_fileflags && F_FFLAGS(file) & ALL_IMMUTABLE)
675 + set_fileflags(fname, F_FFLAGS(file));
679 /* The file was copied, so tweak the perms of the copied file. If it
680 diff --git a/rsync.h b/rsync.h
685 /* The following XMIT flags require an rsync that uses a varint for the flag values */
687 -#define XMIT_RESERVED_16 (1<<16) /* reserved for future fileflags use */
688 +#define XMIT_SAME_FLAGS (1<<16) /* any protocol - restricted by command-line option */
689 #define XMIT_CRTIME_EQ_MTIME (1<<17) /* any protocol - restricted by command-line option */
691 /* These flags are used in the live flist data. */
693 #define ATTRS_SKIP_MTIME (1<<1)
694 #define ATTRS_ACCURATE_TIME (1<<2)
695 #define ATTRS_SKIP_ATIME (1<<3)
696 +#define ATTRS_DELAY_IMMUTABLE (1<<4)
697 #define ATTRS_SKIP_CRTIME (1<<5)
701 #define ITEM_REPORT_GROUP (1<<6)
702 #define ITEM_REPORT_ACL (1<<7)
703 #define ITEM_REPORT_XATTR (1<<8)
704 +#define ITEM_REPORT_FFLAGS (1<<9)
705 #define ITEM_REPORT_CRTIME (1<<10)
706 #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
707 #define ITEM_XNAME_FOLLOWS (1<<12)
708 @@ -574,6 +576,31 @@ typedef unsigned int size_t;
709 #define SUPPORT_CRTIMES 1
712 +#define NO_FFLAGS ((uint32)-1)
715 +#define SUPPORT_FILEFLAGS 1
716 +#define SUPPORT_FORCE_CHANGE 1
719 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
721 +#define UF_NOUNLINK 0
724 +#define SF_NOUNLINK 0
726 +#define USR_IMMUTABLE (UF_IMMUTABLE|UF_NOUNLINK|UF_APPEND)
727 +#define SYS_IMMUTABLE (SF_IMMUTABLE|SF_NOUNLINK|SF_APPEND)
728 +#define ALL_IMMUTABLE (USR_IMMUTABLE|SYS_IMMUTABLE)
729 +#define ST_FLAGS(st) ((st).st_flags)
731 +#define USR_IMMUTABLE 0
732 +#define SYS_IMMUTABLE 0
733 +#define ALL_IMMUTABLE 0
734 +#define ST_FLAGS(st) NO_FFLAGS
737 /* Find a variable that is either exactly 32-bits or longer.
738 * If some code depends on 32-bit truncation, it will need to
739 * take special action in a "#if SIZEOF_INT32 > 4" section. */
740 @@ -800,6 +827,7 @@ extern int pathname_ndx;
741 extern int depth_ndx;
744 +extern int fileflags_ndx;
746 extern int xattrs_ndx;
748 @@ -854,6 +882,11 @@ extern int xattrs_ndx;
749 /* When the associated option is on, all entries will have these present: */
750 #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
751 #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
752 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
753 +#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum
755 +#define F_FFLAGS(f) NO_FFLAGS
757 #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
758 #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
759 #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
760 diff --git a/syscall.c b/syscall.c
763 @@ -38,6 +38,7 @@ extern int am_root;
764 extern int am_sender;
765 extern int read_only;
766 extern int list_only;
767 +extern int force_change;
769 extern int preallocate_files;
770 extern int preserve_perms;
771 @@ -77,7 +78,23 @@ int do_unlink(const char *fname)
773 if (dry_run) return 0;
774 RETURN_ERROR_IF_RO_OR_LO;
775 - return unlink(fname);
776 + if (unlink(fname) == 0)
778 +#ifdef SUPPORT_FORCE_CHANGE
779 + if (force_change && errno == EPERM) {
782 + if (x_lstat(fname, &st, NULL) == 0
783 + && make_mutable(fname, st.st_mode, st.st_flags, force_change) > 0) {
784 + if (unlink(fname) == 0)
786 + undo_make_mutable(fname, st.st_flags);
788 + /* TODO: handle immutable directories */
796 @@ -138,14 +155,35 @@ int do_link(const char *old_path, const char *new_path)
800 -int do_lchown(const char *path, uid_t owner, gid_t group)
801 +int do_lchown(const char *path, uid_t owner, gid_t group, UNUSED(mode_t mode), UNUSED(uint32 fileflags))
803 if (dry_run) return 0;
804 RETURN_ERROR_IF_RO_OR_LO;
808 - return lchown(path, owner, group);
809 + if (lchown(path, owner, group) == 0)
811 +#ifdef SUPPORT_FORCE_CHANGE
812 + if (force_change && errno == EPERM) {
813 + if (fileflags == NO_FFLAGS) {
815 + if (x_lstat(path, &st, NULL) == 0) {
817 + fileflags = st.st_flags;
820 + if (fileflags != NO_FFLAGS
821 + && make_mutable(path, mode, fileflags, force_change) > 0) {
822 + int ret = lchown(path, owner, group);
823 + undo_make_mutable(path, fileflags);
833 int do_mknod(const char *pathname, mode_t mode, dev_t dev)
834 @@ -185,7 +223,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
838 - return do_chmod(pathname, mode);
839 + return do_chmod(pathname, mode, 0);
843 @@ -202,7 +240,22 @@ int do_rmdir(const char *pathname)
845 if (dry_run) return 0;
846 RETURN_ERROR_IF_RO_OR_LO;
847 - return rmdir(pathname);
848 + if (rmdir(pathname) == 0)
850 +#ifdef SUPPORT_FORCE_CHANGE
851 + if (force_change && errno == EPERM) {
854 + if (x_lstat(pathname, &st, NULL) == 0
855 + && make_mutable(pathname, st.st_mode, st.st_flags, force_change) > 0) {
856 + if (rmdir(pathname) == 0)
858 + undo_make_mutable(pathname, st.st_flags);
866 int do_open(const char *pathname, int flags, mode_t mode)
867 @@ -221,7 +274,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
871 -int do_chmod(const char *path, mode_t mode)
872 +int do_chmod(const char *path, mode_t mode, UNUSED(uint32 fileflags))
875 if (dry_run) return 0;
876 @@ -244,17 +297,72 @@ int do_chmod(const char *path, mode_t mode)
878 code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
879 #endif /* !HAVE_LCHMOD */
880 +#ifdef SUPPORT_FORCE_CHANGE
881 + if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) {
882 + if (fileflags == NO_FFLAGS) {
884 + if (x_lstat(path, &st, NULL) == 0)
885 + fileflags = st.st_flags;
887 + if (fileflags != NO_FFLAGS
888 + && make_mutable(path, mode, fileflags, force_change) > 0) {
889 + code = chmod(path, mode & CHMOD_BITS);
890 + undo_make_mutable(path, fileflags);
897 if (code != 0 && (preserve_perms || preserve_executability))
904 +int do_chflags(const char *path, uint32 fileflags)
906 + if (dry_run) return 0;
907 + RETURN_ERROR_IF_RO_OR_LO;
908 + return chflags(path, fileflags);
912 int do_rename(const char *old_path, const char *new_path)
914 if (dry_run) return 0;
915 RETURN_ERROR_IF_RO_OR_LO;
916 - return rename(old_path, new_path);
917 + if (rename(old_path, new_path) == 0)
919 +#ifdef SUPPORT_FORCE_CHANGE
920 + if (force_change && errno == EPERM) {
921 + STRUCT_STAT st1, st2;
922 + int became_mutable;
924 + if (x_lstat(old_path, &st1, NULL) != 0)
926 + became_mutable = make_mutable(old_path, st1.st_mode, st1.st_flags, force_change) > 0;
927 + if (became_mutable && rename(old_path, new_path) == 0)
929 + if (x_lstat(new_path, &st2, NULL) == 0
930 + && make_mutable(new_path, st2.st_mode, st2.st_flags, force_change) > 0) {
931 + if (rename(old_path, new_path) == 0) {
933 + if (became_mutable) /* Yes, use new_path and st1! */
934 + undo_make_mutable(new_path, st1.st_flags);
937 + undo_make_mutable(new_path, st2.st_flags);
939 + /* TODO: handle immutable directories */
940 + if (became_mutable)
941 + undo_make_mutable(old_path, st1.st_flags);
949 #ifdef HAVE_FTRUNCATE
950 diff --git a/t_stub.c b/t_stub.c
953 @@ -28,6 +28,8 @@ int protect_args = 0;
955 int relative_paths = 0;
956 int module_dirlen = 0;
957 +int force_change = 0;
958 +int preserve_acls = 0;
959 int preserve_times = 0;
960 int preserve_xattrs = 0;
961 int preserve_perms = 0;
962 @@ -110,3 +112,23 @@ filter_rule_list daemon_filter_list;
967 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
968 + int make_mutable(UNUSED(const char *fname), UNUSED(mode_t mode), UNUSED(uint32 fileflags), UNUSED(uint32 iflags))
973 +/* Undo a prior make_mutable() call that returned a 1. */
974 + int undo_make_mutable(UNUSED(const char *fname), UNUSED(uint32 fileflags))
980 +#ifdef SUPPORT_XATTRS
981 + int x_lstat(UNUSED(const char *fname), UNUSED(STRUCT_STAT *fst), UNUSED(STRUCT_STAT *xst))
986 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
987 --- a/testsuite/rsync.fns
988 +++ b/testsuite/rsync.fns
989 @@ -23,9 +23,9 @@ todir="$tmpdir/to"
992 # For itemized output:
993 -all_plus='+++++++++'
995 -dots='.....' # trailing dots after changes
996 +all_plus='++++++++++'
998 +dots='......' # trailing dots after changes
999 tab_ch=' ' # a single tab character
1002 diff --git a/util.c b/util.c
1005 @@ -33,6 +33,7 @@ extern int relative_paths;
1006 extern int preserve_times;
1007 extern int preserve_xattrs;
1008 extern int preallocate_files;
1009 +extern int force_change;
1010 extern char *module_dir;
1011 extern unsigned int module_dirlen;
1012 extern char *partial_dir;
1013 @@ -115,6 +116,33 @@ void print_child_argv(const char *prefix, char **cmd)
1014 rprintf(FCLIENT, " (%d args)\n", cnt);
1017 +#ifdef SUPPORT_FORCE_CHANGE
1018 +static int try_a_force_change(const char *fname, STRUCT_STAT *stp)
1020 + uint32 fileflags = ST_FLAGS(*stp);
1021 + if (fileflags == NO_FFLAGS) {
1023 + if (x_lstat(fname, &st, NULL) == 0)
1024 + fileflags = st.st_flags;
1026 + if (fileflags != NO_FFLAGS && make_mutable(fname, stp->st_mode, fileflags, force_change) > 0) {
1027 + int ret, save_force_change = force_change;
1029 + force_change = 0; /* Make certain we can't come back here. */
1030 + ret = set_times(fname, stp);
1031 + force_change = save_force_change;
1033 + undo_make_mutable(fname, fileflags);
1044 /* This returns 0 for success, 1 for a symlink if symlink time-setting
1045 * is not possible, or -1 for any other error. */
1046 int set_times(const char *fname, STRUCT_STAT *stp)
1047 @@ -142,6 +170,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1049 if (do_utimensat(fname, stp) == 0)
1051 +#ifdef SUPPORT_FORCE_CHANGE
1052 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1055 if (errno != ENOSYS)
1058 @@ -151,6 +183,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1060 if (do_lutimes(fname, stp) == 0)
1062 +#ifdef SUPPORT_FORCE_CHANGE
1063 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1066 if (errno != ENOSYS)
1069 @@ -172,6 +208,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1070 if (do_utime(fname, stp) == 0)
1073 +#ifdef SUPPORT_FORCE_CHANGE
1074 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1080 diff --git a/xattrs.c b/xattrs.c
1083 @@ -1202,7 +1202,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
1084 mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
1085 | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
1086 if (fst.st_mode != mode)
1087 - do_chmod(fname, mode);
1088 + do_chmod(fname, mode, ST_FLAGS(fst));
1089 if (!IS_DEVICE(fst.st_mode))
1090 fst.st_rdev = 0; /* just in case */