X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5bafda3026f713e2e72b95a029bf12839d04e3cb..64e98de1da91464b3f444242af02b74294486431:/flags.diff diff --git a/flags.diff b/flags.diff index 0f16462..62d737c 100644 --- a/flags.diff +++ b/flags.diff @@ -10,9 +10,20 @@ To use this patch, run these commands for a successful build: TODO: fix --delete-delay to work with --flags option. +--- old/compat.c ++++ new/compat.c +@@ -62,6 +62,8 @@ void setup_protocol(int f_out,int f_in) + preserve_uid = ++file_extra_cnt; + if (preserve_gid) + preserve_gid = ++file_extra_cnt; ++ if (preserve_fileflags) ++ preserve_fileflags = ++file_extra_cnt; + if (preserve_acls && !am_sender) + preserve_acls = ++file_extra_cnt; + --- old/configure.in +++ new/configure.in -@@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd +@@ -559,7 +559,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \ strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ @@ -23,16 +34,16 @@ TODO: fix --delete-delay to work with --flags option. AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c +++ new/flist.c -@@ -44,6 +44,7 @@ extern int preserve_links; +@@ -47,6 +47,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; -+extern int preserve_flags; ++extern int preserve_fileflags; extern int preserve_uid; extern int preserve_gid; extern int relative_paths; -@@ -305,6 +306,9 @@ static void send_file_entry(struct file_ - unsigned short flags; +@@ -350,6 +351,9 @@ static void send_file_entry(int f, struc + { static time_t modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS @@ -41,7 +52,7 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -335,6 +339,12 @@ static void send_file_entry(struct file_ +@@ -370,6 +374,12 @@ static void send_file_entry(int f, struc flags |= XMIT_SAME_MODE; else mode = file->mode; @@ -54,18 +65,18 @@ TODO: fix --delete-delay to work with --flags option. if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { -@@ -418,6 +428,10 @@ static void send_file_entry(struct file_ +@@ -483,6 +493,10 @@ static void send_file_entry(int f, struc write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !(flags & XMIT_SAME_FLAGS)) ++ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif if (preserve_uid && !(flags & XMIT_SAME_UID)) { - if (!numeric_ids) - add_uid(uid); -@@ -485,6 +499,9 @@ static struct file_struct *receive_file_ + if (protocol_version < 30) + write_int(f, uid); +@@ -571,6 +585,9 @@ static struct file_struct *recv_file_ent { static time_t modtime; static mode_t mode; @@ -75,7 +86,7 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -558,9 +575,12 @@ static struct file_struct *receive_file_ +@@ -667,9 +684,12 @@ static struct file_struct *recv_file_ent modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -83,37 +94,39 @@ TODO: fix --delete-delay to work with --flags option. if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !(flags & XMIT_SAME_FLAGS)) ++ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) - uid = (uid_t)read_int(f); -@@ -611,6 +631,9 @@ static struct file_struct *receive_file_ - file->modtime = modtime; - file->length = file_length; + if (preserve_uid && !(flags & XMIT_SAME_UID)) { + if (protocol_version < 30) +@@ -787,6 +807,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 (preserve_fileflags) ++ F_FFLAGS(file) = fileflags; +#endif - file->uid = uid; - file->gid = gid; - -@@ -871,6 +894,9 @@ struct file_struct *make_file(char *fnam - file->modtime = st.st_mtime; - file->length = st.st_size; + if (preserve_uid) + F_OWNER(file) = uid; + if (preserve_gid) +@@ -1092,6 +1116,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 (preserve_fileflags) ++ F_FFLAGS(file) = st.st_flags; +#endif - file->uid = st.st_uid; - file->gid = st.st_gid; - + if (preserve_uid) + F_OWNER(file) = st.st_uid; + if (preserve_gid) --- old/generator.c +++ new/generator.c -@@ -99,6 +99,12 @@ int non_perishable_cnt = 0; - static int deletion_count = 0; /* used to implement --max-delete */ - static FILE *delete_delay_fp = NULL; +@@ -111,6 +111,12 @@ static int dir_tweaking; + static int need_retouch_dir_times; + static const char *solo_file = NULL; +#ifdef SUPPORT_FLAGS +#define FILEFLAGS(ff) ff @@ -124,7 +137,7 @@ TODO: fix --delete-delay to work with --flags option. /* 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 */ -@@ -114,7 +120,6 @@ enum delret { +@@ -126,7 +132,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); @@ -132,7 +145,7 @@ TODO: fix --delete-delay to work with --flags option. static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; -@@ -127,17 +132,20 @@ static int is_backup_file(char *fn) +@@ -139,17 +144,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.) */ @@ -156,7 +169,7 @@ TODO: fix --delete-delay to work with --flags option. if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { ignore_perishable = 1; /* If DEL_RECURSE is not set, this just reports emptiness. */ -@@ -249,7 +257,7 @@ static enum delret delete_dir_contents(c +@@ -261,7 +269,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; @@ -165,119 +178,163 @@ TODO: fix --delete-delay to work with --flags option. ret = DR_NOT_EMPTY; } -@@ -401,10 +409,10 @@ static void delete_in_dir(struct file_li - } - if (flist_find(flist, fp) < 0) { - f_name(fp, delbuf); -- if (delete_delay_fp) -+ if (delete_delay_fp) /* XXX need to output fileflags value here too */ - fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0'); - else +@@ -317,8 +325,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)FILEFLAGS(file->fileflags), ++ fname, '\0'); + if ((deldelay_cnt += len) <= deldelay_size) + break; + if (deldelay_fd < 0 && !start_delete_delay_temp()) +@@ -331,7 +340,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; +@@ -373,7 +382,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; +@@ -396,15 +405,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); + } +@@ -472,7 +481,7 @@ static void delete_in_dir(struct file_li + if (!remember_delete(fp, delbuf)) + break; + } else - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); + delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE); } } -@@ -1103,7 +1111,7 @@ static void recv_generator(char *fname, +@@ -1178,7 +1187,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, "directory", del_opts) != 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "directory", del_opts) != 0) + 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, FILEFLAGS(sx.st.st_flags), "directory", del_opts) != 0) return; statret = -1; } -@@ -1197,7 +1205,7 @@ static void recv_generator(char *fname, +@@ -1291,7 +1300,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, "symlink", del_opts) != 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "symlink", del_opts) != 0) - return; +- if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0) ++ if (delete_item(fname, sx.st.st_mode, FILEFLAGS(sx.st.st_flags), "symlink", del_opts) != 0) + goto cleanup; } else if (basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1268,7 +1276,7 @@ static void recv_generator(char *fname, + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, +@@ -1368,7 +1377,7 @@ static void recv_generator(char *fname, goto return_with_success; - return; + goto cleanup; } -- if (delete_item(fname, st.st_mode, t, del_opts) != 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), t, del_opts) != 0) - return; +- if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0) ++ if (delete_item(fname, sx.st.st_mode, FILEFLAGS(sx.st.st_flags), t, del_opts) != 0) + goto cleanup; } else if (basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1354,7 +1362,7 @@ static void recv_generator(char *fname, + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, +@@ -1457,7 +1466,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, "regular file", del_opts) != 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "regular file", 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, FILEFLAGS(sx.st.st_flags), "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; +@@ -48,6 +48,7 @@ int preserve_links = 0; int preserve_hard_links = 0; + int preserve_acls = 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; -@@ -201,6 +202,7 @@ static void print_rsync_version(enum log - char const *hardlinks = "no "; +@@ -202,6 +203,7 @@ static void print_rsync_version(enum log + char const *acls = "no "; char const *links = "no "; char const *ipv6 = "no "; -+ char const *flags = "no "; ++ char const *fileflags = "no "; STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR -@@ -223,6 +225,10 @@ static void print_rsync_version(enum log +@@ -228,6 +230,10 @@ static void print_rsync_version(enum log ipv6 = ""; #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"); -@@ -235,9 +241,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, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n"); +@@ -238,8 +244,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\n", +- have_inplace, acls); ++ rprintf(f, " %sappend, %sACLs, %sfile-flags\n", ++ have_inplace, acls, fileflags); + #ifdef MAINTAINER_MODE -@@ -304,6 +310,7 @@ void usage(enum logcode F) + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); +@@ -305,6 +311,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"); -@@ -425,6 +432,8 @@ static struct poptOption long_options[] + #ifdef SUPPORT_ACLS +@@ -429,6 +436,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 }, -@@ -1130,6 +1139,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 }, +@@ -1161,6 +1170,15 @@ int parse_arguments(int *argc, const cha } #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 +345,11 @@ TODO: fix --delete-delay to work with --flags option. if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); -@@ -1584,6 +1602,9 @@ void server_options(char **args,int *arg +@@ -1624,6 +1642,9 @@ void server_options(char **args,int *arg 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 +357,24 @@ TODO: fix --delete-delay to work with --flags option. 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; +@@ -33,6 +33,7 @@ extern int verbose; extern int dry_run; + extern int preserve_acls; 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 +@@ -53,6 +54,8 @@ extern int make_backups; + extern struct file_list *cur_flist, *first_flist, *dir_flist; + extern struct chmod_mode_struct *daemon_chmod_modes; + ++#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) ++ + #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H + iconv_t ic_chck = (iconv_t)-1; + +@@ -228,6 +231,41 @@ mode_t dest_mode(mode_t flist_mode, mode return new_mode; } @@ -334,7 +395,7 @@ TODO: fix --delete-delay to work with --flags option. +/* 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 +405,7 @@ TODO: fix --delete-delay to work with --flags option. +/* 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,15 +413,15 @@ TODO: fix --delete-delay to work with --flags option. +} +#endif + - int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, + int set_file_attrs(char *fname, struct file_struct *file, statx *sxp, int flags) { -@@ -221,6 +259,15 @@ int set_file_attrs(char *fname, struct f +@@ -346,6 +384,15 @@ int set_file_attrs(char *fname, struct f } #endif +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !S_ISLNK(st->st_mode) ++ if (preserve_fileflags && !S_ISLNK(st->st_mode) + && st->st_flags != file->fileflags) { + if (!set_fileflags(fname, file->fileflags)) + return 0; @@ -371,7 +432,7 @@ TODO: fix --delete-delay to work with --flags option. if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -268,6 +315,9 @@ void finish_transfer(char *fname, char * +@@ -398,6 +445,9 @@ void finish_transfer(char *fname, char * set_file_attrs(fnametmp, file, NULL, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); @@ -381,7 +442,7 @@ TODO: fix --delete-delay to work with --flags option. /* 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 * +@@ -412,6 +462,9 @@ void finish_transfer(char *fname, char * } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ @@ -393,16 +454,16 @@ TODO: fix --delete-delay to work with --flags option. /* 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) +@@ -56,6 +56,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 */ ++#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - NOW */ /* These flags are used in the live flist data. */ -@@ -345,6 +346,10 @@ enum msgcode { - #define schar char +@@ -389,6 +390,10 @@ enum msgcode { + #endif #endif +#ifdef HAVE_CHFLAGS @@ -412,16 +473,22 @@ TODO: fix --delete-delay to work with --flags option. /* 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. */ -@@ -528,6 +533,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; +@@ -570,6 +575,7 @@ struct file_struct { + extern int file_extra_cnt; + extern int preserve_uid; + extern int preserve_gid; ++extern int preserve_fileflags; + extern int preserve_acls; + + #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) +@@ -603,6 +609,7 @@ extern int preserve_acls; + /* When the associated option is on, all entries will have these present: */ + #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum + #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum ++#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags).unum + #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum + + /* These items are per-entry optional and mutally exclusive: */ --- old/rsync.yo +++ new/rsync.yo @@ -321,6 +321,7 @@ to the detailed description below for a @@ -431,8 +498,8 @@ TODO: fix --delete-delay to work with --flags option. + --flags preserve file flags -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions - -o, --owner preserve owner (super-user only) -@@ -510,7 +511,9 @@ specified, in which case bf(-r) is not i + -A, --acls preserve ACLs (implies -p) +@@ -511,7 +512,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 +510,9 @@ TODO: fix --delete-delay to work with --flags option. 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-": -@@ -805,6 +808,13 @@ quote(itemization( - - If bf(--perms) is enabled, this option is ignored. +@@ -831,6 +834,13 @@ dit(bf(-A, --acls)) This option causes r + ACLs to be the same as the source ACLs. This nonstandard option only + works if the remote rsync also supports it. bf(--acls) implies bf(--perms). +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 +526,7 @@ TODO: fix --delete-delay to work with --flags option. transfer. The resulting value is treated as though it was the permissions --- old/syscall.c +++ new/syscall.c -@@ -153,6 +153,15 @@ int do_chmod(const char *path, mode_t mo +@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo } #endif