X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0461b869d0800656bf41722c1a68800e728e45e5..524e5ed55a8e931823c64098aab6937547fe08cb:/flags.diff diff --git a/flags.diff b/flags.diff index cea538a..348c5e9 100644 --- a/flags.diff +++ b/flags.diff @@ -8,9 +8,22 @@ 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 +@@ -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 -@@ -527,7 +527,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 \ @@ -21,16 +34,16 @@ To use this patch, run these commands for a successful build: 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; -+extern int preserve_flags; ++extern int preserve_fileflags; extern int preserve_uid; extern int preserve_gid; extern int relative_paths; -@@ -303,6 +304,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 @@ -39,7 +52,7 @@ To use this patch, run these commands for a successful build: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -333,6 +337,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; @@ -52,18 +65,18 @@ To use this patch, run these commands for a successful build: if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { -@@ -416,6 +426,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)); +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !(flags & XMIT_SAME_FLAGS)) ++ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif if (preserve_uid && !(flags & XMIT_SAME_UID)) { - if (!numeric_ids) - add_uid(uid); -@@ -483,6 +497,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; @@ -73,7 +86,7 @@ To use this patch, run these commands for a successful build: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -556,9 +573,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)); @@ -81,37 +94,39 @@ To use this patch, run these commands for a successful build: if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !(flags & XMIT_SAME_FLAGS)) ++ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) + 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); -@@ -609,6 +629,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; - -@@ -862,6 +885,9 @@ struct file_struct *make_file(char *fnam - 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 -@@ -109,6 +109,12 @@ static int is_backup_file(char *fn) - return k > 0 && strcmp(fn+k, backup_suffix) == 0; - } +@@ -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 @@ -119,99 +134,141 @@ To use this patch, run these commands for a successful build: +#define FILEFLAGS(ff) 0 +#endif + + /* 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 */ +@@ -122,7 +128,6 @@ enum delret { + /* Forward declaration for delete_item(). */ + static enum delret delete_dir_contents(char *fname, int flags); - /* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if - * force_delete is set, this will delete recursively. -@@ -116,7 +122,7 @@ static int is_backup_file(char *fn) - * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's +- + static int is_backup_file(char *fn) + { + int k = strlen(fn) - backup_suffix_len; +@@ -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.) */ --static int delete_item(char *fname, int mode, int flags) -+static int delete_item(char *fname, int mode, uint32 fileflags, int flags) +-static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) ++static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags) { - struct file_list *dirlist; - int j, dlen, zap_dir, ok; -@@ -127,6 +133,9 @@ static int delete_item(char *fname, int - if (!S_ISDIR(mode)) { - if (max_delete && ++deletion_count > max_delete) - return 0; -+#ifdef SUPPORT_FLAGS -+ make_mutable(fname, mode, fileflags); -+#endif - if (make_backups && (backup_dir || !is_backup_file(fname))) - ok = make_backup(fname); - else -@@ -151,10 +160,17 @@ static int delete_item(char *fname, int - ok = 0; - errno = ENOTEMPTY; - } else if (make_backups && !backup_dir && !is_backup_file(fname) -- && !(flags & DEL_FORCE_RECURSE)) -+ && !(flags & DEL_FORCE_RECURSE)) { -+#ifdef SUPPORT_FLAGS -+ make_mutable(fname, mode, fileflags); -+#endif - ok = make_backup(fname); -- else -+ } else { + enum delret ret; + char *what; + int ok; + + if (verbose > 2) { +- rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", +- fbuf, mode, flags); ++ rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n", ++ fbuf, mode, fileflags, flags); + } + +#ifdef SUPPORT_FLAGS -+ make_mutable(fname, mode, fileflags); ++ make_mutable(fbuf, mode, fileflags); +#endif - ok = do_rmdir(fname) == 0; -+ } - if (ok) { - if (!(flags & DEL_TERSE)) - log_delete(fname, mode); -@@ -189,7 +205,7 @@ static int delete_item(char *fname, int - continue; - - strlcpy(p, fp->basename, remainder); -- delete_item(fname, fp->mode, flags & ~DEL_TERSE); -+ delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), flags & ~DEL_TERSE); + if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { + ignore_perishable = 1; + /* If DEL_RECURSE is not set, this just reports emptiness. */ +@@ -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; +- if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) ++ if (delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags) != DR_SUCCESS) + ret = DR_NOT_EMPTY; } - flist_free(dirlist); - -@@ -279,7 +295,7 @@ static void delete_in_dir(struct file_li - continue; - if (flist_find(flist, fp) < 0) { - f_name(fp, delbuf); -- delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE); -+ delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), DEL_FORCE_RECURSE); + +@@ -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); } } -@@ -977,7 +993,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)) { -- if (delete_item(fname, st.st_mode, del_opts) < 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) +- if (delete_item(fname, st.st_mode, "directory", del_opts) != 0) ++ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "directory", del_opts) != 0) return; statret = -1; } -@@ -1071,7 +1087,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. */ -- if (delete_item(fname, st.st_mode, del_opts) < 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) +- if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0) ++ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "symlink", del_opts) != 0) return; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1134,7 +1150,7 @@ static void recv_generator(char *fname, +@@ -1352,7 +1361,7 @@ static void recv_generator(char *fname, goto return_with_success; return; } -- if (delete_item(fname, st.st_mode, del_opts) < 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) +- if (delete_item(fname, st.st_mode, t, del_opts) != 0) ++ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), t, del_opts) != 0) return; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1220,7 +1236,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)) { -- if (delete_item(fname, st.st_mode, del_opts) != 0) -+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) != 0) +- if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0) ++ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "regular file", del_opts) != 0) return; statret = -1; stat_errno = ENOENT; @@ -221,7 +278,7 @@ To use this patch, run these commands for a successful build: int preserve_links = 0; int preserve_hard_links = 0; int preserve_perms = 0; -+int preserve_flags = 0; ++int preserve_fileflags = 0; int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; @@ -229,7 +286,7 @@ To use this patch, run these commands for a successful build: char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; -+ char const *flags = "no "; ++ char const *fileflags = "no "; STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR @@ -238,47 +295,46 @@ To use this patch, run these commands for a successful build: #endif +#ifdef SUPPORT_FLAGS -+ flags = ""; ++ fileflags = ""; +#endif + rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -235,9 +241,9 @@ static void print_rsync_version(enum log - /* Note that this field may not have type ino_t. It depends - * on the complicated interaction between largefile feature - * macros. */ -- rprintf(f, " %sinplace, %sIPv6, " -+ rprintf(f, " %sinplace, %sIPv6, %sfile flags, " - "%d-bit system inums, %d-bit internal inums\n", -- have_inplace, ipv6, -+ have_inplace, ipv6, flags, - (int) (sizeof dumstat->st_ino * 8), - (int) (sizeof (int64) * 8)); +@@ -233,8 +239,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\n", +- have_inplace); ++ rprintf(f, " %sappend, %sfile-flags\n", ++ have_inplace, fileflags); + #ifdef MAINTAINER_MODE -@@ -304,6 +310,7 @@ void usage(enum logcode F) + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); +@@ -300,6 +306,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"); -+ rprintf(F," --flags preserve file flags\n"); ++ rprintf(F," --fileflags preserve file-flags\n"); rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); rprintf(F," -o, --owner preserve owner (super-user only)\n"); -@@ -424,6 +431,8 @@ static struct poptOption long_options[] +@@ -421,6 +428,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 }, -+ {"flags", 0, POPT_ARG_VAL, &preserve_flags, 1, 0, 0 }, -+ {"no-flags", 0, POPT_ARG_VAL, &preserve_flags, 0, 0, 0 }, ++ {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 }, ++ {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 }, {"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 }, -@@ -1128,6 +1137,15 @@ int parse_arguments(int *argc, const cha +@@ -1132,6 +1141,15 @@ int parse_arguments(int *argc, const cha } #endif +#ifndef SUPPORT_FLAGS -+ if (preserve_flags) { ++ if (preserve_fileflags) { + snprintf(err_buf, sizeof err_buf, + "file flags are not supported on this %s\n", + am_server ? "server" : "client"); @@ -289,11 +345,11 @@ 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"); -@@ -1581,6 +1599,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"; -+ if (preserve_flags) ++ if (preserve_fileflags) + args[ac++] = "--flags"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { @@ -310,11 +366,11 @@ To use this patch, run these commands for a successful build: extern int verbose; extern int dry_run; extern int preserve_perms; -+extern int preserve_flags; ++extern int preserve_fileflags; 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; } @@ -335,7 +391,7 @@ To use this patch, run these commands for a successful build: +/* Remove immutable flags from an object, so it can be altered/removed. */ +void make_mutable(char *fname, mode_t mode, uint32 fileflags) +{ -+ if (!preserve_flags && S_ISLNK(mode)) ++ if (!preserve_fileflags && S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) @@ -345,7 +401,7 @@ To use this patch, run these commands for a successful build: +/* Undo a prior make_mutable() call. */ +void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags) +{ -+ if (!preserve_flags && S_ISLNK(mode)) ++ if (!preserve_fileflags && S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) @@ -356,12 +412,12 @@ To use this patch, run these commands for a successful build: 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 +#ifdef SUPPORT_FLAGS -+ if (preserve_flags && !S_ISLNK(st->st_mode) ++ if (preserve_fileflags && !S_ISLNK(st->st_mode) + && st->st_flags != file->fileflags) { + if (!set_fileflags(fname, file->fileflags)) + return 0; @@ -372,7 +428,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); -@@ -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); @@ -382,7 +438,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); -@@ -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. */ @@ -394,16 +450,16 @@ To use this patch, run these commands for a successful build: /* 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 @@ -413,16 +469,22 @@ 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. */ -@@ -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 @@ -433,7 +495,7 @@ To use this patch, run these commands for a successful build: -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions -o, --owner preserve owner (super-user only) -@@ -509,7 +510,9 @@ specified, in which case bf(-r) is not i +@@ -510,7 +511,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 @@ -444,7 +506,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-": -@@ -804,6 +807,13 @@ quote(itemization( +@@ -805,6 +808,13 @@ quote(itemization( If bf(--perms) is enabled, this option is ignored. @@ -460,7 +522,7 @@ To use this patch, run these commands for a successful build: 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 +@@ -153,6 +153,15 @@ int do_chmod(const char *path, mode_t mo } #endif