X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9f62ddf8fd9f47300b8e0d2a1cd164ff122a28d6..9f085fa3bd0053dde970cba09af3ee51cbb8791a:/flags.diff diff --git a/flags.diff b/flags.diff index 74864d8..77c8bdd 100644 --- a/flags.diff +++ b/flags.diff @@ -1,35 +1,66 @@ This patch provides --flags, which preserves the st_flags field. Modified from a patch that was written by Rolf Grossmann. -After applying this patch, run these commands for a successful build: +To use this patch, run these commands for a successful build: + patch -p1 mode; +#ifdef SUPPORT_FLAGS -+ if (file->fileflags == fileflags) -+ flags |= XMIT_SAME_FLAGS; ++ if (F_FFLAGS(file) == fileflags) ++ xflags |= XMIT_SAME_FLAGS; + else -+ fileflags = file->fileflags; ++ fileflags = F_FFLAGS(file); +#endif - if ((preserve_devices && IS_DEVICE(mode)) - || (preserve_specials && IS_SPECIAL(mode))) { - if (protocol_version < 28) { -@@ -416,6 +426,10 @@ static void send_file_entry(struct file_ - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) + + if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR)) + xflags |= XMIT_NON_XFER_DIR; +@@ -505,6 +515,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 (preserve_flags && !(flags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) { - if (!numeric_ids) - add_uid(uid); -@@ -483,6 +497,9 @@ static struct file_struct *receive_file_ + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) + write_int(f, uid); +@@ -593,6 +607,9 @@ static struct file_struct *recv_file_ent { - static time_t modtime; + static int64 modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS -+ static uint32 fileflags; ++ static uint32 fileflags; +#endif static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -556,9 +573,12 @@ static struct file_struct *receive_file_ - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) +@@ -722,9 +739,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 (preserve_flags && !(flags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) - uid = (uid_t)read_int(f); -@@ -609,6 +629,9 @@ static struct file_struct *receive_file_ - file->modtime = modtime; - file->length = file_length; + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) +@@ -844,6 +864,10 @@ static struct file_struct *recv_file_ent + OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); + } file->mode = mode; +#ifdef SUPPORT_FLAGS -+ file->fileflags = fileflags; ++ if (fileflags_ndx) ++ F_FFLAGS(file) = fileflags; +#endif - file->uid = uid; - file->gid = gid; - -@@ -862,6 +885,9 @@ struct file_struct *make_file(char *fnam - file->modtime = st.st_mtime; - file->length = st.st_size; + if (uid_ndx) + F_OWNER(file) = uid; + if (gid_ndx) { +@@ -1168,6 +1192,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 -+ file->fileflags = st.st_flags; ++ if (fileflags_ndx) ++ F_FFLAGS(file) = st.st_flags; +#endif - file->uid = st.st_uid; - file->gid = st.st_gid; - + if (uid_ndx) + F_OWNER(file) = st.st_uid; + if (gid_ndx) --- old/generator.c +++ new/generator.c -@@ -99,6 +99,12 @@ static int deletion_count = 0; /* used t - #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ - #define DEL_TERSE (1<<3) +@@ -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 FILEFLAGS(ff) ff ++#define FF_PTR(p) F_FFLAGS(p) ++#define FF_STAT(s) s.st_flags +#else -+#define FILEFLAGS(ff) 0 ++#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) { -@@ -113,7 +119,7 @@ static int is_backup_file(char *fn) - * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's + 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 int delete_item(char *fname, int mode, int flags) -+static int delete_item(char *fname, int mode, uint32 fileflags, int flags) +-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) { - struct file_list *dirlist; - int j, dlen, zap_dir, ok; -@@ -124,6 +130,9 @@ static int delete_item(char *fname, int - if (!S_ISDIR(mode)) { - if (max_delete && ++deletion_count > max_delete) - return 0; -+#ifdef SUPPORT_FLAGS -+ make_mutable(fname, mode, fileflags); -+#endif - if (make_backups && (backup_dir || !is_backup_file(fname))) - ok = make_backup(fname); - else -@@ -148,10 +157,17 @@ static int delete_item(char *fname, int - ok = 0; - errno = ENOTEMPTY; - } else if (make_backups && !backup_dir && !is_backup_file(fname) -- && !(flags & DEL_FORCE_RECURSE)) -+ && !(flags & DEL_FORCE_RECURSE)) { -+#ifdef SUPPORT_FLAGS -+ make_mutable(fname, mode, fileflags); -+#endif - ok = make_backup(fname); -- else -+ } else { + 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(fname, mode, fileflags); ++ make_mutable(fbuf, mode, fileflags); +#endif - ok = do_rmdir(fname) == 0; -+ } - if (ok) { - if (!(flags & DEL_TERSE)) - log_delete(fname, mode); -@@ -186,7 +202,7 @@ static int delete_item(char *fname, int - continue; - - strlcpy(p, fp->basename, remainder); -- delete_item(fname, fp->mode, flags & ~DEL_TERSE); -+ delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), flags & ~DEL_TERSE); + 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,7 +387,7 @@ 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; +@@ -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); } - flist_free(dirlist); - -@@ -276,7 +292,7 @@ static void delete_in_dir(struct file_li - continue; - if (flist_find(flist, fp) < 0) { - f_name(fp, delbuf); -- delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE); -+ delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), DEL_FORCE_RECURSE); +- 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); } } -@@ -905,7 +921,7 @@ static void recv_generator(char *fname, +@@ -1270,7 +1281,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(st.st_mode)) { -- if (delete_item(fname, st.st_mode, del_opts) < 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) - return; + 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; } -@@ -996,7 +1012,7 @@ static void recv_generator(char *fname, +@@ -1399,7 +1410,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ -- if (delete_item(fname, st.st_mode, del_opts) < 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) - return; - if (!S_ISLNK(st.st_mode)) - statret = -1; -@@ -1060,7 +1076,7 @@ static void recv_generator(char *fname, - || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS) - || st.st_rdev != file->u.rdev) { - if (statret == 0 -- && delete_item(fname, st.st_mode, del_opts) < 0) -+ && delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) - return; - if (preserve_hard_links && file->link_u.links - && hard_link_check(file, ndx, fname, -1, &st, -@@ -1145,7 +1161,7 @@ static void recv_generator(char *fname, +- 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, +@@ -1478,7 +1489,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, +@@ -1569,7 +1580,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; - if (statret == 0 && !S_ISREG(st.st_mode)) { -- if (delete_item(fname, st.st_mode, del_opts) != 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) != 0) - return; + 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 -@@ -48,6 +48,7 @@ int copy_links = 0; - int preserve_links = 0; - int preserve_hard_links = 0; +@@ -51,6 +51,7 @@ int preserve_hard_links = 0; + int preserve_acls = 0; + int preserve_xattrs = 0; int preserve_perms = 0; -+int preserve_flags = 0; ++int preserve_fileflags = 0; int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -200,6 +201,7 @@ static void print_rsync_version(enum log - char const *hardlinks = "no "; +@@ -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 *flags = "no "; ++ char const *fileflags = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR -@@ -222,6 +224,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -250,6 +252,9 @@ static void print_rsync_version(enum log + #ifdef ICONV_OPTION + iconv = ""; #endif - +#ifdef SUPPORT_FLAGS -+ flags = ""; ++ fileflags = ""; +#endif -+ - rprintf(f, "%s version %s protocol version %d\n", - RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); - rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -234,9 +240,9 @@ static void print_rsync_version(enum log - /* Note that this field may not have type ino_t. It depends - * on the complicated interaction between largefile feature - * macros. */ -- rprintf(f, " %sinplace, %sIPv6, " -+ rprintf(f, " %sinplace, %sIPv6, %sfile flags, " - "%d-bit system inums, %d-bit internal inums\n", -- have_inplace, ipv6, -+ have_inplace, ipv6, flags, - (int) (sizeof dumstat->st_ino * 8), - (int) (sizeof (int64) * 8)); + + 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 -@@ -302,6 +308,7 @@ void usage(enum logcode F) + 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," --flags preserve file flags\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"); - rprintf(F," -o, --owner preserve owner (super-user only)\n"); -@@ -420,6 +427,8 @@ static struct poptOption long_options[] + #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 }, -+ {"flags", 0, POPT_ARG_VAL, &preserve_flags, 1, 0, 0 }, -+ {"no-flags", 0, POPT_ARG_VAL, &preserve_flags, 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 }, - {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, - {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, -@@ -1124,6 +1133,15 @@ int parse_arguments(int *argc, const cha + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 }, + {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 }, +@@ -1285,6 +1293,15 @@ int parse_arguments(int *argc_p, const c } #endif +#ifndef SUPPORT_FLAGS -+ if (preserve_flags) { ++ if (preserve_fileflags) { + snprintf(err_buf, sizeof err_buf, + "file flags are not supported on this %s\n", + am_server ? "server" : "client"); @@ -288,11 +363,11 @@ After applying this patch, run these commands for a successful build: if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); -@@ -1577,6 +1595,9 @@ void server_options(char **args,int *arg +@@ -1796,6 +1813,9 @@ void server_options(char **args, int *ar if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; -+ if (preserve_flags) ++ if (preserve_fileflags) + args[ac++] = "--flags"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { @@ -300,20 +375,32 @@ After applying this patch, run these commands for a successful build: goto oom; --- old/rsync.c +++ new/rsync.c -@@ -30,9 +30,12 @@ - #include - #endif - -+#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) -+ - extern int verbose; - extern int dry_run; +@@ -32,6 +32,7 @@ extern int dry_run; + extern int preserve_acls; + extern int preserve_xattrs; extern int preserve_perms; -+extern int preserve_flags; ++extern int preserve_fileflags; extern int preserve_executability; extern int preserve_times; - extern int omit_dir_times; -@@ -123,6 +126,41 @@ mode_t dest_mode(mode_t flist_mode, mode + 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; } @@ -334,7 +421,7 @@ After applying this patch, run these commands for a successful build: +/* Remove immutable flags from an object, so it can be altered/removed. */ +void make_mutable(char *fname, mode_t mode, uint32 fileflags) +{ -+ if (!preserve_flags && S_ISLNK(mode)) ++ if (!preserve_fileflags && S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) @@ -344,7 +431,7 @@ After applying this patch, run these commands for a successful build: +/* Undo a prior make_mutable() call. */ +void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags) +{ -+ if (!preserve_flags && S_ISLNK(mode)) ++ if (!preserve_fileflags && S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) @@ -352,17 +439,17 @@ After applying this patch, run these commands for a successful build: +} +#endif + - int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, - int flags) + int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, + const char *fnamecmp, int flags) { -@@ -221,6 +259,15 @@ int set_file_attrs(char *fname, struct f +@@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, st } #endif +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !S_ISLNK(st->st_mode) -+ && st->st_flags != file->fileflags) { -+ if (!set_fileflags(fname, file->fileflags)) ++ 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; + } @@ -371,38 +458,38 @@ After applying this patch, run these commands for a successful build: if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -268,6 +315,9 @@ void finish_transfer(char *fname, char * - set_file_attrs(fnametmp, file, NULL, +@@ -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, file->fileflags); ++ 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); -@@ -282,6 +332,9 @@ void finish_transfer(char *fname, char * +@@ -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, file->fileflags); ++ 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 -@@ -54,6 +54,7 @@ - #define XMIT_HAS_IDEV_DATA (1<<9) - #define XMIT_SAME_DEV (1<<10) - #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) -+#define XMIT_SAME_FLAGS (1<<12) +@@ -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. */ -@@ -344,6 +345,10 @@ enum msgcode { - #define schar char +@@ -415,6 +416,10 @@ enum msgcode { + #endif #endif +#ifdef HAVE_CHFLAGS @@ -412,27 +499,33 @@ After applying this patch, run these commands for a successful build: /* 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. */ -@@ -527,6 +532,9 @@ struct file_struct { - struct hlink *links; - } link_u; - time_t modtime; -+#ifdef SUPPORT_FLAGS -+ uint32 fileflags; -+#endif - uid_t uid; - gid_t gid; - mode_t mode; +@@ -582,6 +587,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; + +@@ -619,6 +625,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 -@@ -320,6 +320,7 @@ to the detailed description below for a +@@ -343,6 +343,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 - -o, --owner preserve owner (super-user only) -@@ -501,7 +502,9 @@ specified, in which case bf(-r) is not i + -A, --acls preserve ACLs (implies -p) +@@ -544,7 +545,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 @@ -443,9 +536,9 @@ After applying this patch, run these commands for a successful build: 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-": -@@ -796,6 +799,13 @@ quote(itemization( - - If bf(--perms) is enabled, this option is ignored. +@@ -891,6 +894,13 @@ dit(bf(-X, --xattrs)) This option causes + extended attributes to be the same as the local ones. This will work + only if the remote machine's rsync also supports this 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) @@ -459,7 +552,7 @@ After applying this patch, run these commands for a successful build: transfer. The resulting value is treated as though it was the permissions --- old/syscall.c +++ new/syscall.c -@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo +@@ -162,6 +162,15 @@ int do_chmod(const char *path, mode_t mo } #endif