X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6e6f514c7a8771c046a3db812413382a9e70ac64..686ce3aa4f643829bdde0d9908228adb6b541f6d:/flags.diff diff --git a/flags.diff b/flags.diff index 60b48c9..3d4cb4d 100644 --- a/flags.diff +++ b/flags.diff @@ -5,7 +5,7 @@ Modified from a patch that was written by Rolf Grossmann: --- old/configure.in +++ new/configure.in -@@ -494,7 +494,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd +@@ -527,7 +527,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 \ @@ -16,7 +16,7 @@ Modified from a patch that was written by Rolf Grossmann: AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c +++ new/flist.c -@@ -48,6 +48,7 @@ extern int preserve_links; +@@ -44,6 +44,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; @@ -24,7 +24,7 @@ Modified from a patch that was written by Rolf Grossmann: extern int preserve_uid; extern int preserve_gid; extern int relative_paths; -@@ -312,6 +313,9 @@ static void send_file_entry(struct file_ +@@ -303,6 +304,9 @@ static void send_file_entry(struct file_ unsigned short flags; static time_t modtime; static mode_t mode; @@ -34,7 +34,7 @@ Modified from a patch that was written by Rolf Grossmann: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -344,6 +348,12 @@ static void send_file_entry(struct file_ +@@ -333,6 +337,12 @@ static void send_file_entry(struct file_ flags |= XMIT_SAME_MODE; else mode = file->mode; @@ -47,7 +47,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) { -@@ -427,6 +437,10 @@ static void send_file_entry(struct file_ +@@ -416,6 +426,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 +58,7 @@ Modified from a patch that was written by Rolf Grossmann: if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -496,6 +510,9 @@ static struct file_struct *receive_file_ +@@ -483,6 +497,9 @@ static struct file_struct *receive_file_ { static time_t modtime; static mode_t mode; @@ -68,7 +68,7 @@ Modified from a patch that was written by Rolf Grossmann: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -569,9 +586,12 @@ static struct file_struct *receive_file_ +@@ -556,9 +573,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 +82,7 @@ Modified from a patch that was written by Rolf Grossmann: if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -622,6 +642,9 @@ static struct file_struct *receive_file_ +@@ -609,6 +629,9 @@ static struct file_struct *receive_file_ file->modtime = modtime; file->length = file_length; file->mode = mode; @@ -92,7 +92,7 @@ Modified from a patch that was written by Rolf Grossmann: file->uid = uid; file->gid = gid; -@@ -874,6 +897,9 @@ struct file_struct *make_file(char *fnam +@@ -862,6 +885,9 @@ struct file_struct *make_file(char *fnam file->modtime = st.st_mtime; file->length = st.st_size; file->mode = st.st_mode; @@ -104,39 +104,115 @@ Modified from a patch that was written by Rolf Grossmann: --- old/generator.c +++ new/generator.c -@@ -126,6 +126,9 @@ static int delete_item(char *fname, int +@@ -99,6 +99,12 @@ static int deletion_count = 0; /* used t + #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ + #define DEL_TERSE (1<<3) + ++#ifdef SUPPORT_FLAGS ++#define FILEFLAGS(ff) ff ++#else ++#define FILEFLAGS(ff) 0 ++#endif ++ + + static int is_backup_file(char *fn) + { +@@ -113,7 +119,7 @@ static int is_backup_file(char *fn) + * Note that fname 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) + { + struct file_list *dirlist; + int j, dlen, zap_dir, ok; +@@ -124,6 +130,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); ++ make_mutable(fname, mode, fileflags); +#endif if (make_backups && (backup_dir || !is_backup_file(fname))) ok = make_backup(fname); else -@@ -150,10 +153,17 @@ static int delete_item(char *fname, int +@@ -148,10 +157,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); ++ make_mutable(fname, mode, fileflags); +#endif ok = make_backup(fname); - else + } else { +#ifdef SUPPORT_FLAGS -+ make_mutable(fname); ++ make_mutable(fname, mode, fileflags); +#endif ok = do_rmdir(fname) == 0; + } if (ok) { if (!(flags & DEL_TERSE)) log_delete(fname, mode); +@@ -186,7 +202,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); + } + flist_free(dirlist); + +@@ -276,7 +292,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); + } + } + +@@ -905,7 +921,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) + return; + statret = -1; + } +@@ -996,7 +1012,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) + return; + if (!S_ISLNK(st.st_mode)) + statret = -1; +@@ -1060,7 +1076,7 @@ static void recv_generator(char *fname, + || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS) + || st.st_rdev != file->u.rdev) { + if (statret == 0 +- && delete_item(fname, st.st_mode, del_opts) < 0) ++ && delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) + return; + if (preserve_hard_links && file->link_u.links + && hard_link_check(file, ndx, fname, -1, &st, +@@ -1145,7 +1161,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) + return; + statret = -1; + stat_errno = ENOENT; --- old/options.c +++ new/options.c -@@ -46,6 +46,7 @@ int copy_links = 0; +@@ -48,6 +48,7 @@ int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_perms = 0; @@ -144,7 +220,7 @@ Modified from a patch that was written by Rolf Grossmann: int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -196,6 +197,7 @@ static void print_rsync_version(enum log +@@ -200,6 +201,7 @@ static void print_rsync_version(enum log char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; @@ -152,7 +228,7 @@ Modified from a patch that was written by Rolf Grossmann: STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR -@@ -218,6 +220,10 @@ static void print_rsync_version(enum log +@@ -222,6 +224,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif @@ -163,7 +239,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"); -@@ -230,9 +236,9 @@ static void print_rsync_version(enum log +@@ -234,9 +240,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 +251,15 @@ Modified from a patch that was written by Rolf Grossmann: (int) (sizeof dumstat->st_ino * 8), (int) (sizeof (int64) * 8)); #ifdef MAINTAINER_MODE -@@ -294,6 +300,7 @@ void usage(enum logcode F) +@@ -302,6 +308,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"); -@@ -409,6 +416,8 @@ static struct poptOption long_options[] +@@ -420,6 +427,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 +268,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 }, -@@ -1107,6 +1116,15 @@ int parse_arguments(int *argc, const cha +@@ -1124,6 +1133,15 @@ int parse_arguments(int *argc, const cha } #endif @@ -208,7 +284,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"); -@@ -1562,6 +1580,9 @@ void server_options(char **args,int *arg +@@ -1577,6 +1595,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -220,73 +296,97 @@ Modified from a patch that was written by Rolf Grossmann: goto oom; --- old/rsync.c +++ new/rsync.c -@@ -34,6 +34,7 @@ extern int verbose; +@@ -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 daemon_log_format_has_i; extern int preserve_perms; +extern int preserve_flags; extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; -@@ -217,6 +218,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 + if (verbose > 1 && flags & ATTRS_REPORT) { - enum logcode code = daemon_log_format_has_i || dry_run - ? FCLIENT : FINFO; -@@ -252,6 +266,10 @@ void finish_transfer(char *fname, char * - { - int ret; + if (updated) + rprintf(FCLIENT, "%s\n", fname); +@@ -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(fname, file->mode, file->fileflags); +#endif -+ - if (inplace) { - if (verbose > 2) - rprintf(FINFO, "finishing %s\n", fname); -@@ -305,3 +323,27 @@ 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; -+ int failed; -+ -+ if (dry_run) -+ return; -+ -+ /* XXX get rid of this extra stat() */ -+#ifdef SUPPORT_LINKS -+ failed = do_lstat(fname, &stb); -+#else -+ failed = do_stat(fname, &stb); -+#endif -+ if (failed) -+ 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 @@ @@ -297,7 +397,7 @@ Modified from a patch that was written by Rolf Grossmann: /* These flags are used in the live flist data. */ -@@ -337,6 +338,10 @@ enum msgcode { +@@ -344,6 +345,10 @@ enum msgcode { #define schar char #endif @@ -308,7 +408,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. */ -@@ -519,6 +524,9 @@ struct file_struct { +@@ -527,6 +532,9 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -320,15 +420,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 +@@ -320,6 +320,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) -@@ -498,7 +499,9 @@ specified, in which case bf(-r) is not i +@@ -501,7 +502,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 @@ -339,12 +439,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-": -@@ -793,6 +796,13 @@ quote(itemize( +@@ -796,6 +799,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 @@ -355,7 +455,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 -@@ -155,6 +155,15 @@ int do_chmod(const char *path, mode_t mo +@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo } #endif