X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/82c2230a445b352ac67f3ed13bf7fa88b0bbac70..30c5d6b495835803d6f139e62b9e6e02b18e89c3:/flags.diff diff --git a/flags.diff b/flags.diff index 69dcc3f..80b2d0d 100644 --- a/flags.diff +++ b/flags.diff @@ -12,7 +12,7 @@ TODO: fix --delete-delay to work with --flags option. --- old/compat.c +++ new/compat.c -@@ -64,6 +64,8 @@ void setup_protocol(int f_out,int f_in) +@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in) preserve_uid = ++file_extra_cnt; if (preserve_gid) preserve_gid = ++file_extra_cnt; @@ -27,9 +27,9 @@ 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 @@ -42,7 +42,7 @@ TODO: fix --delete-delay to work with --flags option. extern int preserve_uid; extern int preserve_gid; extern int relative_paths; -@@ -354,6 +355,9 @@ static void send_file_entry(int f, struc +@@ -345,6 +346,9 @@ static void send_file_entry(int f, struc { static time_t modtime; static mode_t mode; @@ -52,7 +52,7 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -374,6 +378,12 @@ static void send_file_entry(int f, struc +@@ -393,6 +397,12 @@ static void send_file_entry(int f, struc flags |= XMIT_SAME_MODE; else mode = file->mode; @@ -65,7 +65,7 @@ TODO: fix --delete-delay to work with --flags option. if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { -@@ -491,6 +501,10 @@ static void send_file_entry(int f, struc +@@ -510,6 +520,10 @@ static void send_file_entry(int f, struc } if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -76,7 +76,7 @@ TODO: fix --delete-delay to work with --flags option. if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -579,6 +593,9 @@ static struct file_struct *recv_file_ent +@@ -598,6 +612,9 @@ static struct file_struct *recv_file_ent { static int64 modtime; static mode_t mode; @@ -86,7 +86,7 @@ TODO: fix --delete-delay to work with --flags option. static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -686,9 +703,12 @@ static struct file_struct *recv_file_ent +@@ -730,9 +747,12 @@ static struct file_struct *recv_file_ent } if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -100,7 +100,7 @@ TODO: fix --delete-delay to work with --flags option. if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -806,6 +826,10 @@ static struct file_struct *recv_file_ent +@@ -851,6 +871,10 @@ static struct file_struct *recv_file_ent OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; @@ -111,7 +111,7 @@ TODO: fix --delete-delay to work with --flags option. if (preserve_uid) F_OWNER(file) = uid; if (preserve_gid) -@@ -1115,6 +1139,10 @@ struct file_struct *make_file(const char +@@ -1164,6 +1188,10 @@ struct file_struct *make_file(const char OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } file->mode = st.st_mode; @@ -124,7 +124,7 @@ TODO: fix --delete-delay to work with --flags option. if (preserve_gid) --- old/generator.c +++ new/generator.c -@@ -112,6 +112,14 @@ static int dir_tweaking; +@@ -115,6 +115,14 @@ static int dir_tweaking; static int need_retouch_dir_times; static const char *solo_file = NULL; @@ -139,7 +139,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 */ -@@ -127,7 +135,6 @@ enum delret { +@@ -130,7 +138,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); @@ -147,7 +147,7 @@ TODO: fix --delete-delay to work with --flags option. static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; -@@ -140,17 +147,20 @@ static int is_backup_file(char *fn) +@@ -143,17 +150,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 +171,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. */ -@@ -262,7 +272,7 @@ static enum delret delete_dir_contents(c +@@ -265,7 +275,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 +180,7 @@ TODO: fix --delete-delay to work with --flags option. ret = DR_NOT_EMPTY; } -@@ -318,8 +328,9 @@ static int remember_delete(struct file_s +@@ -321,8 +331,9 @@ static int remember_delete(struct file_s while (1) { len = snprintf(deldelay_buf + deldelay_cnt, @@ -192,7 +192,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()) -@@ -332,7 +343,7 @@ static int remember_delete(struct file_s +@@ -335,7 +346,7 @@ static int remember_delete(struct file_s return 1; } @@ -201,7 +201,7 @@ TODO: fix --delete-delay to work with --flags option. { static int read_pos = 0; int j, len, mode; -@@ -374,7 +385,7 @@ static int read_delay_line(char *buf) +@@ -377,7 +388,7 @@ static int read_delay_line(char *buf) bp = deldelay_buf + read_pos; @@ -210,7 +210,7 @@ TODO: fix --delete-delay to work with --flags option. invalid_data: rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n"); return -1; -@@ -397,15 +408,15 @@ static int read_delay_line(char *buf) +@@ -400,15 +411,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { @@ -229,7 +229,7 @@ TODO: fix --delete-delay to work with --flags option. if (deldelay_fd >= 0) close(deldelay_fd); } -@@ -473,7 +484,7 @@ static void delete_in_dir(struct file_li +@@ -475,7 +486,7 @@ static void delete_in_dir(char *fbuf, st if (!remember_delete(fp, delbuf)) break; } else @@ -238,7 +238,7 @@ TODO: fix --delete-delay to work with --flags option. } } -@@ -1211,7 +1222,7 @@ static void recv_generator(char *fname, +@@ -1213,7 +1224,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)) { @@ -247,7 +247,7 @@ TODO: fix --delete-delay to work with --flags option. return; statret = -1; } -@@ -1324,7 +1335,7 @@ static void recv_generator(char *fname, +@@ -1326,7 +1337,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -256,7 +256,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, -@@ -1401,7 +1412,7 @@ static void recv_generator(char *fname, +@@ -1403,7 +1414,7 @@ static void recv_generator(char *fname, goto return_with_success; goto cleanup; } @@ -265,7 +265,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, -@@ -1490,7 +1501,7 @@ static void recv_generator(char *fname, +@@ -1492,7 +1503,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { @@ -284,37 +284,36 @@ TODO: fix --delete-delay to work with --flags option. int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -206,6 +207,7 @@ static void print_rsync_version(enum log - char const *xattrs = "no "; +@@ -212,6 +213,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; - #ifdef HAVE_SOCKETPAIR -@@ -234,6 +236,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -241,6 +243,9 @@ static void print_rsync_version(enum log + #ifdef ICONV_OPTION + iconv = ""; #endif - +#ifdef SUPPORT_FLAGS + fileflags = ""; +#endif -+ - if (SUBPROTOCOL_VERSION) - snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION); - else -@@ -250,8 +256,8 @@ static void print_rsync_version(enum log + + 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 (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\n", -- have_inplace, acls, xattrs); -+ rprintf(f, " %sappend, %sACLs, %sxattrs, %sfile-flags\n", -+ have_inplace, acls, xattrs, fileflags); +- 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()); -@@ -317,6 +323,7 @@ void usage(enum logcode F) +@@ -321,6 +326,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"); @@ -322,7 +321,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 -@@ -448,6 +455,8 @@ static struct poptOption long_options[] +@@ -458,6 +464,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 }, @@ -331,7 +330,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 }, -@@ -1194,6 +1203,15 @@ int parse_arguments(int *argc, const cha +@@ -1236,6 +1244,15 @@ int parse_arguments(int *argc, const cha } #endif @@ -347,7 +346,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"); -@@ -1661,6 +1679,9 @@ void server_options(char **args,int *arg +@@ -1712,6 +1729,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -359,7 +358,7 @@ TODO: fix --delete-delay to work with --flags option. goto oom; --- old/rsync.c +++ new/rsync.c -@@ -34,6 +34,7 @@ extern int dry_run; +@@ -31,6 +31,7 @@ extern int dry_run; extern int preserve_acls; extern int preserve_xattrs; extern int preserve_perms; @@ -367,9 +366,9 @@ TODO: fix --delete-delay to work with --flags option. extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; -@@ -54,6 +55,16 @@ extern int make_backups; - extern struct file_list *cur_flist, *first_flist, *dir_flist; - extern struct chmod_mode_struct *daemon_chmod_modes; +@@ -61,6 +62,16 @@ iconv_t ic_send = (iconv_t)-1, ic_recv = + int ic_ndx; + #endif +#ifdef SUPPORT_FLAGS +#ifndef UF_NOUNLINK @@ -381,10 +380,10 @@ TODO: fix --delete-delay to work with --flags option. +#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) +#endif + - #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H - iconv_t ic_chck = (iconv_t)-1; - -@@ -218,6 +229,41 @@ mode_t dest_mode(mode_t flist_mode, mode + 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 return new_mode; } @@ -426,7 +425,7 @@ TODO: fix --delete-delay to work with --flags option. int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, const char *fnamecmp, int flags) { -@@ -344,6 +390,15 @@ int set_file_attrs(const char *fname, st +@@ -395,6 +441,15 @@ int set_file_attrs(const char *fname, st } #endif @@ -442,7 +441,7 @@ TODO: fix --delete-delay to work with --flags option. if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -403,6 +458,9 @@ void finish_transfer(const char *fname, +@@ -454,6 +509,9 @@ void finish_transfer(const char *fname, set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); @@ -452,7 +451,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); -@@ -417,6 +475,9 @@ void finish_transfer(const char *fname, +@@ -468,6 +526,9 @@ void finish_transfer(const char *fname, } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ @@ -472,7 +471,7 @@ TODO: fix --delete-delay to work with --flags option. /* These flags are used in the live flist data. */ -@@ -394,6 +395,10 @@ enum msgcode { +@@ -404,6 +405,10 @@ enum msgcode { #endif #endif @@ -483,7 +482,7 @@ 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. */ -@@ -573,6 +578,7 @@ struct file_struct { +@@ -583,6 +588,7 @@ struct file_struct { extern int file_extra_cnt; extern int preserve_uid; extern int preserve_gid; @@ -491,14 +490,14 @@ TODO: fix --delete-delay to work with --flags option. extern int preserve_acls; extern int preserve_xattrs; -@@ -607,6 +613,7 @@ extern int preserve_xattrs; +@@ -617,6 +623,7 @@ extern int preserve_xattrs; /* 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_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 @@ -509,7 +508,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) -@@ -518,7 +519,9 @@ specified, in which case bf(-r) is not i +@@ -520,7 +521,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 @@ -520,7 +519,7 @@ 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-": -@@ -843,6 +846,13 @@ extended attributes to be the same as th +@@ -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. @@ -536,7 +535,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 -@@ -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