X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5e3c6c93f546d8015f6b061348d8815c807d8f1a..74655dc64d4aa5efba975ba1debccd352c0b9fa0:/flags.diff diff --git a/flags.diff b/flags.diff index 0035017..348c5e9 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 +@@ -56,6 +56,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 (remote_protocol == 0) { + if (!read_batch) --- old/configure.in +++ new/configure.in -@@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd +@@ -554,7 +554,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,7 +34,7 @@ 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; +@@ -46,6 +46,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; @@ -31,8 +42,8 @@ TODO: fix --delete-delay to work with --flags option. 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; +@@ -347,6 +348,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_ +@@ -367,6 +371,12 @@ static void send_file_entry(int f, struc flags |= XMIT_SAME_MODE; else mode = file->mode; @@ -54,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) { -@@ -417,6 +427,10 @@ static void send_file_entry(struct file_ +@@ -480,6 +490,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)); @@ -63,9 +74,9 @@ TODO: fix --delete-delay to work with --flags option. + write_int(f, (int)fileflags); +#endif if (preserve_uid && !(flags & XMIT_SAME_UID)) { - if (!numeric_ids) - add_uid(uid); -@@ -484,6 +498,9 @@ static struct file_struct *receive_file_ + write_int(f, uid); + if (flags & XMIT_USER_NAME_FOLLOWS) { +@@ -555,6 +569,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; -@@ -557,9 +574,12 @@ static struct file_struct *receive_file_ +@@ -650,9 +667,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)); @@ -87,33 +98,35 @@ TODO: fix --delete-delay to work with --flags option. + fileflags = (uint32)read_int(f); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) + if (preserve_uid && !(flags & XMIT_SAME_UID)) { uid = (uid_t)read_int(f); -@@ -610,6 +630,9 @@ static struct file_struct *receive_file_ - file->modtime = modtime; - file->length = file_length; +@@ -754,6 +774,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; - -@@ -870,6 +893,9 @@ struct file_struct *make_file(const char - file->modtime = st.st_mtime; - file->length = st.st_size; + if (preserve_uid) + F_OWNER(file) = uid; + if (preserve_gid) +@@ -1051,6 +1075,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; +@@ -107,6 +107,12 @@ static char *deldelay_buf = NULL; + static int deldelay_fd = -1; + static BOOL solo_file = 0; +#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 { +@@ -122,7 +128,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) +@@ -135,17 +140,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 +@@ -257,7 +265,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,20 +178,65 @@ 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 +@@ -313,8 +321,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()) +@@ -327,7 +336,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; +@@ -369,7 +378,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; +@@ -392,15 +401,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); + } +@@ -468,7 +477,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, +@@ -1174,7 +1183,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)) { @@ -187,7 +245,7 @@ TODO: fix --delete-delay to work with --flags option. return; statret = -1; } -@@ -1197,7 +1205,7 @@ static void recv_generator(char *fname, +@@ -1275,7 +1284,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -196,7 +254,7 @@ TODO: fix --delete-delay to work with --flags option. return; } 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, +@@ -1352,7 +1361,7 @@ static void recv_generator(char *fname, goto return_with_success; return; } @@ -205,7 +263,7 @@ TODO: fix --delete-delay to work with --flags option. return; } 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, +@@ -1441,7 +1450,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(st.st_mode)) { @@ -271,7 +329,7 @@ TODO: fix --delete-delay to work with --flags option. {"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 }, -@@ -1126,6 +1135,15 @@ int parse_arguments(int *argc, const cha +@@ -1132,6 +1141,15 @@ int parse_arguments(int *argc, const cha } #endif @@ -287,7 +345,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"); -@@ -1580,6 +1598,9 @@ void server_options(char **args,int *arg +@@ -1595,6 +1613,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -312,7 +370,7 @@ TODO: fix --delete-delay to work with --flags option. 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 +@@ -226,6 +229,41 @@ mode_t dest_mode(mode_t flist_mode, mode return new_mode; } @@ -354,7 +412,7 @@ TODO: fix --delete-delay to work with --flags option. int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, int flags) { -@@ -221,6 +259,15 @@ int set_file_attrs(char *fname, struct f +@@ -324,6 +362,15 @@ int set_file_attrs(char *fname, struct f } #endif @@ -370,7 +428,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 * +@@ -371,6 +418,9 @@ void finish_transfer(char *fname, char * set_file_attrs(fnametmp, file, NULL, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); @@ -380,7 +438,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 * +@@ -385,6 +435,9 @@ void finish_transfer(char *fname, char * } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ @@ -392,16 +450,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) +@@ -57,6 +57,7 @@ #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) -+#define XMIT_SAME_FLAGS (1<<12) + #define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */ + #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */ ++#define XMIT_SAME_FLAGS (1<<15) /* These flags are used in the live flist data. */ -@@ -345,6 +346,10 @@ enum msgcode { - #define schar char +@@ -388,6 +389,10 @@ enum msgcode { + #endif #endif +#ifdef HAVE_CHFLAGS @@ -411,16 +469,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; +@@ -565,6 +570,7 @@ struct file_struct { + extern int file_extra_cnt; + extern int preserve_uid; + extern int preserve_gid; ++extern int preserve_fileflags; + + #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) + #define EXTRA_LEN (sizeof (union file_extras)) +@@ -597,6 +603,7 @@ extern int preserve_gid; + /* 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 + + /* These items are per-entry optional and mutally exclusive: */ + #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num --- old/rsync.yo +++ new/rsync.yo @@ -321,6 +321,7 @@ to the detailed description below for a