X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ff318e90bdd927361ae3b396d7fc311a901a7959..5bafda3026f713e2e72b95a029bf12839d04e3cb:/flags.diff diff --git a/flags.diff b/flags.diff index 13e7e4b..0f16462 100644 --- a/flags.diff +++ b/flags.diff @@ -1,11 +1,18 @@ This patch provides --flags, which preserves the st_flags field. -Modified from a patch that was written by Rolf Grossmann: +Modified from a patch that was written by Rolf Grossmann. - http://www.progtech.net/rsync.flags-patch +To use this patch, run these commands for a successful build: + + patch -p1 mode; @@ -47,7 +54,7 @@ Modified from a patch that was written by Rolf Grossmann: if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { -@@ -412,6 +422,10 @@ static void send_file_entry(struct file_ +@@ -418,6 +428,10 @@ static void send_file_entry(struct file_ write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -58,7 +65,7 @@ Modified from a patch that was written by Rolf Grossmann: if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -479,6 +493,9 @@ static struct file_struct *receive_file_ +@@ -485,6 +499,9 @@ static struct file_struct *receive_file_ { static time_t modtime; static mode_t mode; @@ -68,7 +75,7 @@ Modified from a patch that was written by Rolf Grossmann: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -552,9 +569,12 @@ static struct file_struct *receive_file_ +@@ -558,9 +575,12 @@ static struct file_struct *receive_file_ modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -82,7 +89,7 @@ Modified from a patch that was written by Rolf Grossmann: if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -605,6 +625,9 @@ static struct file_struct *receive_file_ +@@ -611,6 +631,9 @@ static struct file_struct *receive_file_ file->modtime = modtime; file->length = file_length; file->mode = mode; @@ -92,7 +99,7 @@ Modified from a patch that was written by Rolf Grossmann: file->uid = uid; file->gid = gid; -@@ -855,6 +878,9 @@ struct file_struct *make_file(char *fnam +@@ -871,6 +894,9 @@ struct file_struct *make_file(char *fnam file->modtime = st.st_mtime; file->length = st.st_size; file->mode = st.st_mode; @@ -104,36 +111,109 @@ Modified from a patch that was written by Rolf Grossmann: --- old/generator.c +++ new/generator.c -@@ -123,6 +123,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); -+#endif - if (make_backups && (backup_dir || !is_backup_file(fname))) - ok = make_backup(fname); - else -@@ -147,10 +150,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)) { +@@ -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; + +#ifdef SUPPORT_FLAGS -+ make_mutable(fname); ++#define FILEFLAGS(ff) ff ++#else ++#define FILEFLAGS(ff) 0 +#endif - ok = make_backup(fname); -- else -+ } else { ++ + /* 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 { + /* Forward declaration for delete_item(). */ + static enum delret delete_dir_contents(char *fname, int flags); + +- + 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) + * 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 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) + { + 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); ++ make_mutable(fbuf, mode, fileflags); +#endif - ok = do_rmdir(fname) == 0; -+ } - if (ok) { - if (!(flags & DEL_TERSE)) - log_delete(fname, mode); + 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 + 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; + } + +@@ -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 +- 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, + * 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, "directory", del_opts) != 0) ++ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "directory", del_opts) != 0) + return; + statret = -1; + } +@@ -1197,7 +1205,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, "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, +@@ -1268,7 +1276,7 @@ static void recv_generator(char *fname, + goto return_with_success; + return; + } +- 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, +@@ -1354,7 +1362,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, "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; --- old/options.c +++ new/options.c @@ -48,6 +48,7 @@ int copy_links = 0; @@ -144,7 +224,7 @@ Modified from a patch that was written by Rolf Grossmann: int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -200,6 +201,7 @@ static void print_rsync_version(enum log +@@ -201,6 +202,7 @@ static void print_rsync_version(enum log char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; @@ -152,7 +232,7 @@ Modified from a patch that was written by Rolf Grossmann: STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR -@@ -222,6 +224,10 @@ static void print_rsync_version(enum log +@@ -223,6 +225,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif @@ -163,7 +243,7 @@ Modified from a patch that was written by Rolf Grossmann: 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"); -@@ -234,9 +240,9 @@ static void print_rsync_version(enum log +@@ -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. */ @@ -175,15 +255,15 @@ Modified from a patch that was written by Rolf Grossmann: (int) (sizeof dumstat->st_ino * 8), (int) (sizeof (int64) * 8)); #ifdef MAINTAINER_MODE -@@ -302,6 +308,7 @@ void usage(enum logcode F) +@@ -304,6 +310,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," -E, --executability preserve the file's executability\n"); - rprintf(F," --chmod=CHMOD change destination permissions\n"); + rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); rprintf(F," -o, --owner preserve owner (super-user only)\n"); -@@ -420,6 +427,8 @@ static struct poptOption long_options[] +@@ -425,6 +432,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 }, @@ -192,7 +272,7 @@ Modified from a patch that was written by Rolf Grossmann: {"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 }, -@@ -1122,6 +1131,15 @@ int parse_arguments(int *argc, const cha +@@ -1130,6 +1139,15 @@ int parse_arguments(int *argc, const cha } #endif @@ -208,7 +288,7 @@ Modified from a patch that was written by Rolf Grossmann: if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); -@@ -1579,6 +1597,9 @@ void server_options(char **args,int *arg +@@ -1584,6 +1602,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -220,7 +300,12 @@ Modified from a patch that was written by Rolf Grossmann: goto oom; --- old/rsync.c +++ new/rsync.c -@@ -33,6 +33,7 @@ +@@ -30,9 +30,12 @@ + #include + #endif + ++#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) ++ extern int verbose; extern int dry_run; extern int preserve_perms; @@ -228,19 +313,57 @@ Modified from a patch that was written by Rolf Grossmann: extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; -@@ -216,6 +217,19 @@ int set_file_attrs(char *fname, struct f +@@ -123,6 +126,41 @@ mode_t dest_mode(mode_t flist_mode, mode + return new_mode; + } + ++#ifdef SUPPORT_FLAGS ++/* Set a file's st_flags. */ ++static int set_fileflags(const char *fname, uint32 fileflags) ++{ ++ if (do_chflags(fname, fileflags) != 0) { ++ rsyserr(FERROR, errno, ++ "failed to set file flags on %s", ++ full_fname(fname)); ++ return 0; ++ } ++ ++ return 1; ++} ++ ++/* 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)) ++ return; ++ ++ if (fileflags & NOCHANGE_FLAGS) ++ set_fileflags(fname, fileflags & ~NOCHANGE_FLAGS); ++} ++ ++/* Undo a prior make_mutable() call. */ ++void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags) ++{ ++ if (!preserve_flags && S_ISLNK(mode)) ++ return; ++ ++ if (fileflags & NOCHANGE_FLAGS) ++ set_fileflags(fname, fileflags); ++} ++#endif ++ + 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 } #endif +#ifdef SUPPORT_FLAGS + if (preserve_flags && !S_ISLNK(st->st_mode) + && st->st_flags != file->fileflags) { -+ if (do_chflags(fname, file->fileflags) != 0) { -+ rsyserr(FERROR, errno, -+ "failed to set file flags on %s", -+ full_fname(fname)); ++ if (!set_fileflags(fname, file->fileflags)) + return 0; -+ } + updated = 1; + } +#endif @@ -248,39 +371,26 @@ Modified from a patch that was written by Rolf Grossmann: if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -249,6 +263,10 @@ void finish_transfer(char *fname, char * - { - int ret; +@@ -268,6 +315,9 @@ void finish_transfer(char *fname, char * + set_file_attrs(fnametmp, file, NULL, + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); +#ifdef SUPPORT_FLAGS -+ make_mutable(fname); /* XXX */ ++ make_mutable(fnametmp, file->mode, file->fileflags); +#endif -+ - if (inplace) { - if (verbose > 2) - rprintf(FINFO, "finishing %s\n", fname); -@@ -302,3 +320,21 @@ const char *who_am_i(void) - return am_server ? "server" : "client"; - return am_sender ? "sender" : am_generator ? "generator" : "receiver"; - } -+ + /* 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 * + } + if (ret == 0) { + /* The file was moved into place (not copied), so it's done. */ +#ifdef SUPPORT_FLAGS -+/* remove immutable flags from an object, so it can be altered/removed. */ -+void make_mutable(char *fname) -+{ -+#define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | UF_NOUNLINK | SF_IMMUTABLE | SF_APPEND | SF_NOUNLINK) -+ STRUCT_STAT stb; -+ -+ if (dry_run) -+ return; -+ -+ /* XXX get rid of this extra stat() */ -+ if (do_lstat(fname, &stb) < 0) -+ return; -+ if (stb.st_flags & NOCHANGEBITS) -+ do_chflags(fname, stb.st_flags & ~NOCHANGEBITS); -+} ++ undo_make_mutable(fname, file->mode, file->fileflags); +#endif + return; + } + /* The file was copied, so tweak the perms of the copied file. If it --- old/rsync.h +++ new/rsync.h @@ -54,6 +54,7 @@ @@ -291,7 +401,7 @@ Modified from a patch that was written by Rolf Grossmann: /* These flags are used in the live flist data. */ -@@ -338,6 +339,10 @@ enum msgcode { +@@ -345,6 +346,10 @@ enum msgcode { #define schar char #endif @@ -302,7 +412,7 @@ Modified from a patch that was written by Rolf Grossmann: /* 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. */ -@@ -520,6 +525,9 @@ struct file_struct { +@@ -528,6 +533,9 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -314,15 +424,15 @@ Modified from a patch that was written by Rolf Grossmann: mode_t mode; --- old/rsync.yo +++ new/rsync.yo -@@ -322,6 +322,7 @@ to the detailed description below for a +@@ -321,6 +321,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 - -E, --executability preserve executability - --chmod=CHMOD change destination permissions + --flags preserve file flags + -E, --executability preserve executability + --chmod=CHMOD affect file and/or directory permissions -o, --owner preserve owner (super-user only) - -g, --group preserve group - --devices preserve device files (super-user only) -@@ -502,7 +503,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 @@ -333,12 +443,12 @@ Modified from a patch that was written by Rolf Grossmann: 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-": -@@ -797,6 +800,13 @@ quote(itemize( +@@ -805,6 +808,13 @@ quote(itemization( If bf(--perms) is enabled, this option is ignored. +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 chflags(2) ++to be the same as the source file, if your OS supports the bf(chflags)(2) +system call. In any case, an attempt is made to remove flags that would +prevent a file to be altered. Some flags can only be altered by the +super-user and can only be unset below a certain secure-level (usually @@ -349,7 +459,7 @@ Modified from a patch that was written by Rolf Grossmann: 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