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: f7746d0000ac5c72974ad90a8d746561dc8cd10a
11 diff --git a/compat.c b/compat.c
14 @@ -46,12 +46,14 @@ 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 extern int preserve_atimes;
23 extern int preserve_acls;
24 extern int preserve_xattrs;
25 +extern int preserve_fileflags;
26 extern int xfer_flags_as_varint;
27 extern int need_messages_from_generator;
28 extern int delete_mode, delete_before, delete_during, delete_after;
29 @@ -68,7 +70,7 @@ extern char *iconv_opt;
32 /* These index values are for the file-list's extra-attribute array. */
33 -int pathname_ndx, depth_ndx, atimes_ndx, uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
34 +int pathname_ndx, depth_ndx, atimes_ndx, uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
36 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
37 int sender_symlink_iconv = 0; /* sender should convert symlink content */
38 @@ -156,6 +158,8 @@ void setup_protocol(int f_out,int f_in)
39 uid_ndx = ++file_extra_cnt;
41 gid_ndx = ++file_extra_cnt;
42 + if (preserve_fileflags || (force_change && !am_sender))
43 + fileflags_ndx = ++file_extra_cnt;
44 if (preserve_acls && !am_sender)
45 acls_ndx = ++file_extra_cnt;
47 @@ -299,6 +303,10 @@ void setup_protocol(int f_out,int f_in)
48 want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
49 proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
50 xfer_flags_as_varint = compat_flags & CF_VARINT_FLIST_FLAGS ? 1 : 0;
51 + if (!xfer_flags_as_varint && preserve_fileflags) {
52 + fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --fileflags.\n");
53 + exit_cleanup(RERR_PROTOCOL);
56 receiver_symlink_times = am_server
57 ? strchr(client_info, 'L') != NULL
58 diff --git a/delete.c b/delete.c
63 extern int make_backups;
64 extern int max_delete;
65 +extern int force_change;
66 extern char *backup_dir;
67 extern char *backup_suffix;
68 extern int backup_suffix_len;
69 @@ -97,8 +98,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
72 strlcpy(p, fp->basename, remainder);
73 +#ifdef SUPPORT_FORCE_CHANGE
75 + make_mutable(fname, fp->mode, F_FFLAGS(fp), force_change);
77 if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
78 - do_chmod(fname, fp->mode | S_IWUSR);
79 + do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS);
80 /* Save stack by recursing to ourself directly. */
81 if (S_ISDIR(fp->mode)) {
82 if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
83 @@ -139,11 +144,18 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
86 if (flags & DEL_NO_UID_WRITE)
87 - do_chmod(fbuf, mode | S_IWUSR);
88 + do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS);
90 if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
91 /* This only happens on the first call to delete_item() since
92 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
93 +#ifdef SUPPORT_FORCE_CHANGE
96 + if (x_lstat(fbuf, &st, NULL) == 0)
97 + make_mutable(fbuf, st.st_mode, st.st_flags, force_change);
100 ignore_perishable = 1;
101 /* If DEL_RECURSE is not set, this just reports emptiness. */
102 ret = delete_dir_contents(fbuf, flags);
103 diff --git a/flist.c b/flist.c
106 @@ -52,6 +52,7 @@ extern int preserve_links;
107 extern int preserve_hard_links;
108 extern int preserve_devices;
109 extern int preserve_specials;
110 +extern int preserve_fileflags;
111 extern int delete_during;
112 extern int missing_args;
113 extern int eol_nulls;
114 @@ -383,6 +384,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
116 static time_t modtime, atime;
118 +#ifdef SUPPORT_FILEFLAGS
119 + static uint32 fileflags;
121 #ifdef SUPPORT_HARD_LINKS
124 @@ -426,6 +430,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
125 xflags |= XMIT_SAME_MODE;
128 +#ifdef SUPPORT_FILEFLAGS
129 + if (preserve_fileflags) {
130 + if (F_FFLAGS(file) == fileflags)
131 + xflags |= XMIT_SAME_FLAGS;
133 + fileflags = F_FFLAGS(file);
137 if (preserve_devices && IS_DEVICE(mode)) {
138 if (protocol_version < 28) {
139 @@ -576,6 +588,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
140 write_varint(f, F_MOD_NSEC(file));
141 if (!(xflags & XMIT_SAME_MODE))
142 write_int(f, to_wire_mode(mode));
143 +#ifdef SUPPORT_FILEFLAGS
144 + if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
145 + write_int(f, (int)fileflags);
147 if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
148 write_varlong(f, atime, 4);
149 if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
150 @@ -667,6 +683,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
152 static int64 modtime, atime;
154 +#ifdef SUPPORT_FILEFLAGS
155 + static uint32 fileflags;
157 #ifdef SUPPORT_HARD_LINKS
160 @@ -776,6 +795,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
162 if (atimes_ndx && !S_ISDIR(mode))
163 atime = F_ATIME(first);
164 +#ifdef SUPPORT_FILEFLAGS
165 + if (preserve_fileflags)
166 + fileflags = F_FFLAGS(first);
169 uid = F_OWNER(first);
171 @@ -827,6 +850,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
173 if (chmod_modes && !S_ISLNK(mode) && mode)
174 mode = tweak_mode(mode, chmod_modes);
175 +#ifdef SUPPORT_FILEFLAGS
176 + if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
177 + fileflags = (uint32)read_int(f);
180 if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
181 if (protocol_version < 30)
182 @@ -985,6 +1012,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
186 +#ifdef SUPPORT_FILEFLAGS
187 + if (preserve_fileflags)
188 + F_FFLAGS(file) = fileflags;
193 @@ -1384,6 +1415,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
196 file->mode = st.st_mode;
197 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
199 + F_FFLAGS(file) = st.st_flags;
202 F_OWNER(file) = st.st_uid;
204 diff --git a/generator.c b/generator.c
207 @@ -43,8 +43,10 @@ extern int write_devices;
208 extern int preserve_specials;
209 extern int preserve_hard_links;
210 extern int preserve_executability;
211 +extern int preserve_fileflags;
212 extern int preserve_perms;
213 extern int preserve_times;
214 +extern int force_change;
215 extern int delete_mode;
216 extern int delete_before;
217 extern int delete_during;
218 @@ -471,6 +473,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
220 if (perms_differ(file, sxp))
222 +#ifdef SUPPORT_FILEFLAGS
223 + if (preserve_fileflags && sxp->st.st_flags != F_FFLAGS(file))
226 if (ownership_differs(file, sxp))
229 @@ -525,6 +531,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
230 if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
231 && sxp->st.st_gid != (gid_t)F_GROUP(file))
232 iflags |= ITEM_REPORT_GROUP;
233 +#ifdef SUPPORT_FILEFLAGS
234 + if (preserve_fileflags && !S_ISLNK(file->mode)
235 + && sxp->st.st_flags != F_FFLAGS(file))
236 + iflags |= ITEM_REPORT_FFLAGS;
239 if (preserve_acls && !S_ISLNK(file->mode)) {
240 if (!ACL_READY(*sxp))
241 @@ -1427,6 +1438,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
242 file->mode = dest_mode(file->mode, sx.st.st_mode,
243 dflt_perms, statret == 0);
245 +#ifdef SUPPORT_FORCE_CHANGE
246 + if (force_change && !preserve_fileflags)
247 + F_FFLAGS(file) = sx.st.st_flags;
249 if (statret != 0 && basis_dir[0] != NULL) {
250 int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
252 @@ -1471,10 +1486,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
253 * readable and writable permissions during the time we are
254 * putting files within them. This is then restored to the
255 * former permissions after the transfer is done. */
256 +#ifdef SUPPORT_FORCE_CHANGE
257 + if (force_change && F_FFLAGS(file) & force_change
258 + && make_mutable(fname, file->mode, F_FFLAGS(file), force_change))
259 + need_retouch_dir_perms = 1;
262 if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) {
263 mode_t mode = file->mode | S_IRWXU;
264 - if (do_chmod(fname, mode) < 0) {
265 + if (do_chmod(fname, mode, 0) < 0) {
266 rsyserr(FERROR_XFER, errno,
267 "failed to modify permissions on %s",
269 @@ -1510,6 +1530,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
270 file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
273 +#ifdef SUPPORT_FORCE_CHANGE
274 + if (force_change && !preserve_fileflags)
275 + F_FFLAGS(file) = sx.st.st_flags;
278 #ifdef SUPPORT_HARD_LINKS
279 if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
280 @@ -2077,17 +2101,25 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
282 fname = f_name(file, NULL);
284 - do_chmod(fname, file->mode);
285 + do_chmod(fname, file->mode, 0);
286 if (need_retouch_dir_times) {
288 if (link_stat(fname, &st, 0) == 0 && time_diff(&st, file)) {
289 st.st_mtime = file->modtime;
291 st.ST_MTIME_NSEC = F_MOD_NSEC_or_0(file);
293 +#ifdef SUPPORT_FORCE_CHANGE
294 + st.st_mode = file->mode;
297 set_times(fname, &st);
300 +#ifdef SUPPORT_FORCE_CHANGE
301 + if (force_change && F_FFLAGS(file) & force_change)
302 + undo_make_mutable(fname, F_FFLAGS(file));
304 if (counter >= loopchk_limit) {
306 maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
307 diff --git a/log.c b/log.c
310 @@ -719,7 +719,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
311 : S_ISLNK(file->mode) ? 'U' : 'u';
312 c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
313 c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
315 + c[11] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
318 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
319 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
320 diff --git a/main.c b/main.c
324 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
327 +#ifdef SUPPORT_FORCE_CHANGE
328 +#include <sys/sysctl.h>
332 extern int list_only;
333 @@ -52,6 +55,7 @@ extern int copy_unsafe_links;
334 extern int keep_dirlinks;
335 extern int preserve_hard_links;
336 extern int protocol_version;
337 +extern int force_change;
338 extern int file_total;
340 extern int xfer_dirs;
341 @@ -944,6 +948,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
342 * points to an identical file won't be replaced by the referent. */
343 copy_links = copy_dirlinks = copy_unsafe_links = 0;
345 +#ifdef SUPPORT_FORCE_CHANGE
346 + if (force_change & SYS_IMMUTABLE) {
347 + /* Determine whether we'll be able to unlock a system immutable item. */
349 + int securityLevel = 0;
350 + size_t len = sizeof securityLevel;
353 + mib[1] = KERN_SECURELVL;
354 + if (sysctl(mib, 2, &securityLevel, &len, NULL, 0) == 0 && securityLevel > 0) {
355 + rprintf(FERROR, "System security level is too high to force mutability on system immutable files and directories.\n");
356 + exit_cleanup(RERR_UNSUPPORTED);
361 #ifdef SUPPORT_HARD_LINKS
362 if (preserve_hard_links && !inc_recurse)
363 match_hard_links(first_flist);
364 diff --git a/options.c b/options.c
367 @@ -57,6 +57,7 @@ int preserve_hard_links = 0;
368 int preserve_acls = 0;
369 int preserve_xattrs = 0;
370 int preserve_perms = 0;
371 +int preserve_fileflags = 0;
372 int preserve_executability = 0;
373 int preserve_devices = 0;
374 int preserve_specials = 0;
375 @@ -93,6 +94,7 @@ int numeric_ids = 0;
377 int allow_8bit_chars = 0;
378 int force_delete = 0;
379 +int force_change = 0;
381 int prune_empty_dirs = 0;
383 @@ -578,6 +580,7 @@ static void print_rsync_version(enum logcode f)
384 char const *links = "no ";
385 char const *iconv = "no ";
386 char const *ipv6 = "no ";
387 + char const *fileflags = "no ";
388 STRUCT_STAT *dumstat;
390 #if SUBPROTOCOL_VERSION != 0
391 @@ -614,6 +617,9 @@ static void print_rsync_version(enum logcode f)
392 #ifdef CAN_SET_SYMLINK_TIMES
395 +#ifdef SUPPORT_FILEFLAGS
399 rprintf(f, "%s version %s protocol version %d%s\n",
400 RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
401 @@ -627,8 +633,8 @@ static void print_rsync_version(enum logcode f)
402 (int)(sizeof (int64) * 8));
403 rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
404 got_socketpair, hardlinks, links, ipv6, have_inplace);
405 - rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc\n",
406 - have_inplace, acls, xattrs, iconv, symtimes, prealloc);
407 + rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags\n",
408 + have_inplace, acls, xattrs, iconv, symtimes, prealloc, fileflags);
410 #ifdef MAINTAINER_MODE
411 rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
412 @@ -699,6 +705,9 @@ void usage(enum logcode F)
413 rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
414 rprintf(F," -H, --hard-links preserve hard links\n");
415 rprintf(F," -p, --perms preserve permissions\n");
416 +#ifdef SUPPORT_FILEFLAGS
417 + rprintf(F," --fileflags preserve file-flags (aka chflags)\n");
419 rprintf(F," -E, --executability preserve the file's executability\n");
420 rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
422 @@ -748,7 +757,12 @@ void usage(enum logcode F)
423 rprintf(F," --ignore-missing-args ignore missing source args without error\n");
424 rprintf(F," --delete-missing-args delete missing source args from destination\n");
425 rprintf(F," --ignore-errors delete even if there are I/O errors\n");
426 - rprintf(F," --force force deletion of directories even if not empty\n");
427 + rprintf(F," --force-delete force deletion of directories even if not empty\n");
428 +#ifdef SUPPORT_FORCE_CHANGE
429 + rprintf(F," --force-change affect user-/system-immutable files/dirs\n");
430 + rprintf(F," --force-uchange affect user-immutable files/dirs\n");
431 + rprintf(F," --force-schange affect system-immutable files/dirs\n");
433 rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
434 rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
435 rprintf(F," --min-size=SIZE don't transfer any file smaller than SIZE\n");
436 @@ -866,6 +880,10 @@ static struct poptOption long_options[] = {
437 {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
438 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
439 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
440 +#ifdef SUPPORT_FILEFLAGS
441 + {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 },
442 + {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 },
444 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
445 {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
446 {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
447 @@ -959,6 +977,14 @@ static struct poptOption long_options[] = {
448 {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
449 {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
450 {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
451 + {"force-delete", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
452 + {"no-force-delete", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
453 +#ifdef SUPPORT_FORCE_CHANGE
454 + {"force-change", 0, POPT_ARG_VAL, &force_change, ALL_IMMUTABLE, 0, 0 },
455 + {"no-force-change", 0, POPT_ARG_VAL, &force_change, 0, 0, 0 },
456 + {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
457 + {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
459 {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
460 {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
461 {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
462 @@ -2616,6 +2642,9 @@ void server_options(char **args, int *argc_p)
463 if (xfer_dirs && !recurse && delete_mode && am_sender)
464 args[ac++] = "--no-r";
466 + if (preserve_fileflags)
467 + args[ac++] = "--fileflags";
469 if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
470 if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
472 @@ -2709,6 +2738,16 @@ void server_options(char **args, int *argc_p)
473 args[ac++] = "--delete-excluded";
475 args[ac++] = "--force";
476 +#ifdef SUPPORT_FORCE_CHANGE
477 + if (force_change) {
478 + if (force_change == ALL_IMMUTABLE)
479 + args[ac++] = "--force-change";
480 + else if (force_change == USR_IMMUTABLE)
481 + args[ac++] = "--force-uchange";
482 + else if (force_change == SYS_IMMUTABLE)
483 + args[ac++] = "--force-schange";
487 args[ac++] = "--only-write-batch=X";
489 diff --git a/rsync.c b/rsync.c
492 @@ -31,6 +31,7 @@ extern int dry_run;
493 extern int preserve_acls;
494 extern int preserve_xattrs;
495 extern int preserve_perms;
496 +extern int preserve_fileflags;
497 extern int preserve_executability;
498 extern int preserve_times;
500 @@ -468,6 +469,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
504 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
505 +/* Set a file's st_flags. */
506 +static int set_fileflags(const char *fname, uint32 fileflags)
508 + if (do_chflags(fname, fileflags) != 0) {
509 + rsyserr(FERROR_XFER, errno,
510 + "failed to set file flags on %s",
511 + full_fname(fname));
518 +/* Remove immutable flags from an object, so it can be altered/removed. */
519 +int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags)
521 + if (S_ISLNK(mode) || !(fileflags & iflags))
523 + if (!set_fileflags(fname, fileflags & ~iflags))
528 +/* Undo a prior make_mutable() call that returned a 1. */
529 +int undo_make_mutable(const char *fname, uint32 fileflags)
531 + if (!set_fileflags(fname, fileflags))
537 int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
538 const char *fnamecmp, int flags)
540 @@ -529,7 +563,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
542 uid_t uid = change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid;
543 gid_t gid = change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid;
544 - if (do_lchown(fname, uid, gid) != 0) {
545 + if (do_lchown(fname, uid, gid, sxp->st.st_mode, ST_FLAGS(sxp->st)) != 0) {
546 /* We shouldn't have attempted to change uid
547 * or gid unless have the privilege. */
548 rsyserr(FERROR_XFER, errno, "%s %s failed",
549 @@ -620,7 +654,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
552 if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
553 - int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode);
554 + int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode, ST_FLAGS(sxp->st));
556 rsyserr(FERROR_XFER, errno,
557 "failed to set permissions on %s",
558 @@ -632,6 +666,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
562 +#ifdef SUPPORT_FILEFLAGS
563 + if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode)
564 + && sxp->st.st_flags != F_FFLAGS(file)) {
565 + uint32 fileflags = F_FFLAGS(file);
566 + if (flags & ATTRS_DELAY_IMMUTABLE)
567 + fileflags &= ~ALL_IMMUTABLE;
568 + if (sxp->st.st_flags != fileflags
569 + && !set_fileflags(fname, fileflags))
575 if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
577 rprintf(FCLIENT, "%s\n", fname);
578 @@ -709,7 +756,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
580 /* Change permissions before putting the file into place. */
581 set_file_attrs(fnametmp, file, NULL, fnamecmp,
582 - ok_to_set_time ? ATTRS_SET_NANO : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
583 + ATTRS_DELAY_IMMUTABLE
584 + | (ok_to_set_time ? ATTRS_SET_NANO : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME));
586 /* move tmp file over real file */
587 if (DEBUG_GTE(RECV, 1))
588 @@ -726,6 +774,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
591 /* The file was moved into place (not copied), so it's done. */
592 +#ifdef SUPPORT_FILEFLAGS
593 + if (preserve_fileflags && F_FFLAGS(file) & ALL_IMMUTABLE)
594 + set_fileflags(fname, F_FFLAGS(file));
598 /* The file was copied, so tweak the perms of the copied file. If it
599 diff --git a/rsync.h b/rsync.h
604 /* The following XMIT flags require an rsync that uses a varint for the flag values */
606 -#define XMIT_RESERVED_16 (1<<16) /* reserved for future fileflags use */
607 +#define XMIT_SAME_FLAGS (1<<16) /* any protocol - restricted by command-line option */
608 #define XMIT_RESERVED_17 (1<<17) /* reserved for future crtimes use */
610 /* These flags are used in the live flist data. */
612 #define ATTRS_SKIP_MTIME (1<<1)
613 #define ATTRS_SET_NANO (1<<2)
614 #define ATTRS_SKIP_ATIME (1<<3)
615 +#define ATTRS_DELAY_IMMUTABLE (1<<4)
618 #define NORMAL_FLUSH 0
620 #define ITEM_REPORT_GROUP (1<<6)
621 #define ITEM_REPORT_ACL (1<<7)
622 #define ITEM_REPORT_XATTR (1<<8)
623 +#define ITEM_REPORT_FFLAGS (1<<9)
624 #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
625 #define ITEM_XNAME_FOLLOWS (1<<12)
626 #define ITEM_IS_NEW (1<<13)
627 @@ -543,6 +545,28 @@ typedef unsigned int size_t;
631 +#define NO_FFLAGS ((uint32)-1)
634 +#define SUPPORT_FILEFLAGS 1
635 +#define SUPPORT_FORCE_CHANGE 1
638 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
640 +#define UF_NOUNLINK 0
643 +#define SF_NOUNLINK 0
645 +#define USR_IMMUTABLE (UF_IMMUTABLE|UF_NOUNLINK|UF_APPEND)
646 +#define SYS_IMMUTABLE (SF_IMMUTABLE|SF_NOUNLINK|SF_APPEND)
647 +#define ALL_IMMUTABLE (USR_IMMUTABLE|SYS_IMMUTABLE)
648 +#define ST_FLAGS(st) ((st).st_flags)
650 +#define ST_FLAGS(st) NO_FFLAGS
653 /* Find a variable that is either exactly 32-bits or longer.
654 * If some code depends on 32-bit truncation, it will need to
655 * take special action in a "#if SIZEOF_INT32 > 4" section. */
656 @@ -753,6 +777,7 @@ extern int pathname_ndx;
657 extern int depth_ndx;
660 +extern int fileflags_ndx;
662 extern int xattrs_ndx;
664 @@ -803,6 +828,11 @@ extern int xattrs_ndx;
665 /* When the associated option is on, all entries will have these present: */
666 #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
667 #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
668 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
669 +#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum
671 +#define F_FFLAGS(f) NO_FFLAGS
673 #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
674 #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
675 #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
676 diff --git a/rsync.yo b/rsync.yo
679 @@ -368,6 +368,7 @@ to the detailed description below for a complete description. verb(
680 -K, --keep-dirlinks treat symlinked dir on receiver as dir
681 -H, --hard-links preserve hard links
682 -p, --perms preserve permissions
683 + --fileflags preserve file-flags (aka chflags)
684 -E, --executability preserve executability
685 --chmod=CHMOD affect file and/or directory permissions
686 -A, --acls preserve ACLs (implies -p)
687 @@ -407,7 +408,10 @@ to the detailed description below for a complete description. verb(
688 --ignore-missing-args ignore missing source args without error
689 --delete-missing-args delete missing source args from destination
690 --ignore-errors delete even if there are I/O errors
691 - --force force deletion of dirs even if not empty
692 + --force-delete force deletion of dirs even if not empty
693 + --force-change affect user/system immutable files/dirs
694 + --force-uchange affect user-immutable files/dirs
695 + --force-schange affect system-immutable files/dirs
696 --max-delete=NUM don't delete more than NUM files
697 --max-size=SIZE don't transfer any file larger than SIZE
698 --min-size=SIZE don't transfer any file smaller than SIZE
699 @@ -668,7 +672,8 @@ specified, in which case bf(-r) is not implied.
701 Note that bf(-a) bf(does not preserve hardlinks), because
702 finding multiply-linked files is expensive. You must separately
704 +specify bf(-H). Note also that for backward compatibility, bf(-a)
705 +currently does bf(not) imply the bf(--fileflags) option.
707 dit(--no-OPTION) You may turn off one or more implied options by prefixing
708 the option name with "no-". Not all options may be prefixed with a "no-":
709 @@ -981,7 +986,7 @@ they would be using bf(--copy-links).
710 Without this option, if the sending side has replaced a directory with a
711 symlink to a directory, the receiving side will delete anything that is in
712 the way of the new symlink, including a directory hierarchy (as long as
713 -bf(--force) or bf(--delete) is in effect).
714 +bf(--force-delete) or bf(--delete) is in effect).
716 See also bf(--keep-dirlinks) for an analogous option for the receiving
718 @@ -1165,6 +1170,29 @@ Note that the bf(-X) option does not copy rsync's special xattr values (e.g.
719 those used by bf(--fake-super)) unless you repeat the option (e.g. -XX).
720 This "copy all xattrs" mode cannot be used with bf(--fake-super).
722 +dit(bf(--fileflags)) This option causes rsync to update the file-flags to be
723 +the same as the source files and directories (if your OS supports the
724 +bf(chflags)(2) system call). Some flags can only be altered by the super-user
725 +and some might only be unset below a certain secure-level (usually single-user
726 +mode). It will not make files alterable that are set to immutable on the
727 +receiver. To do that, see bf(--force-change), bf(--force-uchange), and
728 +bf(--force-schange).
730 +dit(bf(--force-change)) This option causes rsync to disable both user-immutable
731 +and system-immutable flags on files and directories that are being updated or
732 +deleted on the receiving side. This option overrides bf(--force-uchange) and
733 +bf(--force-schange).
735 +dit(bf(--force-uchange)) This option causes rsync to disable user-immutable
736 +flags on files and directories that are being updated or deleted on the
737 +receiving side. It does not try to affect system flags. This option overrides
738 +bf(--force-change) and bf(--force-schange).
740 +dit(bf(--force-schange)) This option causes rsync to disable system-immutable
741 +flags on files and directories that are being updated or deleted on the
742 +receiving side. It does not try to affect user flags. This option overrides
743 +bf(--force-change) and bf(--force-uchange).
745 dit(bf(--chmod)) This option tells rsync to apply one or more
746 comma-separated "chmod" modes to the permission of the files in the
747 transfer. The resulting value is treated as though it were the permissions
748 @@ -1549,12 +1577,13 @@ display as a "*missing" entry in the bf(--list-only) output.
749 dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
750 even when there are I/O errors.
752 -dit(bf(--force)) This option tells rsync to delete a non-empty directory
753 +dit(bf(--force-delete)) This option tells rsync to delete a non-empty directory
754 when it is to be replaced by a non-directory. This is only relevant if
755 deletions are not active (see bf(--delete) for details).
757 -Note for older rsync versions: bf(--force) used to still be required when
758 -using bf(--delete-after), and it used to be non-functional unless the
759 +This option can be abbreviated bf(--force) for backward compatibility.
760 +Note that some older rsync versions used to still require bf(--force)
761 +when using bf(--delete-after), and it used to be non-functional unless the
762 bf(--recursive) option was also enabled.
764 dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
765 @@ -2232,7 +2261,7 @@ with older versions of rsync, but that also turns on the output of other
768 The "%i" escape has a cryptic output that is 11 letters long. The general
769 -format is like the string bf(YXcstpoguax), where bf(Y) is replaced by the
770 +format is like the string bf(YXcstpogfax), where bf(Y) is replaced by the
771 type of update being done, bf(X) is replaced by the file-type, and the
772 other letters represent attributes that may be output if they are being
774 diff --git a/syscall.c b/syscall.c
777 @@ -38,6 +38,7 @@ extern int am_root;
778 extern int am_sender;
779 extern int read_only;
780 extern int list_only;
781 +extern int force_change;
783 extern int preallocate_files;
784 extern int preserve_perms;
785 @@ -68,7 +69,23 @@ int do_unlink(const char *fname)
787 if (dry_run) return 0;
788 RETURN_ERROR_IF_RO_OR_LO;
789 - return unlink(fname);
790 + if (unlink(fname) == 0)
792 +#ifdef SUPPORT_FORCE_CHANGE
793 + if (force_change && errno == EPERM) {
796 + if (x_lstat(fname, &st, NULL) == 0
797 + && make_mutable(fname, st.st_mode, st.st_flags, force_change) > 0) {
798 + if (unlink(fname) == 0)
800 + undo_make_mutable(fname, st.st_flags);
802 + /* TODO: handle immutable directories */
810 @@ -129,14 +146,37 @@ int do_link(const char *fname1, const char *fname2)
814 -int do_lchown(const char *path, uid_t owner, gid_t group)
815 +int do_lchown(const char *path, uid_t owner, gid_t group, UNUSED(mode_t mode), UNUSED(uint32 fileflags))
817 if (dry_run) return 0;
818 RETURN_ERROR_IF_RO_OR_LO;
822 - return lchown(path, owner, group);
823 + if (lchown(path, owner, group) == 0)
825 +#ifdef SUPPORT_FORCE_CHANGE
826 + if (force_change && errno == EPERM) {
827 + if (fileflags == NO_FFLAGS) {
829 + if (x_lstat(path, &st, NULL) == 0) {
831 + fileflags = st.st_flags;
834 + if (fileflags != NO_FFLAGS
835 + && make_mutable(path, mode, fileflags, force_change) > 0) {
836 + int ret = lchown(path, owner, group);
837 + undo_make_mutable(path, fileflags);
844 + mode = fileflags = 0; /* avoid compiler warning */
849 int do_mknod(const char *pathname, mode_t mode, dev_t dev)
850 @@ -176,7 +216,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
854 - return do_chmod(pathname, mode);
855 + return do_chmod(pathname, mode, 0);
859 @@ -193,7 +233,22 @@ int do_rmdir(const char *pathname)
861 if (dry_run) return 0;
862 RETURN_ERROR_IF_RO_OR_LO;
863 - return rmdir(pathname);
864 + if (rmdir(pathname) == 0)
866 +#ifdef SUPPORT_FORCE_CHANGE
867 + if (force_change && errno == EPERM) {
870 + if (x_lstat(pathname, &st, NULL) == 0
871 + && make_mutable(pathname, st.st_mode, st.st_flags, force_change) > 0) {
872 + if (rmdir(pathname) == 0)
874 + undo_make_mutable(pathname, st.st_flags);
882 int do_open(const char *pathname, int flags, mode_t mode)
883 @@ -212,7 +267,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
887 -int do_chmod(const char *path, mode_t mode)
888 +int do_chmod(const char *path, mode_t mode, UNUSED(uint32 fileflags))
891 if (dry_run) return 0;
892 @@ -235,17 +290,74 @@ int do_chmod(const char *path, mode_t mode)
894 code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
895 #endif /* !HAVE_LCHMOD */
896 +#ifdef SUPPORT_FORCE_CHANGE
897 + if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) {
898 + if (fileflags == NO_FFLAGS) {
900 + if (x_lstat(path, &st, NULL) == 0)
901 + fileflags = st.st_flags;
903 + if (fileflags != NO_FFLAGS
904 + && make_mutable(path, mode, fileflags, force_change) > 0) {
905 + code = chmod(path, mode & CHMOD_BITS);
906 + undo_make_mutable(path, fileflags);
913 + fileflags = 0; /* avoid compiler warning */
915 if (code != 0 && (preserve_perms || preserve_executability))
922 +int do_chflags(const char *path, uint32 fileflags)
924 + if (dry_run) return 0;
925 + RETURN_ERROR_IF_RO_OR_LO;
926 + return chflags(path, fileflags);
930 int do_rename(const char *fname1, const char *fname2)
932 if (dry_run) return 0;
933 RETURN_ERROR_IF_RO_OR_LO;
934 - return rename(fname1, fname2);
935 + if (rename(fname1, fname2) == 0)
937 +#ifdef SUPPORT_FORCE_CHANGE
938 + if (force_change && errno == EPERM) {
939 + STRUCT_STAT st1, st2;
940 + int became_mutable;
942 + if (x_lstat(fname1, &st1, NULL) != 0)
944 + became_mutable = make_mutable(fname1, st1.st_mode, st1.st_flags, force_change) > 0;
945 + if (became_mutable && rename(fname1, fname2) == 0)
947 + if (x_lstat(fname2, &st2, NULL) == 0
948 + && make_mutable(fname2, st2.st_mode, st2.st_flags, force_change) > 0) {
949 + if (rename(fname1, fname2) == 0) {
951 + if (became_mutable) /* Yes, use fname2 and st1! */
952 + undo_make_mutable(fname2, st1.st_flags);
955 + undo_make_mutable(fname2, st2.st_flags);
957 + /* TODO: handle immutable directories */
958 + if (became_mutable)
959 + undo_make_mutable(fname1, st1.st_flags);
967 #ifdef HAVE_FTRUNCATE
968 diff --git a/t_stub.c b/t_stub.c
971 @@ -28,6 +28,8 @@ int protect_args = 0;
973 int relative_paths = 0;
974 int module_dirlen = 0;
975 +int force_change = 0;
976 +int preserve_acls = 0;
977 int preserve_times = 0;
978 int preserve_xattrs = 0;
979 int preserve_perms = 0;
980 @@ -104,3 +106,23 @@ filter_rule_list daemon_filter_list;
982 return cst || !flg ? 16 : 1;
985 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
986 + int make_mutable(UNUSED(const char *fname), UNUSED(mode_t mode), UNUSED(uint32 fileflags), UNUSED(uint32 iflags))
991 +/* Undo a prior make_mutable() call that returned a 1. */
992 + int undo_make_mutable(UNUSED(const char *fname), UNUSED(uint32 fileflags))
998 +#ifdef SUPPORT_XATTRS
999 + int x_lstat(UNUSED(const char *fname), UNUSED(STRUCT_STAT *fst), UNUSED(STRUCT_STAT *xst))
1004 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
1005 --- a/testsuite/rsync.fns
1006 +++ b/testsuite/rsync.fns
1007 @@ -23,9 +23,9 @@ todir="$tmpdir/to"
1008 chkdir="$tmpdir/chk"
1010 # For itemized output:
1011 -all_plus='+++++++++'
1013 -dots='.....' # trailing dots after changes
1014 +all_plus='++++++++++'
1016 +dots='......' # trailing dots after changes
1017 tab_ch=' ' # a single tab character
1020 diff --git a/util.c b/util.c
1023 @@ -33,6 +33,7 @@ extern int relative_paths;
1024 extern int preserve_times;
1025 extern int preserve_xattrs;
1026 extern int preallocate_files;
1027 +extern int force_change;
1028 extern char *module_dir;
1029 extern unsigned int module_dirlen;
1030 extern char *partial_dir;
1031 @@ -115,6 +116,33 @@ void print_child_argv(const char *prefix, char **cmd)
1032 rprintf(FCLIENT, " (%d args)\n", cnt);
1035 +#ifdef SUPPORT_FORCE_CHANGE
1036 +static int try_a_force_change(const char *fname, STRUCT_STAT *stp)
1038 + uint32 fileflags = ST_FLAGS(*stp);
1039 + if (fileflags == NO_FFLAGS) {
1041 + if (x_lstat(fname, &st, NULL) == 0)
1042 + fileflags = st.st_flags;
1044 + if (fileflags != NO_FFLAGS && make_mutable(fname, stp->st_mode, fileflags, force_change) > 0) {
1045 + int ret, save_force_change = force_change;
1047 + force_change = 0; /* Make certain we can't come back here. */
1048 + ret = set_times(fname, stp);
1049 + force_change = save_force_change;
1051 + undo_make_mutable(fname, fileflags);
1062 /* This returns 0 for success, 1 for a symlink if symlink time-setting
1063 * is not possible, or -1 for any other error. */
1064 int set_times(const char *fname, STRUCT_STAT *stp)
1065 @@ -142,6 +170,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1067 if (do_utimensat(fname, stp) == 0)
1069 +#ifdef SUPPORT_FORCE_CHANGE
1070 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1073 if (errno != ENOSYS)
1076 @@ -151,6 +183,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1078 if (do_lutimes(fname, stp) == 0)
1080 +#ifdef SUPPORT_FORCE_CHANGE
1081 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1084 if (errno != ENOSYS)
1087 @@ -172,6 +208,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
1088 if (do_utime(fname, stp) == 0)
1091 +#ifdef SUPPORT_FORCE_CHANGE
1092 + if (force_change && errno == EPERM && try_a_force_change(fname, stp) == 0)
1098 diff --git a/xattrs.c b/xattrs.c
1101 @@ -1224,7 +1224,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
1102 mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
1103 | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
1104 if (fst.st_mode != mode)
1105 - do_chmod(fname, mode);
1106 + do_chmod(fname, mode, ST_FLAGS(fst));
1107 if (!IS_DEVICE(fst.st_mode))
1108 fst.st_rdev = 0; /* just in case */