X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951..fc5573623194fab2a331d1ffc8d284c9e25e06e7:/fileflags.diff diff --git a/fileflags.diff b/fileflags.diff index 97f30e3..39a3895 100644 --- a/fileflags.diff +++ b/fileflags.diff @@ -9,9 +9,10 @@ To use this patch, run these commands for a successful build: make diff --git a/Makefile.in b/Makefile.in +index feacb90..cd4cf2d 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -42,7 +42,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ +@@ -43,7 +43,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ @@ -20,7 +21,7 @@ diff --git a/Makefile.in b/Makefile.in # Programs we must have to run the test cases CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \ -@@ -107,7 +107,7 @@ getgroups$(EXEEXT): getgroups.o +@@ -108,7 +108,7 @@ getgroups$(EXEEXT): getgroups.o getfsdev$(EXEEXT): getfsdev.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS) @@ -30,9 +31,10 @@ diff --git a/Makefile.in b/Makefile.in $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS) diff --git a/compat.c b/compat.c +index 6e00072..ef1882d 100644 --- a/compat.c +++ b/compat.c -@@ -41,9 +41,11 @@ extern int checksum_seed; +@@ -40,9 +40,11 @@ extern int checksum_seed; extern int basis_dir_cnt; extern int prune_empty_dirs; extern int protocol_version; @@ -44,7 +46,7 @@ diff --git a/compat.c b/compat.c extern int preserve_acls; extern int preserve_xattrs; extern int need_messages_from_generator; -@@ -61,7 +63,7 @@ extern char *iconv_opt; +@@ -60,7 +62,7 @@ extern char *iconv_opt; #endif /* These index values are for the file-list's extra-attribute array. */ @@ -53,7 +55,7 @@ diff --git a/compat.c b/compat.c int receiver_symlink_times = 0; /* receiver can set the time on a symlink */ int sender_symlink_iconv = 0; /* sender should convert symlink content */ -@@ -137,6 +139,8 @@ void setup_protocol(int f_out,int f_in) +@@ -136,6 +138,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -63,29 +65,80 @@ diff --git a/compat.c b/compat.c acls_ndx = ++file_extra_cnt; if (preserve_xattrs) diff --git a/configure.in b/configure.in +index bc7d4a7..8709fa4 100644 --- a/configure.in +++ b/configure.in @@ -553,7 +553,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ - memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \ - strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ -- strerror putenv iconv_open locale_charset nl_langinfo getxattr \ -+ chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \ - extattr_get_link sigaction sigprocmask setattrlist) + strerror putenv iconv_open locale_charset nl_langinfo getxattr \ + extattr_get_link sigaction sigprocmask setattrlist getgrouplist \ +- initgroups) ++ initgroups chflags) dnl cygwin iconv.h defines iconv_open as libiconv_open + if test x"$ac_cv_func_iconv_open" != x"yes"; then +diff --git a/delete.c b/delete.c +index 33fdd0e..1c0df57 100644 +--- a/delete.c ++++ b/delete.c +@@ -25,6 +25,7 @@ + extern int am_root; + extern int make_backups; + extern int max_delete; ++extern int force_change; + extern char *backup_dir; + extern char *backup_suffix; + extern int backup_suffix_len; +@@ -98,8 +99,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags) + } + + strlcpy(p, fp->basename, remainder); ++#ifdef SUPPORT_FORCE_CHANGE ++ if (force_change) ++ make_mutable(fname, fp->mode, F_FFLAGS(fp), force_change); ++#endif + if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) +- do_chmod(fname, fp->mode | S_IWUSR); ++ do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS); + /* Save stack by recursing to ourself directly. */ + if (S_ISDIR(fp->mode)) { + if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) +@@ -140,7 +145,7 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) + } + + if (flags & DEL_NO_UID_WRITE) +- do_chmod(fbuf, mode | S_IWUSR); ++ do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS); + + if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { + int save_uid_ndx = uid_ndx; +@@ -148,6 +153,13 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) + * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */ + if (!uid_ndx) + uid_ndx = ++file_extra_cnt; ++#ifdef SUPPORT_FORCE_CHANGE ++ if (force_change) { ++ STRUCT_STAT st; ++ if (x_lstat(fbuf, &st, NULL) == 0) ++ make_mutable(fbuf, st.st_mode, st.st_flags, force_change); ++ } ++#endif + ignore_perishable = 1; + /* If DEL_RECURSE is not set, this just reports emptiness. */ + ret = delete_dir_contents(fbuf, flags); diff --git a/flist.c b/flist.c +index 09b4fc5..e1d01be 100644 --- a/flist.c +++ b/flist.c -@@ -52,6 +52,7 @@ extern int preserve_links; +@@ -51,6 +51,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; +extern int preserve_fileflags; + extern int missing_args; extern int uid_ndx; extern int gid_ndx; - extern int eol_nulls; -@@ -395,6 +396,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, +@@ -398,6 +399,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, { static time_t modtime; static mode_t mode; @@ -95,7 +148,7 @@ diff --git a/flist.c b/flist.c #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif -@@ -424,6 +428,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, +@@ -441,6 +445,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, xflags |= XMIT_SAME_MODE; else mode = file->mode; @@ -110,7 +163,7 @@ diff --git a/flist.c b/flist.c if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { -@@ -538,6 +550,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, +@@ -568,6 +580,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -121,7 +174,7 @@ diff --git a/flist.c b/flist.c if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -624,6 +640,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -656,6 +672,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, { static int64 modtime; static mode_t mode; @@ -131,9 +184,9 @@ diff --git a/flist.c b/flist.c #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif -@@ -759,6 +778,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -796,6 +815,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, - if (chmod_modes && !S_ISLNK(mode)) + if (chmod_modes && !S_ISLNK(mode) && mode) mode = tweak_mode(mode, chmod_modes); +#ifdef SUPPORT_FILEFLAGS + if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS)) @@ -142,7 +195,7 @@ diff --git a/flist.c b/flist.c if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -899,6 +922,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -936,6 +959,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } #endif file->mode = mode; @@ -153,7 +206,7 @@ diff --git a/flist.c b/flist.c if (preserve_uid) F_OWNER(file) = uid; if (preserve_gid) { -@@ -1273,6 +1300,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, +@@ -1323,6 +1350,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } #endif file->mode = st.st_mode; @@ -164,15 +217,16 @@ diff --git a/flist.c b/flist.c if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */ F_OWNER(file) = st.st_uid; if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */ -@@ -1408,6 +1439,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, +@@ -1466,6 +1497,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, #endif #ifdef SUPPORT_XATTRS if (preserve_xattrs) { + sx.st.st_mode = file->mode; - sx.xattr = NULL; if (get_xattr(fname, &sx) < 0) { io_error |= IOERR_GENERAL; + return NULL; diff --git a/generator.c b/generator.c +index 12007a1..eee42e8 100644 --- a/generator.c +++ b/generator.c @@ -42,8 +42,10 @@ extern int preserve_devices; @@ -186,44 +240,7 @@ diff --git a/generator.c b/generator.c extern int uid_ndx; extern int gid_ndx; extern int delete_mode; -@@ -166,7 +168,7 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) - } - - if (flags & DEL_NO_UID_WRITE) -- do_chmod(fbuf, mode | S_IWUSR); -+ do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS); - - if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { - int save_uid_ndx = uid_ndx; -@@ -174,6 +176,13 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) - * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */ - if (!uid_ndx) - uid_ndx = ++file_extra_cnt; -+#ifdef SUPPORT_FORCE_CHANGE -+ if (force_change) { -+ STRUCT_STAT st; -+ if (x_lstat(fbuf, &st, NULL) == 0) -+ make_mutable(fbuf, st.st_mode, st.st_flags, force_change); -+ } -+#endif - ignore_perishable = 1; - /* If DEL_RECURSE is not set, this just reports emptiness. */ - ret = delete_dir_contents(fbuf, flags); -@@ -294,8 +303,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags) - } - - strlcpy(p, fp->basename, remainder); -+#ifdef SUPPORT_FORCE_CHANGE -+ if (force_change) -+ make_mutable(fname, fp->mode, F_FFLAGS(fp), force_change); -+#endif - if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) -- do_chmod(fname, fp->mode | S_IWUSR); -+ do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS); - /* Save stack by recursing to ourself directly. */ - if (S_ISDIR(fp->mode)) { - if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) -@@ -599,6 +612,11 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) +@@ -406,6 +408,11 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0))) return 0; @@ -235,7 +252,7 @@ diff --git a/generator.c b/generator.c if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)) return 0; -@@ -664,6 +682,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre +@@ -471,6 +478,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file)) iflags |= ITEM_REPORT_GROUP; @@ -247,7 +264,7 @@ diff --git a/generator.c b/generator.c #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { if (!ACL_READY(*sxp)) -@@ -1442,6 +1465,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1258,6 +1270,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0); } @@ -258,7 +275,7 @@ diff --git a/generator.c b/generator.c if (statret != 0 && basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code); -@@ -1482,10 +1509,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1298,10 +1314,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, /* We need to ensure that the dirs in the transfer have writable * permissions during the time we are putting files within them. * This is then fixed after the transfer is done. */ @@ -275,7 +292,7 @@ diff --git a/generator.c b/generator.c rsyserr(FERROR_XFER, errno, "failed to modify permissions on %s", full_fname(fname)); -@@ -1520,6 +1552,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1336,6 +1357,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, exists); } @@ -286,7 +303,7 @@ diff --git a/generator.c b/generator.c #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_HLINK_NOT_FIRST(file) -@@ -2054,13 +2090,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) +@@ -1870,13 +1895,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) continue; fname = f_name(file, NULL); if (!(file->mode & S_IWUSR)) @@ -307,9 +324,10 @@ diff --git a/generator.c b/generator.c if (allowed_lull) maybe_send_keepalive(); diff --git a/log.c b/log.c +index a687375..83948b1 100644 --- a/log.c +++ b/log.c -@@ -660,7 +660,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op, +@@ -715,7 +715,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op, c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; @@ -319,6 +337,7 @@ diff --git a/log.c b/log.c c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; c[11] = '\0'; diff --git a/options.c b/options.c +index e7c6c61..ae3d2d0 100644 --- a/options.c +++ b/options.c @@ -53,6 +53,7 @@ int preserve_hard_links = 0; @@ -329,15 +348,15 @@ diff --git a/options.c b/options.c int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -85,6 +86,7 @@ int implied_dirs = 1; - int numeric_ids = 0; +@@ -86,6 +87,7 @@ int numeric_ids = 0; + int msgs2stderr = 0; int allow_8bit_chars = 0; int force_delete = 0; +int force_change = 0; int io_timeout = 0; - int allowed_lull = 0; int prune_empty_dirs = 0; -@@ -225,6 +227,7 @@ static void print_rsync_version(enum logcode f) + int use_qsort = 0; +@@ -566,6 +568,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -345,7 +364,7 @@ diff --git a/options.c b/options.c STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -258,6 +261,9 @@ static void print_rsync_version(enum logcode f) +@@ -599,6 +602,9 @@ static void print_rsync_version(enum logcode f) #if defined HAVE_LUTIMES && defined HAVE_UTIMES symtimes = ""; #endif @@ -355,7 +374,7 @@ diff --git a/options.c b/options.c rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -271,8 +277,8 @@ static void print_rsync_version(enum logcode f) +@@ -612,8 +618,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); @@ -366,7 +385,7 @@ diff --git a/options.c b/options.c #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -339,6 +345,9 @@ void usage(enum logcode F) +@@ -683,6 +689,9 @@ 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"); @@ -376,9 +395,9 @@ diff --git a/options.c b/options.c rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); #ifdef SUPPORT_ACLS -@@ -376,7 +385,12 @@ void usage(enum logcode F) - rprintf(F," --delete-after receiver deletes after transfer, not during\n"); - rprintf(F," --delete-excluded also delete excluded files from destination dirs\n"); +@@ -722,7 +731,12 @@ void usage(enum logcode F) + rprintf(F," --ignore-missing-args ignore missing source args without error\n"); + rprintf(F," --delete-missing-args delete missing source args from destination\n"); rprintf(F," --ignore-errors delete even if there are I/O errors\n"); - rprintf(F," --force force deletion of directories even if not empty\n"); + rprintf(F," --force-delete force deletion of directories even if not empty\n"); @@ -390,7 +409,7 @@ diff --git a/options.c b/options.c rprintf(F," --max-delete=NUM don't delete more than NUM files\n"); rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n"); rprintf(F," --min-size=SIZE don't transfer any file smaller than SIZE\n"); -@@ -481,6 +495,10 @@ static struct poptOption long_options[] = { +@@ -835,6 +849,10 @@ 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 }, @@ -401,7 +420,7 @@ diff --git a/options.c b/options.c {"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 }, -@@ -559,6 +577,14 @@ static struct poptOption long_options[] = { +@@ -917,6 +935,14 @@ static struct poptOption long_options[] = { {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 }, {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 }, {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 }, @@ -416,7 +435,7 @@ diff --git a/options.c b/options.c {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 }, {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 }, {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 }, -@@ -1868,6 +1894,9 @@ void server_options(char **args, int *argc_p) +@@ -2383,6 +2409,9 @@ void server_options(char **args, int *argc_p) if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -426,7 +445,7 @@ diff --git a/options.c b/options.c if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) goto oom; -@@ -1955,6 +1984,16 @@ void server_options(char **args, int *argc_p) +@@ -2470,6 +2499,16 @@ void server_options(char **args, int *argc_p) args[ac++] = "--delete-excluded"; if (force_delete) args[ac++] = "--force"; @@ -444,9 +463,10 @@ diff --git a/options.c b/options.c args[ac++] = "--only-write-batch=X"; if (am_root > 1) diff --git a/rsync.c b/rsync.c +index 2c026a2..3188535 100644 --- a/rsync.c +++ b/rsync.c -@@ -32,6 +32,7 @@ extern int dry_run; +@@ -31,6 +31,7 @@ extern int dry_run; extern int preserve_acls; extern int preserve_xattrs; extern int preserve_perms; @@ -454,7 +474,7 @@ diff --git a/rsync.c b/rsync.c extern int preserve_executability; extern int preserve_times; extern int am_root; -@@ -377,6 +378,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, +@@ -378,6 +379,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, return new_mode; } @@ -494,7 +514,7 @@ diff --git a/rsync.c b/rsync.c int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, const char *fnamecmp, int flags) { -@@ -430,7 +464,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -426,7 +460,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, flags |= ATTRS_SKIP_MTIME; if (!(flags & ATTRS_SKIP_MTIME) && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { @@ -503,7 +523,7 @@ diff --git a/rsync.c b/rsync.c if (ret < 0) { rsyserr(FERROR_XFER, errno, "failed to set times on %s", full_fname(fname)); -@@ -466,7 +500,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -462,7 +496,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, if (am_root >= 0) { if (do_lchown(fname, change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid, @@ -513,7 +533,7 @@ diff --git a/rsync.c b/rsync.c /* We shouldn't have attempted to change uid * or gid unless have the privilege. */ rsyserr(FERROR_XFER, errno, "%s %s failed", -@@ -498,7 +533,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -494,7 +529,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, #ifdef HAVE_CHMOD if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) { @@ -522,7 +542,7 @@ diff --git a/rsync.c b/rsync.c if (ret < 0) { rsyserr(FERROR_XFER, errno, "failed to set permissions on %s", -@@ -510,6 +545,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -506,6 +541,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, } #endif @@ -539,10 +559,10 @@ diff --git a/rsync.c b/rsync.c + } +#endif + - if (verbose > 1 && flags & ATTRS_REPORT) { + if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -573,7 +621,8 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -570,7 +618,8 @@ int finish_transfer(const char *fname, const char *fnametmp, /* Change permissions before putting the file into place. */ set_file_attrs(fnametmp, file, NULL, fnamecmp, @@ -551,8 +571,8 @@ diff --git a/rsync.c b/rsync.c + | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME)); /* move tmp file over real file */ - if (verbose > 2) -@@ -592,6 +641,10 @@ int finish_transfer(const char *fname, const char *fnametmp, + if (DEBUG_GTE(RECV, 1)) +@@ -589,6 +638,10 @@ int finish_transfer(const char *fname, const char *fnametmp, } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ @@ -564,17 +584,18 @@ diff --git a/rsync.c b/rsync.c } /* The file was copied, so tweak the perms of the copied file. If it diff --git a/rsync.h b/rsync.h +index be7cf8a..16820fd 100644 --- a/rsync.h +++ b/rsync.h -@@ -60,6 +60,7 @@ - #define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */ +@@ -61,6 +61,7 @@ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */ + #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */ +#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */ /* These flags are used in the live flist data. */ -@@ -154,6 +155,7 @@ +@@ -155,6 +156,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -582,7 +603,7 @@ diff --git a/rsync.h b/rsync.h #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -180,6 +182,7 @@ +@@ -181,6 +183,7 @@ #define ITEM_REPORT_GROUP (1<<6) #define ITEM_REPORT_ACL (1<<7) #define ITEM_REPORT_XATTR (1<<8) @@ -590,7 +611,7 @@ diff --git a/rsync.h b/rsync.h #define ITEM_BASIS_TYPE_FOLLOWS (1<<11) #define ITEM_XNAME_FOLLOWS (1<<12) #define ITEM_IS_NEW (1<<13) -@@ -462,6 +465,28 @@ typedef unsigned int size_t; +@@ -482,6 +485,28 @@ typedef unsigned int size_t; #endif #endif @@ -619,7 +640,7 @@ diff --git a/rsync.h b/rsync.h /* 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. */ -@@ -632,6 +657,7 @@ extern int file_extra_cnt; +@@ -652,6 +677,7 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -627,7 +648,7 @@ diff --git a/rsync.h b/rsync.h extern int acls_ndx; extern int xattrs_ndx; -@@ -669,6 +695,11 @@ extern int xattrs_ndx; +@@ -689,6 +715,11 @@ 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 @@ -640,9 +661,10 @@ diff --git a/rsync.h b/rsync.h #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num diff --git a/rsync.yo b/rsync.yo +index 941f7a5..7b41d5f 100644 --- a/rsync.yo +++ b/rsync.yo -@@ -342,6 +342,7 @@ to the detailed description below for a complete description. verb( +@@ -345,6 +345,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 @@ -650,9 +672,9 @@ diff --git a/rsync.yo b/rsync.yo -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions -A, --acls preserve ACLs (implies -p) -@@ -373,7 +374,10 @@ to the detailed description below for a complete description. verb( - --delete-after receiver deletes after transfer, not before - --delete-excluded also delete excluded files from dest dirs +@@ -378,7 +379,10 @@ to the detailed description below for a complete description. verb( + --ignore-missing-args ignore missing source args without error + --delete-missing-args delete missing source args from destination --ignore-errors delete even if there are I/O errors - --force force deletion of dirs even if not empty + --force-delete force deletion of dirs even if not empty @@ -662,7 +684,7 @@ diff --git a/rsync.yo b/rsync.yo --max-delete=NUM don't delete more than NUM files --max-size=SIZE don't transfer any file larger than SIZE --min-size=SIZE don't transfer any file smaller than SIZE -@@ -544,7 +548,8 @@ specified, in which case bf(-r) is not implied. +@@ -592,7 +596,8 @@ 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 @@ -672,7 +694,7 @@ diff --git a/rsync.yo b/rsync.yo 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-": -@@ -802,7 +807,7 @@ they would be using bf(--copy-links). +@@ -869,7 +874,7 @@ they would be using bf(--copy-links). Without this option, if the sending side has replaced a directory with a symlink to a directory, the receiving side will delete anything that is in the way of the new symlink, including a directory hierarchy (as long as @@ -681,7 +703,7 @@ diff --git a/rsync.yo b/rsync.yo See also bf(--keep-dirlinks) for an analogous option for the receiving side. -@@ -939,6 +944,29 @@ super-user copies all namespaces except system.*. A normal user only copies +@@ -1006,6 +1011,29 @@ 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. @@ -711,7 +733,7 @@ diff --git a/rsync.yo b/rsync.yo 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 -@@ -1201,12 +1229,13 @@ See bf(--delete) (which is implied) for more details on file-deletion. +@@ -1285,12 +1313,13 @@ display as a "*missing" entry in the bf(--list-only) output. dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files even when there are I/O errors. @@ -728,7 +750,7 @@ diff --git a/rsync.yo b/rsync.yo bf(--recursive) option was also enabled. dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM -@@ -1667,7 +1696,7 @@ with older versions of rsync, but that also turns on the output of other +@@ -1832,7 +1861,7 @@ with older versions of rsync, but that also turns on the output of other verbose messages). The "%i" escape has a cryptic output that is 11 letters long. The general @@ -737,7 +759,7 @@ diff --git a/rsync.yo b/rsync.yo type of update being done, bf(X) is replaced by the file-type, and the other letters represent attributes that may be output if they are being modified. -@@ -1723,7 +1752,7 @@ quote(itemization( +@@ -1888,7 +1917,7 @@ quote(itemization( sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). @@ -747,6 +769,7 @@ diff --git a/rsync.yo b/rsync.yo it() The bf(x) means that the extended attribute information changed. )) diff --git a/syscall.c b/syscall.c +index cfabc3e..45604b1 100644 --- a/syscall.c +++ b/syscall.c @@ -33,6 +33,7 @@ extern int dry_run; @@ -941,16 +964,17 @@ diff --git a/syscall.c b/syscall.c void trim_trailing_slashes(char *name) diff --git a/t_stub.c b/t_stub.c +index 02cfa69..9228d0c 100644 --- a/t_stub.c +++ b/t_stub.c -@@ -26,6 +26,7 @@ int module_id = -1; +@@ -25,6 +25,7 @@ int modify_window = 0; + int module_id = -1; int relative_paths = 0; - int human_readable = 0; int module_dirlen = 0; +int force_change = 0; int preserve_xattrs = 0; mode_t orig_umask = 002; - char *partial_dir; + char number_separator = ','; @@ -89,3 +90,23 @@ struct filter_list_struct daemon_filter_list; { return "tester"; @@ -976,16 +1000,17 @@ diff --git a/t_stub.c b/t_stub.c +} +#endif diff --git a/util.c b/util.c +index 0cafed6..ed26a05 100644 --- a/util.c +++ b/util.c -@@ -29,6 +29,7 @@ extern int module_id; +@@ -30,6 +30,7 @@ extern int module_id; extern int modify_window; extern int relative_paths; - extern int human_readable; -+extern int force_change; extern int preserve_xattrs; ++extern int force_change; extern char *module_dir; extern unsigned int module_dirlen; + extern mode_t orig_umask; @@ -123,7 +124,7 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } @@ -1047,9 +1072,10 @@ diff --git a/util.c b/util.c } diff --git a/xattrs.c b/xattrs.c +index 2d0e050..5d04599 100644 --- a/xattrs.c +++ b/xattrs.c -@@ -281,6 +281,10 @@ int get_xattr(const char *fname, stat_x *sxp) +@@ -282,6 +282,10 @@ int get_xattr(const char *fname, stat_x *sxp) { sxp->xattr = new(item_list); *sxp->xattr = empty_xattr; @@ -1060,7 +1086,7 @@ diff --git a/xattrs.c b/xattrs.c if (rsync_xal_get(fname, sxp->xattr) < 0) { free_xattr(sxp); return -1; -@@ -864,6 +868,11 @@ int set_xattr(const char *fname, const struct file_struct *file, +@@ -865,6 +869,11 @@ int set_xattr(const char *fname, const struct file_struct *file, return -1; } @@ -1072,7 +1098,7 @@ diff --git a/xattrs.c b/xattrs.c ndx = F_XATTR(file); return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp); } -@@ -980,7 +989,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode) +@@ -981,7 +990,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode) mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS) | (S_ISDIR(fst.st_mode) ? 0700 : 0600); if (fst.st_mode != mode)