X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7c4c2959ae79a01986ff24b5dc9ff4518cc9fb7b..cc3e685d09b2095099fc396157d19172ab3ef7c4:/flags.diff diff --git a/flags.diff b/flags.diff index edb1b54..8ad65fc 100644 --- a/flags.diff +++ b/flags.diff @@ -8,8 +8,9 @@ To use this patch, run these commands for a successful build: ./configure make ---- old/compat.c -+++ new/compat.c +diff --git a/compat.c b/compat.c +--- a/compat.c ++++ b/compat.c @@ -44,6 +44,7 @@ extern int protocol_version; extern int protect_args; extern int preserve_uid; @@ -22,12 +23,12 @@ To use this patch, run these commands for a successful build: #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; -@@ -122,6 +123,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; @@ -36,9 +37,10 @@ To use this patch, run these commands for a successful build: if (preserve_acls && !am_sender) acls_ndx = ++file_extra_cnt; if (preserve_xattrs) ---- old/configure.in -+++ new/configure.in -@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -551,7 +551,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ 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 \ @@ -47,8 +49,9 @@ To use this patch, run these commands for a successful build: extattr_get_link sigaction sigprocmask setattrlist) AC_CHECK_FUNCS(getpgrp tcgetpgrp) ---- old/flist.c -+++ new/flist.c +diff --git a/flist.c b/flist.c +--- a/flist.c ++++ b/flist.c @@ -50,6 +50,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; @@ -57,17 +60,17 @@ To use this patch, run these commands for a successful build: extern int uid_ndx; extern int gid_ndx; extern int eol_nulls; -@@ -335,6 +336,9 @@ static void send_file_entry(int f, struc +@@ -345,6 +346,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ { 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; -@@ -391,6 +395,12 @@ static void send_file_entry(int f, struc + #endif +@@ -403,6 +407,12 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ xflags |= XMIT_SAME_MODE; else mode = file->mode; @@ -80,7 +83,7 @@ To use this patch, run these commands for a successful build: if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { -@@ -511,6 +521,10 @@ static void send_file_entry(int f, struc +@@ -523,6 +533,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -91,17 +94,17 @@ To use this patch, run these commands for a successful build: if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -599,6 +613,9 @@ static struct file_struct *recv_file_ent +@@ -611,6 +625,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, { 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; -@@ -728,9 +745,12 @@ static struct file_struct *recv_file_ent + #endif +@@ -742,9 +759,12 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -115,7 +118,7 @@ To use this patch, run these commands for a successful build: if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -850,6 +870,10 @@ static struct file_struct *recv_file_ent +@@ -866,6 +886,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; @@ -126,7 +129,7 @@ To use this patch, run these commands for a successful build: if (uid_ndx) F_OWNER(file) = uid; if (gid_ndx) { -@@ -1178,6 +1202,10 @@ struct file_struct *make_file(const char +@@ -1196,6 +1220,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } file->mode = st.st_mode; @@ -137,9 +140,10 @@ To use this patch, run these commands for a successful build: if (uid_ndx) F_OWNER(file) = st.st_uid; if (gid_ndx) ---- old/generator.c -+++ new/generator.c -@@ -114,6 +114,14 @@ static int need_retouch_dir_times; +diff --git a/generator.c b/generator.c +--- a/generator.c ++++ b/generator.c +@@ -112,6 +112,14 @@ static int need_retouch_dir_times; static int need_retouch_dir_perms; static const char *solo_file = NULL; @@ -154,7 +158,7 @@ To use this patch, run these commands for a successful build: /* 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); @@ -162,7 +166,7 @@ To use this patch, run these commands for a successful build: 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.) */ @@ -186,7 +190,7 @@ To use this patch, run these commands for a successful build: 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(char *fname, int flags) if (S_ISDIR(fp->mode) && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) ret = DR_NOT_EMPTY; @@ -195,8 +199,8 @@ To use this patch, run these commands for a successful build: 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_struct *file, const char *fname) + while (1) { len = snprintf(deldelay_buf + deldelay_cnt, - deldelay_size - deldelay_cnt, @@ -207,7 +211,7 @@ To use this patch, run these commands for a successful build: 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_struct *file, const char *fname) return 1; } @@ -216,7 +220,7 @@ To use this patch, run these commands for a successful build: { static int read_pos = 0; int j, len, mode; -@@ -376,12 +387,12 @@ static int read_delay_line(char *buf) +@@ -374,12 +385,12 @@ static int read_delay_line(char *buf) bp = deldelay_buf + read_pos; @@ -231,7 +235,7 @@ To use this patch, run these commands for a successful build: len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */ read_pos = j + 1; -@@ -399,15 +410,15 @@ static int read_delay_line(char *buf) +@@ -397,15 +408,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { @@ -250,7 +254,7 @@ To use this patch, run these commands for a successful build: 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, struct file_struct *file, dev_t *fs_dev) if (!remember_delete(fp, delbuf)) break; } else @@ -259,7 +263,7 @@ To use this patch, run these commands for a successful build: } } -@@ -1263,7 +1274,7 @@ static void recv_generator(char *fname, +@@ -1296,7 +1307,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * full later (right before we handle its contents). */ if (statret == 0 && (S_ISDIR(sx.st.st_mode) @@ -268,7 +272,7 @@ To use this patch, run these commands for a successful build: goto cleanup; /* Any errors get reported later. */ if (do_mkdir(fname, file->mode & 0700) == 0) file->flags |= FLAG_DIR_CREATED; -@@ -1275,7 +1286,7 @@ static void recv_generator(char *fname, +@@ -1308,7 +1319,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(sx.st.st_mode)) { @@ -277,7 +281,7 @@ To use this patch, run these commands for a successful build: goto skipping_dir_contents; statret = -1; } -@@ -1404,7 +1415,7 @@ static void recv_generator(char *fname, +@@ -1437,7 +1448,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -286,7 +290,7 @@ To use this patch, run these commands for a successful build: goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, -@@ -1483,7 +1494,7 @@ static void recv_generator(char *fname, +@@ -1516,7 +1527,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto return_with_success; goto cleanup; } @@ -295,7 +299,7 @@ To use this patch, run these commands for a successful build: goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, -@@ -1574,7 +1585,7 @@ static void recv_generator(char *fname, +@@ -1607,7 +1618,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { @@ -304,8 +308,9 @@ To use this patch, run these commands for a successful build: goto cleanup; statret = -1; stat_errno = ENOENT; ---- old/options.c -+++ new/options.c +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c @@ -51,6 +51,7 @@ int preserve_hard_links = 0; int preserve_acls = 0; int preserve_xattrs = 0; @@ -314,7 +319,7 @@ To use this patch, run these commands for a successful build: int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -221,6 +222,7 @@ static void print_rsync_version(enum log +@@ -222,6 +223,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -322,7 +327,7 @@ To use this patch, run these commands for a successful build: STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -250,6 +252,9 @@ static void print_rsync_version(enum log +@@ -251,6 +253,9 @@ static void print_rsync_version(enum logcode f) #ifdef ICONV_OPTION iconv = ""; #endif @@ -332,7 +337,7 @@ To use this patch, run these commands for a successful build: rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -263,8 +268,8 @@ static void print_rsync_version(enum log +@@ -264,8 +269,8 @@ static void print_rsync_version(enum logcode f) (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); @@ -343,7 +348,7 @@ To use this patch, run these commands for a successful build: #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -331,6 +336,7 @@ void usage(enum logcode F) +@@ -332,6 +337,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"); @@ -351,7 +356,7 @@ To use this patch, run these commands for a successful build: rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); #ifdef SUPPORT_ACLS -@@ -470,6 +476,8 @@ static struct poptOption long_options[] +@@ -472,6 +478,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 }, @@ -360,7 +365,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1284,6 +1292,15 @@ int parse_arguments(int *argc_p, const c +@@ -1287,6 +1295,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } #endif @@ -376,7 +381,7 @@ To use this patch, run these commands for a successful build: if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); -@@ -1792,6 +1809,9 @@ void server_options(char **args, int *ar +@@ -1795,6 +1812,9 @@ void server_options(char **args, int *argc_p) if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -386,8 +391,9 @@ To use this patch, run these commands for a successful build: if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) goto oom; ---- old/rsync.c -+++ new/rsync.c +diff --git a/rsync.c b/rsync.c +--- a/rsync.c ++++ b/rsync.c @@ -32,6 +32,7 @@ extern int dry_run; extern int preserve_acls; extern int preserve_xattrs; @@ -413,7 +419,7 @@ To use this patch, run these commands for a successful build: static const char *default_charset(void) { # if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET -@@ -337,6 +348,41 @@ mode_t dest_mode(mode_t flist_mode, mode +@@ -337,6 +348,41 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, return new_mode; } @@ -422,7 +428,7 @@ To use this patch, run these commands for a successful build: +static int set_fileflags(const char *fname, uint32 fileflags) +{ + if (do_chflags(fname, fileflags) != 0) { -+ rsyserr(FERROR, errno, ++ rsyserr(FERROR_XFER, errno, + "failed to set file flags on %s", + full_fname(fname)); + return 0; @@ -455,7 +461,7 @@ To use this patch, run these commands for a successful build: int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, const char *fnamecmp, int flags) { -@@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, st +@@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, } #endif @@ -471,7 +477,7 @@ To use this patch, run these commands for a successful build: if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -527,6 +582,9 @@ void finish_transfer(const char *fname, +@@ -527,6 +582,9 @@ void finish_transfer(const char *fname, const char *fnametmp, set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); @@ -481,7 +487,7 @@ To use this patch, run these commands for a successful build: /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); -@@ -541,6 +599,9 @@ void finish_transfer(const char *fname, +@@ -541,6 +599,9 @@ void finish_transfer(const char *fname, const char *fnametmp, } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ @@ -491,9 +497,10 @@ To use this patch, run these commands for a successful build: return; } /* The file was copied, so tweak the perms of the copied file. If it ---- old/rsync.h -+++ new/rsync.h -@@ -57,6 +57,7 @@ +diff --git a/rsync.h b/rsync.h +--- a/rsync.h ++++ b/rsync.h +@@ -60,6 +60,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 (HLINKED files only) */ @@ -501,7 +508,7 @@ To use this patch, run these commands for a successful build: /* These flags are used in the live flist data. */ -@@ -419,6 +420,10 @@ enum msgcode { +@@ -451,6 +452,10 @@ typedef unsigned int size_t; #endif #endif @@ -512,7 +519,7 @@ To use this patch, run these commands for a successful build: /* 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. */ -@@ -586,6 +591,7 @@ extern int file_extra_cnt; +@@ -618,6 +623,7 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -520,17 +527,18 @@ To use this patch, run these commands for a successful build: extern int acls_ndx; extern int xattrs_ndx; -@@ -623,6 +629,7 @@ extern int xattrs_ndx; +@@ -655,6 +661,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 ---- old/rsync.yo -+++ new/rsync.yo -@@ -338,6 +338,7 @@ to the detailed description below for a + #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -338,6 +338,7 @@ to the detailed description below for a complete description. verb( -K, --keep-dirlinks treat symlinked dir on receiver as dir -H, --hard-links preserve hard links -p, --perms preserve permissions @@ -538,7 +546,7 @@ To use this patch, run these commands for a successful build: -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions -A, --acls preserve ACLs (implies -p) -@@ -539,7 +540,9 @@ specified, in which case bf(-r) is not i +@@ -540,7 +541,9 @@ specified, in which case bf(-r) is not implied. Note that bf(-a) bf(does not preserve hardlinks), because finding multiply-linked files is expensive. You must separately @@ -549,7 +557,7 @@ To use this patch, run these commands for a successful build: 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-": -@@ -900,6 +903,13 @@ super-user copies all namespaces except +@@ -909,6 +912,13 @@ super-user copies all namespaces except system.*. A normal user only copies the user.* namespace. To be able to backup and restore non-user namespaces as a normal user, see the bf(--fake-super) option. @@ -563,9 +571,10 @@ To use this patch, run these commands for a successful build: dit(bf(--chmod)) This option tells rsync to apply one or more comma-separated "chmod" strings to the permission of the files in the transfer. The resulting value is treated as though it was the permissions ---- old/syscall.c -+++ new/syscall.c -@@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mo +diff --git a/syscall.c b/syscall.c +--- a/syscall.c ++++ b/syscall.c +@@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mode) } #endif