X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/58b399b9a42eacea1953e68f527f79903bb39546..9c25eef5a53f1970a5379ac5320ff4172d08959a:/flags.diff diff --git a/flags.diff b/flags.diff index 642d483..c12b1d3 100644 --- a/flags.diff +++ b/flags.diff @@ -12,14 +12,31 @@ TODO: fix --delete-delay to work with --flags option. --- old/compat.c +++ new/compat.c -@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in) - preserve_uid = ++file_extra_cnt; +@@ -45,6 +45,7 @@ extern int prune_empty_dirs; + extern int protocol_version; + extern int preserve_uid; + extern int preserve_gid; ++extern int preserve_fileflags; + extern int preserve_acls; + extern int preserve_xattrs; + extern int need_messages_from_generator; +@@ -58,7 +59,7 @@ extern char *dest_option; + extern struct filter_list_struct filter_list; + + /* These index values are for the file-list's extra-attribute array. */ +-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx; ++int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx; + + /* The server makes sure that if either side only supports a pre-release + * version of a protocol, that both sides must speak a compatible version +@@ -99,6 +100,8 @@ void setup_protocol(int f_out,int f_in) + uid_ndx = ++file_extra_cnt; if (preserve_gid) - preserve_gid = ++file_extra_cnt; + gid_ndx = ++file_extra_cnt; + if (preserve_fileflags) -+ preserve_fileflags = ++file_extra_cnt; ++ fileflags_ndx = ++file_extra_cnt; if (preserve_acls && !am_sender) - preserve_acls = ++file_extra_cnt; + acls_ndx = ++file_extra_cnt; if (preserve_xattrs) --- old/configure.in +++ new/configure.in @@ -27,22 +44,22 @@ TODO: fix --delete-delay to work with --flags option. 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 \ -- strerror putenv iconv_open locale_charset nl_langinfo \ -+ chflags strerror putenv iconv_open locale_charset nl_langinfo \ - sigaction sigprocmask) +- strerror putenv iconv_open locale_charset nl_langinfo getxattr \ ++ chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \ + extattr_get_link sigaction sigprocmask) AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c +++ new/flist.c -@@ -49,6 +49,7 @@ extern int preserve_links; - extern int preserve_hard_links; - extern int preserve_devices; +@@ -52,6 +52,7 @@ extern int preserve_devices; extern int preserve_specials; -+extern int preserve_fileflags; - extern int preserve_uid; - extern int preserve_gid; + extern int uid_ndx; + extern int gid_ndx; ++extern int fileflags_ndx; extern int relative_paths; -@@ -340,6 +341,9 @@ static void send_file_entry(int f, struc + extern int implied_dirs; + extern int file_extra_cnt; +@@ -360,6 +361,9 @@ static void send_file_entry(int f, struc { static time_t modtime; static mode_t mode; @@ -52,31 +69,31 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -388,6 +392,12 @@ static void send_file_entry(int f, struc - flags |= XMIT_SAME_MODE; +@@ -408,6 +412,12 @@ static void send_file_entry(int f, struc + xflags |= XMIT_SAME_MODE; else mode = file->mode; +#ifdef SUPPORT_FLAGS + if (F_FFLAGS(file) == fileflags) -+ flags |= XMIT_SAME_FLAGS; ++ xflags |= XMIT_SAME_FLAGS; + else + fileflags = F_FFLAGS(file); +#endif - if ((preserve_devices && IS_DEVICE(mode)) - || (preserve_specials && IS_SPECIAL(mode))) { - if (protocol_version < 28) { -@@ -505,6 +515,10 @@ static void send_file_entry(int f, struc + + if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR)) + xflags |= XMIT_NON_XFER_DIR; +@@ -530,6 +540,10 @@ static void send_file_entry(int f, struc } - if (!(flags & XMIT_SAME_MODE)) + if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags && !(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 (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 +@@ -618,6 +632,9 @@ static struct file_struct *recv_file_ent { static int64 modtime; static mode_t mode; @@ -86,46 +103,46 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -725,9 +742,12 @@ static struct file_struct *recv_file_ent +@@ -753,9 +770,12 @@ static struct file_struct *recv_file_ent } - if (!(flags & XMIT_SAME_MODE)) + 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_fileflags && !(flags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) { + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -846,6 +866,10 @@ static struct file_struct *recv_file_ent +@@ -875,6 +895,10 @@ static struct file_struct *recv_file_ent OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags) ++ if (fileflags_ndx) + F_FFLAGS(file) = fileflags; +#endif - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = uid; - if (preserve_gid) -@@ -1159,6 +1183,10 @@ struct file_struct *make_file(const char + if (gid_ndx) { +@@ -1192,6 +1216,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 (preserve_fileflags) ++ if (fileflags_ndx) + F_FFLAGS(file) = st.st_flags; +#endif - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = st.st_uid; - if (preserve_gid) + if (gid_ndx) --- old/generator.c +++ new/generator.c -@@ -115,6 +115,14 @@ static int dir_tweaking; - static int need_retouch_dir_times; +@@ -115,6 +115,14 @@ static int need_retouch_dir_times; + static int need_retouch_dir_perms; static const char *solo_file = NULL; +#ifdef SUPPORT_FLAGS @@ -238,16 +255,16 @@ TODO: fix --delete-delay to work with --flags option. } } -@@ -1213,7 +1224,7 @@ static void recv_generator(char *fname, +@@ -1219,7 +1230,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) - return; + goto skipping_dir_contents; statret = -1; } -@@ -1326,7 +1337,7 @@ static void recv_generator(char *fname, +@@ -1351,7 +1362,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -256,7 +273,7 @@ TODO: fix --delete-delay to work with --flags option. goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, -@@ -1403,7 +1414,7 @@ static void recv_generator(char *fname, +@@ -1430,7 +1441,7 @@ static void recv_generator(char *fname, goto return_with_success; goto cleanup; } @@ -265,7 +282,7 @@ TODO: fix --delete-delay to work with --flags option. goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, -@@ -1492,7 +1503,7 @@ static void recv_generator(char *fname, +@@ -1521,7 +1532,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { @@ -276,7 +293,7 @@ TODO: fix --delete-delay to work with --flags option. stat_errno = ENOENT; --- old/options.c +++ new/options.c -@@ -49,6 +49,7 @@ int preserve_hard_links = 0; +@@ -50,6 +50,7 @@ int preserve_hard_links = 0; int preserve_acls = 0; int preserve_xattrs = 0; int preserve_perms = 0; @@ -284,7 +301,7 @@ TODO: fix --delete-delay to work with --flags option. int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -212,6 +213,7 @@ static void print_rsync_version(enum log +@@ -219,6 +220,7 @@ static void print_rsync_version(enum log char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -292,7 +309,7 @@ TODO: fix --delete-delay to work with --flags option. STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -241,6 +243,9 @@ static void print_rsync_version(enum log +@@ -248,6 +250,9 @@ static void print_rsync_version(enum log #ifdef ICONV_OPTION iconv = ""; #endif @@ -302,7 +319,7 @@ TODO: fix --delete-delay to work with --flags option. rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -254,8 +259,8 @@ static void print_rsync_version(enum log +@@ -261,8 +266,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); @@ -313,7 +330,7 @@ TODO: fix --delete-delay to work with --flags option. #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -321,6 +326,7 @@ void usage(enum logcode F) +@@ -329,6 +334,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"); @@ -321,7 +338,7 @@ TODO: fix --delete-delay to work with --flags option. rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); #ifdef SUPPORT_ACLS -@@ -458,6 +464,8 @@ static struct poptOption long_options[] +@@ -467,6 +473,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 }, @@ -330,7 +347,7 @@ TODO: fix --delete-delay to work with --flags option. {"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 }, -@@ -1236,6 +1244,15 @@ int parse_arguments(int *argc, const cha +@@ -1263,6 +1271,15 @@ int parse_arguments(int *argc, const cha } #endif @@ -346,7 +363,7 @@ 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"); -@@ -1712,6 +1729,9 @@ void server_options(char **args,int *arg +@@ -1754,6 +1771,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -365,8 +382,8 @@ TODO: fix --delete-delay to work with --flags option. +extern int preserve_fileflags; extern int preserve_executability; extern int preserve_times; - extern int omit_dir_times; -@@ -61,6 +62,16 @@ iconv_t ic_send = (iconv_t)-1, ic_recv = + extern int am_root; +@@ -60,6 +61,16 @@ iconv_t ic_send = (iconv_t)-1, ic_recv = int ic_ndx; #endif @@ -383,7 +400,7 @@ TODO: fix --delete-delay to work with --flags option. static const char *default_charset(void) { #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET -@@ -265,6 +276,41 @@ mode_t dest_mode(mode_t flist_mode, mode +@@ -267,6 +278,41 @@ mode_t dest_mode(mode_t flist_mode, mode return new_mode; } @@ -463,15 +480,15 @@ 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 -@@ -56,6 +56,7 @@ +@@ -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 */ -+#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - NOW */ + #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. */ -@@ -403,6 +404,10 @@ enum msgcode { +@@ -406,6 +407,10 @@ enum msgcode { #endif #endif @@ -482,25 +499,25 @@ 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. */ -@@ -582,6 +587,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; - extern int preserve_xattrs; +@@ -573,6 +578,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; -@@ -616,6 +622,7 @@ extern int preserve_xattrs; +@@ -610,6 +616,7 @@ extern int xattrs_ndx; /* 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)->num - #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num + #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 -@@ -321,6 +321,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 @@ -508,7 +525,7 @@ TODO: fix --delete-delay to work with --flags option. -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions -A, --acls preserve ACLs (implies -p) -@@ -520,7 +521,9 @@ specified, in which case bf(-r) is not i +@@ -543,7 +544,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 @@ -519,9 +536,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-": -@@ -845,6 +848,13 @@ extended attributes to be the same as th - only if the remote machine's rsync supports this option also. This is - a non-standard option. +@@ -882,6 +885,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)