X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/8871c12ac6de6b52f034946d009f0f9f5f5b808d..e9d4ab8849c465e766a494765b29e26564f284d0:/flags.diff diff --git a/flags.diff b/flags.diff index 77c8bdd..6bfabb1 100644 --- a/flags.diff +++ b/flags.diff @@ -8,8 +8,6 @@ To use this patch, run these commands for a successful build: ./configure make -TODO: fix --delete-delay to work with --flags option. - --- old/compat.c +++ new/compat.c @@ -44,6 +44,7 @@ extern int protocol_version; @@ -24,12 +22,12 @@ TODO: fix --delete-delay to work with --flags option. #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; +-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx; ++int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx; -@@ -112,6 +113,8 @@ void setup_protocol(int f_out,int f_in) + #ifdef ICONV_OPTION + int filesfrom_convert = 0; +@@ -124,6 +125,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -40,13 +38,13 @@ TODO: fix --delete-delay to work with --flags option. if (preserve_xattrs) --- old/configure.in +++ new/configure.in -@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd +@@ -544,7 +544,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 \ - strerror putenv iconv_open locale_charset nl_langinfo getxattr \ + chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \ - extattr_get_link sigaction sigprocmask) + extattr_get_link sigaction sigprocmask setattrlist) AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c @@ -59,17 +57,17 @@ TODO: fix --delete-delay to work with --flags option. extern int uid_ndx; extern int gid_ndx; extern int eol_nulls; -@@ -335,6 +336,9 @@ static void send_file_entry(int f, struc +@@ -339,6 +340,9 @@ static void send_file_entry(int f, struc { static time_t modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS + static uint32 fileflags; +#endif + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; - static uint32 rdev_major; -@@ -382,6 +386,12 @@ static void send_file_entry(int f, struc + #endif +@@ -397,6 +401,12 @@ static void send_file_entry(int f, struc xflags |= XMIT_SAME_MODE; else mode = file->mode; @@ -80,9 +78,9 @@ TODO: fix --delete-delay to work with --flags option. + fileflags = F_FFLAGS(file); +#endif - 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 ((preserve_devices && IS_DEVICE(mode)) + || (preserve_specials && IS_SPECIAL(mode))) { +@@ -517,6 +527,10 @@ static void send_file_entry(int f, struc } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -93,17 +91,17 @@ TODO: fix --delete-delay to work with --flags option. 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 +@@ -605,6 +619,9 @@ static struct file_struct *recv_file_ent { static int64 modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS + static uint32 fileflags; +#endif + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; - static uint32 rdev_major; -@@ -722,9 +739,12 @@ static struct file_struct *recv_file_ent + #endif +@@ -736,9 +753,12 @@ static struct file_struct *recv_file_ent } if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -117,7 +115,7 @@ TODO: fix --delete-delay to work with --flags option. if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -844,6 +864,10 @@ static struct file_struct *recv_file_ent +@@ -858,6 +878,10 @@ static struct file_struct *recv_file_ent OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; @@ -128,7 +126,7 @@ TODO: fix --delete-delay to work with --flags option. if (uid_ndx) F_OWNER(file) = uid; if (gid_ndx) { -@@ -1168,6 +1192,10 @@ struct file_struct *make_file(const char +@@ -1182,6 +1206,10 @@ struct file_struct *make_file(const char OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } file->mode = st.st_mode; @@ -141,7 +139,7 @@ TODO: fix --delete-delay to work with --flags option. if (gid_ndx) --- old/generator.c +++ new/generator.c -@@ -114,6 +114,14 @@ static int need_retouch_dir_times; +@@ -112,6 +112,14 @@ static int need_retouch_dir_times; static int need_retouch_dir_perms; static const char *solo_file = NULL; @@ -156,7 +154,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 */ -@@ -129,7 +137,6 @@ enum delret { +@@ -127,7 +135,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); @@ -164,7 +162,7 @@ TODO: fix --delete-delay to work with --flags option. static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; -@@ -142,17 +149,20 @@ static int is_backup_file(char *fn) +@@ -140,17 +147,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.) */ @@ -188,7 +186,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. */ -@@ -264,7 +274,7 @@ static enum delret delete_dir_contents(c +@@ -262,7 +272,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; @@ -197,8 +195,8 @@ TODO: fix --delete-delay to work with --flags option. ret = DR_NOT_EMPTY; } -@@ -320,8 +330,9 @@ static int remember_delete(struct file_s - +@@ -318,8 +328,9 @@ static int remember_delete(struct file_s + while (1) { len = snprintf(deldelay_buf + deldelay_cnt, - deldelay_size - deldelay_cnt, @@ -209,7 +207,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()) -@@ -334,7 +345,7 @@ static int remember_delete(struct file_s +@@ -332,7 +343,7 @@ static int remember_delete(struct file_s return 1; } @@ -218,7 +216,7 @@ TODO: fix --delete-delay to work with --flags option. { static int read_pos = 0; int j, len, mode; -@@ -376,7 +387,7 @@ static int read_delay_line(char *buf) +@@ -374,12 +385,12 @@ static int read_delay_line(char *buf) bp = deldelay_buf + read_pos; @@ -227,7 +225,13 @@ TODO: fix --delete-delay to work with --flags option. 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) + } +- past_space = strchr(bp, ' ') + 1; ++ past_space = strchr(strchr(bp, ' ') + 1, ' ') + 1; + len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */ + read_pos = j + 1; + +@@ -397,15 +408,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { @@ -246,7 +250,7 @@ TODO: fix --delete-delay to work with --flags option. if (deldelay_fd >= 0) close(deldelay_fd); } -@@ -474,7 +485,7 @@ static void delete_in_dir(char *fbuf, st +@@ -472,7 +483,7 @@ static void delete_in_dir(char *fbuf, st if (!remember_delete(fp, delbuf)) break; } else @@ -255,7 +259,16 @@ TODO: fix --delete-delay to work with --flags option. } } -@@ -1270,7 +1281,7 @@ static void recv_generator(char *fname, +@@ -1296,7 +1307,7 @@ static void recv_generator(char *fname, + * full later (right before we handle its contents). */ + if (statret == 0 + && (S_ISDIR(sx.st.st_mode) +- || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)) ++ || delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0)) + goto cleanup; /* Any errors get reported later. */ + if (do_mkdir(fname, file->mode & 0700) == 0) + file->flags |= FLAG_DIR_CREATED; +@@ -1308,7 +1319,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)) { @@ -264,7 +277,7 @@ TODO: fix --delete-delay to work with --flags option. goto skipping_dir_contents; statret = -1; } -@@ -1399,7 +1410,7 @@ static void recv_generator(char *fname, +@@ -1437,7 +1448,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -273,7 +286,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, -@@ -1478,7 +1489,7 @@ static void recv_generator(char *fname, +@@ -1516,7 +1527,7 @@ static void recv_generator(char *fname, goto return_with_success; goto cleanup; } @@ -282,7 +295,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, -@@ -1569,7 +1580,7 @@ static void recv_generator(char *fname, +@@ -1607,7 +1618,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { @@ -347,7 +360,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 }, -@@ -1285,6 +1293,15 @@ int parse_arguments(int *argc_p, const c +@@ -1284,6 +1292,15 @@ int parse_arguments(int *argc_p, const c } #endif @@ -363,7 +376,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"); -@@ -1796,6 +1813,9 @@ void server_options(char **args, int *ar +@@ -1792,6 +1809,9 @@ void server_options(char **args, int *ar if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -419,7 +432,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) ++void make_mutable(const char *fname, mode_t mode, uint32 fileflags) +{ + if (!preserve_fileflags && S_ISLNK(mode)) + return; @@ -429,7 +442,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) ++void undo_make_mutable(const char *fname, mode_t mode, uint32 fileflags) +{ + if (!preserve_fileflags && S_ISLNK(mode)) + return; @@ -488,7 +501,7 @@ TODO: fix --delete-delay to work with --flags option. /* These flags are used in the live flist data. */ -@@ -415,6 +416,10 @@ enum msgcode { +@@ -441,6 +442,10 @@ typedef unsigned int size_t; #endif #endif @@ -499,7 +512,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. */ -@@ -582,6 +587,7 @@ extern int file_extra_cnt; +@@ -608,6 +613,7 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -507,17 +520,17 @@ TODO: fix --delete-delay to work with --flags option. extern int acls_ndx; extern int xattrs_ndx; -@@ -619,6 +625,7 @@ extern int xattrs_ndx; +@@ -645,6 +651,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 + #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num --- old/rsync.yo +++ new/rsync.yo -@@ -343,6 +343,7 @@ to the detailed description below for a +@@ -338,6 +338,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 @@ -525,7 +538,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) -@@ -544,7 +545,9 @@ specified, in which case bf(-r) is not i +@@ -539,7 +540,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 @@ -536,9 +549,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-": -@@ -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. +@@ -908,6 +911,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) @@ -552,7 +565,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 -@@ -162,6 +162,15 @@ int do_chmod(const char *path, mode_t mo +@@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mo } #endif