This patch provides --flags, which preserves the st_flags field. Modified from a patch that was written by Rolf Grossmann. To use this patch, run these commands for a successful build: patch -p1 mode; +#ifdef SUPPORT_FLAGS + if (F_FFLAGS(file) == fileflags) + xflags |= XMIT_SAME_FLAGS; + else + fileflags = F_FFLAGS(file); +#endif if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { @@ -511,6 +521,10 @@ static void send_file_entry(int f, struc } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FLAGS + if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); @@ -599,6 +613,9 @@ static struct file_struct *recv_file_ent { static int64 modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS + static uint32 fileflags; +#endif static int64 dev; static dev_t rdev; static uint32 rdev_major; @@ -728,9 +745,12 @@ static struct file_struct *recv_file_ent } if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); - if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); +#ifdef SUPPORT_FLAGS + if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) @@ -850,6 +870,10 @@ static struct file_struct *recv_file_ent OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; +#ifdef SUPPORT_FLAGS + if (fileflags_ndx) + F_FFLAGS(file) = fileflags; +#endif if (uid_ndx) F_OWNER(file) = uid; if (gid_ndx) { @@ -1178,6 +1202,10 @@ struct file_struct *make_file(const char OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } file->mode = st.st_mode; +#ifdef SUPPORT_FLAGS + if (fileflags_ndx) + F_FFLAGS(file) = st.st_flags; +#endif if (uid_ndx) F_OWNER(file) = st.st_uid; if (gid_ndx) --- old/generator.c +++ new/generator.c @@ -114,6 +114,14 @@ static int need_retouch_dir_times; static int need_retouch_dir_perms; static const char *solo_file = NULL; +#ifdef SUPPORT_FLAGS +#define FF_PTR(p) F_FFLAGS(p) +#define FF_STAT(s) s.st_flags +#else +#define FF_PTR(p) 0 +#define FF_STAT(s) 0 +#endif + /* For calling delete_item() and delete_dir_contents(). */ #define DEL_RECURSE (1<<1) /* recurse */ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ @@ -129,7 +137,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); - static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; @@ -142,17 +149,20 @@ static int is_backup_file(char *fn) * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's * a directory! (The buffer is used for recursion, but returned unchanged.) */ -static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) +static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags) { enum delret ret; char *what; int ok; if (verbose > 2) { - rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", - fbuf, mode, flags); + rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n", + fbuf, mode, fileflags, flags); } +#ifdef SUPPORT_FLAGS + make_mutable(fbuf, mode, fileflags); +#endif if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { ignore_perishable = 1; /* If DEL_RECURSE is not set, this just reports emptiness. */ @@ -264,7 +274,7 @@ static enum delret delete_dir_contents(c if (S_ISDIR(fp->mode) && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) ret = DR_NOT_EMPTY; - if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) + if (delete_item(fname, fp->mode, FF_PTR(fp), NULL, flags) != DR_SUCCESS) ret = DR_NOT_EMPTY; } @@ -320,8 +330,9 @@ static int remember_delete(struct file_s while (1) { len = snprintf(deldelay_buf + deldelay_cnt, - deldelay_size - deldelay_cnt, - "%x %s%c", (int)file->mode, fname, '\0'); + deldelay_size - deldelay_cnt, "%x %x %s%c", + (int)file->mode, (int)FF_PTR(file), + fname, '\0'); if ((deldelay_cnt += len) <= deldelay_size) break; if (deldelay_fd < 0 && !start_delete_delay_temp()) @@ -334,7 +345,7 @@ static int remember_delete(struct file_s return 1; } -static int read_delay_line(char *buf) +static int read_delay_line(char *buf, int *fileflags_p) { static int read_pos = 0; int j, len, mode; @@ -376,12 +387,12 @@ static int read_delay_line(char *buf) bp = deldelay_buf + read_pos; - if (sscanf(bp, "%x ", &mode) != 1) { + if (sscanf(bp, "%x %x ", &mode, fileflags_p) != 2) { invalid_data: rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n"); return -1; } - past_space = strchr(bp, ' ') + 1; + past_space = strchr(strchr(bp, ' ') + 1, ' ') + 1; len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */ read_pos = j + 1; @@ -399,15 +410,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { - int mode; + int mode, fileflags; if (deldelay_fd >= 0) { if (deldelay_cnt && !flush_delete_delay()) return; lseek(deldelay_fd, 0, 0); } - while ((mode = read_delay_line(delbuf)) >= 0) - delete_item(delbuf, mode, NULL, DEL_RECURSE); + while ((mode = read_delay_line(delbuf, &fileflags)) >= 0) + delete_item(delbuf, mode, fileflags, NULL, DEL_RECURSE); if (deldelay_fd >= 0) close(deldelay_fd); } @@ -474,7 +485,7 @@ static void delete_in_dir(char *fbuf, st if (!remember_delete(fp, delbuf)) break; } else - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); + delete_item(delbuf, fp->mode, FF_PTR(fp), NULL, DEL_RECURSE); } } @@ -1263,7 +1274,7 @@ static void recv_generator(char *fname, * full later (right before we handle its contents). */ if (statret == 0 && (S_ISDIR(sx.st.st_mode) - || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)) + || delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0)) goto cleanup; /* Any errors get reported later. */ if (do_mkdir(fname, file->mode & 0700) == 0) file->flags |= FLAG_DIR_CREATED; @@ -1275,7 +1286,7 @@ static void recv_generator(char *fname, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(sx.st.st_mode)) { - if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0) goto skipping_dir_contents; statret = -1; } @@ -1404,7 +1415,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ - if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "symlink", del_opts) != 0) goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, @@ -1483,7 +1494,7 @@ static void recv_generator(char *fname, goto return_with_success; goto cleanup; } - if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), t, del_opts) != 0) goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, @@ -1574,7 +1585,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { - if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "regular file", del_opts) != 0) goto cleanup; statret = -1; stat_errno = ENOENT; --- old/options.c +++ new/options.c @@ -51,6 +51,7 @@ int preserve_hard_links = 0; int preserve_acls = 0; int preserve_xattrs = 0; int preserve_perms = 0; +int preserve_fileflags = 0; int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; @@ -221,6 +222,7 @@ static void print_rsync_version(enum log char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; + char const *fileflags = "no "; STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 @@ -250,6 +252,9 @@ static void print_rsync_version(enum log #ifdef ICONV_OPTION iconv = ""; #endif +#ifdef SUPPORT_FLAGS + fileflags = ""; +#endif rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); @@ -263,8 +268,8 @@ static void print_rsync_version(enum log (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); - rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv\n", - have_inplace, acls, xattrs, iconv); + rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %sfile-flags\n", + have_inplace, acls, xattrs, iconv, fileflags); #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); @@ -331,6 +336,7 @@ void usage(enum logcode F) rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); + rprintf(F," --fileflags preserve file-flags\n"); rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); #ifdef SUPPORT_ACLS @@ -470,6 +476,8 @@ static struct poptOption long_options[] {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, + {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 }, + {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 }, {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 }, {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 }, {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 }, @@ -1284,6 +1292,15 @@ int parse_arguments(int *argc_p, const c } #endif +#ifndef SUPPORT_FLAGS + if (preserve_fileflags) { + snprintf(err_buf, sizeof err_buf, + "file flags are not supported on this %s\n", + am_server ? "server" : "client"); + return 0; + } +#endif + if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); @@ -1792,6 +1809,9 @@ void server_options(char **args, int *ar if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; + if (preserve_fileflags) + args[ac++] = "--flags"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) goto oom; --- old/rsync.c +++ new/rsync.c @@ -32,6 +32,7 @@ extern int dry_run; extern int preserve_acls; extern int preserve_xattrs; extern int preserve_perms; +extern int preserve_fileflags; extern int preserve_executability; extern int preserve_times; extern int am_root; @@ -60,6 +61,16 @@ iconv_t ic_chck = (iconv_t)-1; iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; # endif +#ifdef SUPPORT_FLAGS +#ifndef UF_NOUNLINK +#define UF_NOUNLINK 0 +#endif +#ifndef SF_NOUNLINK +#define SF_NOUNLINK 0 +#endif +#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) +#endif + static const char *default_charset(void) { # if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET @@ -337,6 +348,41 @@ mode_t dest_mode(mode_t flist_mode, mode return new_mode; } +#ifdef SUPPORT_FLAGS +/* Set a file's st_flags. */ +static int set_fileflags(const char *fname, uint32 fileflags) +{ + if (do_chflags(fname, fileflags) != 0) { + rsyserr(FERROR, errno, + "failed to set file flags on %s", + full_fname(fname)); + return 0; + } + + return 1; +} + +/* Remove immutable flags from an object, so it can be altered/removed. */ +void make_mutable(const char *fname, mode_t mode, uint32 fileflags) +{ + if (!preserve_fileflags && S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) + set_fileflags(fname, fileflags & ~NOCHANGE_FLAGS); +} + +/* Undo a prior make_mutable() call. */ +void undo_make_mutable(const char *fname, mode_t mode, uint32 fileflags) +{ + if (!preserve_fileflags && S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) + set_fileflags(fname, fileflags); +} +#endif + int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, const char *fnamecmp, int flags) { @@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, st } #endif +#ifdef SUPPORT_FLAGS + if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode) + && sxp->st.st_flags != F_FFLAGS(file)) { + if (!set_fileflags(fname, F_FFLAGS(file))) + return 0; + updated = 1; + } +#endif + if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); @@ -527,6 +582,9 @@ void finish_transfer(const char *fname, set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); +#ifdef SUPPORT_FLAGS + make_mutable(fnametmp, file->mode, F_FFLAGS(file)); +#endif /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); @@ -541,6 +599,9 @@ void finish_transfer(const char *fname, } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ +#ifdef SUPPORT_FLAGS + undo_make_mutable(fname, file->mode, F_FFLAGS(file)); +#endif return; } /* The file was copied, so tweak the perms of the copied file. If it --- old/rsync.h +++ new/rsync.h @@ -57,6 +57,7 @@ #define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */ +#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */ /* These flags are used in the live flist data. */ @@ -419,6 +420,10 @@ enum msgcode { #endif #endif +#ifdef HAVE_CHFLAGS +#define SUPPORT_FLAGS 1 +#endif + /* Find a variable that is either exactly 32-bits or longer. * If some code depends on 32-bit truncation, it will need to * take special action in a "#if SIZEOF_INT32 > 4" section. */ @@ -586,6 +591,7 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; +extern int fileflags_ndx; extern int acls_ndx; extern int xattrs_ndx; @@ -623,6 +629,7 @@ extern int xattrs_ndx; /* When the associated option is on, all entries will have these present: */ #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum +#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num --- old/rsync.yo +++ new/rsync.yo @@ -338,6 +338,7 @@ to the detailed description below for a -K, --keep-dirlinks treat symlinked dir on receiver as dir -H, --hard-links preserve hard links -p, --perms preserve permissions + --flags preserve file flags -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions -A, --acls preserve ACLs (implies -p) @@ -539,7 +540,9 @@ specified, in which case bf(-r) is not i Note that bf(-a) bf(does not preserve hardlinks), because finding multiply-linked files is expensive. You must separately -specify bf(-H). +specify bf(-H). Note also that for compatibility, bf(-a) +currently bf(does not include --flags) (see there) to include preserving +change file flags (if supported by the OS). dit(--no-OPTION) You may turn off one or more implied options by prefixing the option name with "no-". Not all options may be prefixed with a "no-": @@ -900,6 +903,13 @@ super-user copies all namespaces except the user.* namespace. To be able to backup and restore non-user namespaces as a normal user, see the bf(--fake-super) option. +dit(bf(--flags)) This option causes rsync to update the change file flags +to be the same as the source file, if your OS supports the bf(chflags)(2) +system call. In any case, an attempt is made to remove flags that would +prevent a file to be altered. Some flags can only be altered by the +super-user and can only be unset below a certain secure-level (usually +single-user mode). + dit(bf(--chmod)) This option tells rsync to apply one or more comma-separated "chmod" strings to the permission of the files in the transfer. The resulting value is treated as though it was the permissions --- old/syscall.c +++ new/syscall.c @@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mo } #endif +#ifdef SUPPORT_FLAGS +int do_chflags(const char *path, u_long flags) +{ + if (dry_run) return 0; + RETURN_ERROR_IF_RO_OR_LO; + return chflags(path, flags); +} +#endif + int do_rename(const char *fname1, const char *fname2) { if (dry_run) return 0;