X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/80c890752499bc879077ad1653f3efb1884d61b9..f264662f71d65a8addc50d3ee0372d82c903bf2a:/flags.diff diff --git a/flags.diff b/flags.diff index 80b2d0d..f5abff3 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; +@@ -44,6 +44,7 @@ extern int protocol_version; + extern int protect_args; + 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; +@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv; + #endif + + /* 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; + #ifdef ICONV_OPTION + int ic_ndx; + +@@ -112,6 +113,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 @@ -34,15 +51,15 @@ TODO: fix --delete-delay to work with --flags option. AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c +++ new/flist.c -@@ -49,6 +49,7 @@ extern int preserve_links; +@@ -50,6 +50,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; -+extern int preserve_fileflags; - extern int preserve_uid; - extern int preserve_gid; - extern int relative_paths; -@@ -345,6 +346,9 @@ static void send_file_entry(int f, struc ++extern int fileflags_ndx; + extern int uid_ndx; + extern int gid_ndx; + extern int eol_nulls; +@@ -335,6 +336,9 @@ static void send_file_entry(int f, struc { static time_t modtime; static mode_t mode; @@ -52,80 +69,80 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -393,6 +397,12 @@ static void send_file_entry(int f, struc - flags |= XMIT_SAME_MODE; +@@ -382,6 +386,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; ++ 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))) { - if (protocol_version < 28) { -@@ -510,6 +520,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; +@@ -505,6 +515,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); -@@ -598,6 +612,9 @@ static struct file_struct *recv_file_ent +@@ -593,6 +607,9 @@ static struct file_struct *recv_file_ent { 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; -@@ -730,9 +747,12 @@ static struct file_struct *recv_file_ent +@@ -722,9 +739,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) -@@ -851,6 +871,10 @@ static struct file_struct *recv_file_ent +@@ -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 -+ if (preserve_fileflags) ++ if (fileflags_ndx) + F_FFLAGS(file) = fileflags; +#endif - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = uid; - if (preserve_gid) -@@ -1164,6 +1188,10 @@ struct file_struct *make_file(const char + 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 -+ 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; +@@ -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 @@ -139,7 +156,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 */ -@@ -130,7 +138,6 @@ enum delret { +@@ -129,7 +137,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); @@ -147,7 +164,7 @@ TODO: fix --delete-delay to work with --flags option. static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; -@@ -143,17 +150,20 @@ static int is_backup_file(char *fn) +@@ -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.) */ @@ -171,7 +188,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. */ -@@ -265,7 +275,7 @@ static enum delret delete_dir_contents(c +@@ -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; @@ -180,7 +197,7 @@ TODO: fix --delete-delay to work with --flags option. ret = DR_NOT_EMPTY; } -@@ -321,8 +331,9 @@ static int remember_delete(struct file_s +@@ -320,8 +330,9 @@ static int remember_delete(struct file_s while (1) { len = snprintf(deldelay_buf + deldelay_cnt, @@ -192,7 +209,7 @@ TODO: fix --delete-delay to work with --flags option. if ((deldelay_cnt += len) <= deldelay_size) break; if (deldelay_fd < 0 && !start_delete_delay_temp()) -@@ -335,7 +346,7 @@ static int remember_delete(struct file_s +@@ -334,7 +345,7 @@ static int remember_delete(struct file_s return 1; } @@ -201,7 +218,7 @@ TODO: fix --delete-delay to work with --flags option. { static int read_pos = 0; int j, len, mode; -@@ -377,7 +388,7 @@ static int read_delay_line(char *buf) +@@ -376,7 +387,7 @@ static int read_delay_line(char *buf) bp = deldelay_buf + read_pos; @@ -210,7 +227,7 @@ TODO: fix --delete-delay to work with --flags option. invalid_data: rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n"); return -1; -@@ -400,15 +411,15 @@ static int read_delay_line(char *buf) +@@ -399,15 +410,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { @@ -229,7 +246,7 @@ TODO: fix --delete-delay to work with --flags option. if (deldelay_fd >= 0) close(deldelay_fd); } -@@ -475,7 +486,7 @@ static void delete_in_dir(char *fbuf, st +@@ -474,7 +485,7 @@ static void delete_in_dir(char *fbuf, st if (!remember_delete(fp, delbuf)) break; } else @@ -238,16 +255,16 @@ TODO: fix --delete-delay to work with --flags option. } } -@@ -1213,7 +1224,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(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, +@@ -1399,7 +1410,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, +@@ -1478,7 +1489,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, +@@ -1569,7 +1580,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; +@@ -51,6 +51,7 @@ int preserve_hard_links = 0; int preserve_acls = 0; int preserve_xattrs = 0; int preserve_perms = 0; @@ -284,15 +301,15 @@ 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 +@@ -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 "; ++ char const *fileflags = "no "; STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -241,6 +243,9 @@ static void print_rsync_version(enum log +@@ -250,6 +252,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 +@@ -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); @@ -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) +@@ -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"); @@ -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[] +@@ -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 }, @@ -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 +@@ -1285,6 +1293,15 @@ int parse_arguments(int *argc_p, const c } #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 +@@ -1796,6 +1813,9 @@ void server_options(char **args, int *ar if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -358,17 +375,17 @@ TODO: fix --delete-delay to work with --flags option. goto oom; --- old/rsync.c +++ new/rsync.c -@@ -31,6 +31,7 @@ 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_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 = - int ic_ndx; - #endif + 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 @@ -382,8 +399,8 @@ 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 + # 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; } @@ -422,10 +439,10 @@ TODO: fix --delete-delay to work with --flags option. +} +#endif + - int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, + int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, const char *fnamecmp, int flags) { -@@ -395,6 +441,15 @@ int set_file_attrs(const char *fname, st +@@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, st } #endif @@ -441,7 +458,7 @@ TODO: fix --delete-delay to work with --flags option. if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -454,6 +509,9 @@ void finish_transfer(const char *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); @@ -451,7 +468,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); -@@ -468,6 +526,9 @@ void finish_transfer(const char *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. */ @@ -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. */ -@@ -404,6 +405,10 @@ enum msgcode { +@@ -415,6 +416,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. */ -@@ -583,6 +588,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; +@@ -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; -@@ -617,6 +623,7 @@ extern int preserve_xattrs; +@@ -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, 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 +@@ -339,6 +339,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 +@@ -540,7 +541,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. +@@ -895,6 +898,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)