X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..5214a41bbae94607b196b199b483710e1babf292:/fileflags.diff diff --git a/fileflags.diff b/fileflags.diff index 39a3895..5668f56 100644 --- a/fileflags.diff +++ b/fileflags.diff @@ -8,8 +8,8 @@ To use this patch, run these commands for a successful build: ./configure make +based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d diff --git a/Makefile.in b/Makefile.in -index feacb90..cd4cf2d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ @@ -31,7 +31,6 @@ index feacb90..cd4cf2d 100644 $(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 @@ -40,9 +40,11 @@ extern int checksum_seed; @@ -65,20 +64,18 @@ index 6e00072..ef1882d 100644 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 \ +@@ -583,7 +583,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ - strerror putenv iconv_open locale_charset nl_langinfo getxattr \ + seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \ extattr_get_link sigaction sigprocmask setattrlist getgrouplist \ -- initgroups) -+ initgroups chflags) +- initgroups utimensat) ++ initgroups utimensat 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 @@ @@ -127,10 +124,9 @@ index 33fdd0e..1c0df57 100644 /* 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 -@@ -51,6 +51,7 @@ extern int preserve_links; +@@ -50,6 +50,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; @@ -138,7 +134,7 @@ index 09b4fc5..e1d01be 100644 extern int missing_args; extern int uid_ndx; extern int gid_ndx; -@@ -398,6 +399,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, +@@ -406,6 +407,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, { static time_t modtime; static mode_t mode; @@ -148,7 +144,7 @@ index 09b4fc5..e1d01be 100644 #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif -@@ -441,6 +445,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, +@@ -449,6 +453,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, xflags |= XMIT_SAME_MODE; else mode = file->mode; @@ -161,10 +157,10 @@ index 09b4fc5..e1d01be 100644 + } +#endif - if ((preserve_devices && IS_DEVICE(mode)) - || (preserve_specials && IS_SPECIAL(mode))) { -@@ -568,6 +580,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, - } + if (preserve_devices && IS_DEVICE(mode)) { + if (protocol_version < 28) { +@@ -590,6 +602,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, + write_varint(f, F_MOD_NSEC(file)); if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FILEFLAGS @@ -174,7 +170,7 @@ index 09b4fc5..e1d01be 100644 if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -656,6 +672,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -677,6 +693,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x { static int64 modtime; static mode_t mode; @@ -184,7 +180,7 @@ index 09b4fc5..e1d01be 100644 #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif -@@ -796,6 +815,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -822,6 +841,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x if (chmod_modes && !S_ISLNK(mode) && mode) mode = tweak_mode(mode, chmod_modes); @@ -195,7 +191,7 @@ index 09b4fc5..e1d01be 100644 if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -936,6 +959,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -973,6 +996,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x } #endif file->mode = mode; @@ -206,7 +202,7 @@ index 09b4fc5..e1d01be 100644 if (preserve_uid) F_OWNER(file) = uid; if (preserve_gid) { -@@ -1323,6 +1350,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, +@@ -1370,6 +1397,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } #endif file->mode = st.st_mode; @@ -217,16 +213,7 @@ index 09b4fc5..e1d01be 100644 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 */ -@@ -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; - 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; @@ -264,7 +251,7 @@ index 12007a1..eee42e8 100644 #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { if (!ACL_READY(*sxp)) -@@ -1258,6 +1270,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1265,6 +1277,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); } @@ -275,7 +262,7 @@ index 12007a1..eee42e8 100644 if (statret != 0 && basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code); -@@ -1298,10 +1314,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1305,10 +1321,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. */ @@ -292,7 +279,7 @@ index 12007a1..eee42e8 100644 rsyserr(FERROR_XFER, errno, "failed to modify permissions on %s", full_fname(fname)); -@@ -1336,6 +1357,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1343,6 +1364,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); } @@ -303,18 +290,18 @@ index 12007a1..eee42e8 100644 #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_HLINK_NOT_FIRST(file) -@@ -1870,13 +1895,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) +@@ -1920,13 +1945,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) continue; fname = f_name(file, NULL); - if (!(file->mode & S_IWUSR)) + if (fix_dir_perms) - do_chmod(fname, file->mode); + do_chmod(fname, file->mode, 0); if (need_retouch_dir_times) { STRUCT_STAT st; if (link_stat(fname, &st, 0) == 0 && cmp_time(st.st_mtime, file->modtime) != 0) -- set_modtime(fname, file->modtime, file->mode); -+ set_modtime(fname, file->modtime, file->mode, 0); +- set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode); ++ set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode, 0); } +#ifdef SUPPORT_FORCE_CHANGE + if (force_change && F_FFLAGS(file) & force_change) @@ -324,10 +311,9 @@ index 12007a1..eee42e8 100644 if (allowed_lull) maybe_send_keepalive(); diff --git a/log.c b/log.c -index a687375..83948b1 100644 --- a/log.c +++ b/log.c -@@ -715,7 +715,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op, +@@ -733,7 +733,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'; @@ -337,7 +323,6 @@ index a687375..83948b1 100644 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; @@ -356,7 +341,7 @@ index e7c6c61..ae3d2d0 100644 int io_timeout = 0; int prune_empty_dirs = 0; int use_qsort = 0; -@@ -566,6 +568,7 @@ static void print_rsync_version(enum logcode f) +@@ -567,6 +569,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -364,8 +349,8 @@ index e7c6c61..ae3d2d0 100644 STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -599,6 +602,9 @@ static void print_rsync_version(enum logcode f) - #if defined HAVE_LUTIMES && defined HAVE_UTIMES +@@ -600,6 +603,9 @@ static void print_rsync_version(enum logcode f) + #ifdef CAN_SET_SYMLINK_TIMES symtimes = ""; #endif +#ifdef SUPPORT_FILEFLAGS @@ -374,7 +359,7 @@ index e7c6c61..ae3d2d0 100644 rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -612,8 +618,8 @@ static void print_rsync_version(enum logcode f) +@@ -613,8 +619,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); @@ -385,7 +370,7 @@ index e7c6c61..ae3d2d0 100644 #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -683,6 +689,9 @@ void usage(enum logcode F) +@@ -684,6 +690,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"); @@ -395,7 +380,7 @@ index e7c6c61..ae3d2d0 100644 rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); #ifdef SUPPORT_ACLS -@@ -722,7 +731,12 @@ void usage(enum logcode F) +@@ -723,7 +732,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"); @@ -409,7 +394,7 @@ index e7c6c61..ae3d2d0 100644 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"); -@@ -835,6 +849,10 @@ static struct poptOption long_options[] = { +@@ -836,6 +850,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 }, @@ -420,7 +405,7 @@ index e7c6c61..ae3d2d0 100644 {"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 }, -@@ -917,6 +935,14 @@ static struct poptOption long_options[] = { +@@ -918,6 +936,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 }, @@ -435,7 +420,7 @@ index e7c6c61..ae3d2d0 100644 {"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 }, -@@ -2383,6 +2409,9 @@ void server_options(char **args, int *argc_p) +@@ -2420,6 +2446,9 @@ void server_options(char **args, int *argc_p) if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -445,7 +430,7 @@ index e7c6c61..ae3d2d0 100644 if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) goto oom; -@@ -2470,6 +2499,16 @@ void server_options(char **args, int *argc_p) +@@ -2507,6 +2536,16 @@ void server_options(char **args, int *argc_p) args[ac++] = "--delete-excluded"; if (force_delete) args[ac++] = "--force"; @@ -463,7 +448,6 @@ index e7c6c61..ae3d2d0 100644 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 @@ -31,6 +31,7 @@ extern int dry_run; @@ -474,7 +458,7 @@ index 2c026a2..3188535 100644 extern int preserve_executability; extern int preserve_times; extern int am_root; -@@ -378,6 +379,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, +@@ -445,6 +446,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, return new_mode; } @@ -514,16 +498,16 @@ index 2c026a2..3188535 100644 int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, const char *fnamecmp, int flags) { -@@ -426,7 +460,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -493,7 +527,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) { -- int ret = set_modtime(fname, file->modtime, sxp->st.st_mode); -+ int ret = set_modtime(fname, file->modtime, sxp->st.st_mode, ST_FLAGS(sxp->st)); +- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode); ++ int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st)); if (ret < 0) { rsyserr(FERROR_XFER, errno, "failed to set times on %s", full_fname(fname)); -@@ -462,7 +496,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -529,7 +563,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, @@ -533,7 +517,7 @@ index 2c026a2..3188535 100644 /* We shouldn't have attempted to change uid * or gid unless have the privilege. */ rsyserr(FERROR_XFER, errno, "%s %s failed", -@@ -494,7 +529,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -563,7 +598,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)) { @@ -542,7 +526,7 @@ index 2c026a2..3188535 100644 if (ret < 0) { rsyserr(FERROR_XFER, errno, "failed to set permissions on %s", -@@ -506,6 +541,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -575,6 +610,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, } #endif @@ -562,7 +546,7 @@ index 2c026a2..3188535 100644 if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -570,7 +618,8 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -639,7 +687,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, @@ -572,7 +556,7 @@ index 2c026a2..3188535 100644 /* move tmp file over real file */ if (DEBUG_GTE(RECV, 1)) -@@ -589,6 +638,10 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -658,6 +707,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. */ @@ -584,18 +568,17 @@ index 2c026a2..3188535 100644 } /* 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 -@@ -61,6 +61,7 @@ - #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ +@@ -62,6 +62,7 @@ #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_MOD_NSEC (1<<13) /* protocols 31 - now */ +#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */ /* These flags are used in the live flist data. */ -@@ -155,6 +156,7 @@ +@@ -160,6 +161,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -603,7 +586,7 @@ index be7cf8a..16820fd 100644 #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -181,6 +183,7 @@ +@@ -186,6 +188,7 @@ #define ITEM_REPORT_GROUP (1<<6) #define ITEM_REPORT_ACL (1<<7) #define ITEM_REPORT_XATTR (1<<8) @@ -611,7 +594,7 @@ index be7cf8a..16820fd 100644 #define ITEM_BASIS_TYPE_FOLLOWS (1<<11) #define ITEM_XNAME_FOLLOWS (1<<12) #define ITEM_IS_NEW (1<<13) -@@ -482,6 +485,28 @@ typedef unsigned int size_t; +@@ -494,6 +497,28 @@ typedef unsigned int size_t; #endif #endif @@ -640,7 +623,7 @@ index be7cf8a..16820fd 100644 /* 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. */ -@@ -652,6 +677,7 @@ extern int file_extra_cnt; +@@ -664,6 +689,7 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -648,7 +631,7 @@ index be7cf8a..16820fd 100644 extern int acls_ndx; extern int xattrs_ndx; -@@ -689,6 +715,11 @@ extern int xattrs_ndx; +@@ -705,6 +731,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 @@ -661,7 +644,6 @@ index be7cf8a..16820fd 100644 #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 @@ -345,6 +345,7 @@ to the detailed description below for a complete description. verb( @@ -684,7 +666,7 @@ index 941f7a5..7b41d5f 100644 --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 -@@ -592,7 +596,8 @@ specified, in which case bf(-r) is not implied. +@@ -595,7 +599,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 @@ -694,7 +676,7 @@ index 941f7a5..7b41d5f 100644 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-": -@@ -869,7 +874,7 @@ they would be using bf(--copy-links). +@@ -876,7 +881,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 @@ -703,7 +685,7 @@ index 941f7a5..7b41d5f 100644 See also bf(--keep-dirlinks) for an analogous option for the receiving side. -@@ -1006,6 +1011,29 @@ super-user copies all namespaces except system.*. A normal user only copies +@@ -1013,6 +1018,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. @@ -732,8 +714,8 @@ index 941f7a5..7b41d5f 100644 + 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 -@@ -1285,12 +1313,13 @@ display as a "*missing" entry in the bf(--list-only) output. + transfer. The resulting value is treated as though it were the permissions +@@ -1301,12 +1329,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. @@ -750,7 +732,7 @@ index 941f7a5..7b41d5f 100644 bf(--recursive) option was also enabled. dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM -@@ -1832,7 +1861,7 @@ with older versions of rsync, but that also turns on the output of other +@@ -1875,7 +1904,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 @@ -759,7 +741,7 @@ index 941f7a5..7b41d5f 100644 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. -@@ -1888,7 +1917,7 @@ quote(itemization( +@@ -1931,7 +1960,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). @@ -769,18 +751,17 @@ index 941f7a5..7b41d5f 100644 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; - extern int am_root; +@@ -34,6 +34,7 @@ extern int am_root; + extern int am_sender; extern int read_only; extern int list_only; +extern int force_change; extern int preserve_perms; extern int preserve_executability; -@@ -50,7 +51,23 @@ int do_unlink(const char *fname) +@@ -51,7 +52,23 @@ int do_unlink(const char *fname) { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; @@ -804,8 +785,8 @@ index cfabc3e..45604b1 100644 + return -1; } - int do_symlink(const char *fname1, const char *fname2) -@@ -69,14 +86,37 @@ int do_link(const char *fname1, const char *fname2) + #ifdef SUPPORT_LINKS +@@ -112,14 +129,37 @@ int do_link(const char *fname1, const char *fname2) } #endif @@ -845,7 +826,7 @@ index cfabc3e..45604b1 100644 } int do_mknod(const char *pathname, mode_t mode, dev_t dev) -@@ -116,7 +156,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev) +@@ -159,7 +199,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev) return -1; close(sock); #ifdef HAVE_CHMOD @@ -854,7 +835,7 @@ index cfabc3e..45604b1 100644 #else return 0; #endif -@@ -133,7 +173,22 @@ int do_rmdir(const char *pathname) +@@ -176,7 +216,22 @@ int do_rmdir(const char *pathname) { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; @@ -878,7 +859,7 @@ index cfabc3e..45604b1 100644 } int do_open(const char *pathname, int flags, mode_t mode) -@@ -147,7 +202,7 @@ int do_open(const char *pathname, int flags, mode_t mode) +@@ -190,7 +245,7 @@ int do_open(const char *pathname, int flags, mode_t mode) } #ifdef HAVE_CHMOD @@ -887,7 +868,7 @@ index cfabc3e..45604b1 100644 { int code; if (dry_run) return 0; -@@ -168,17 +223,74 @@ int do_chmod(const char *path, mode_t mode) +@@ -211,17 +266,74 @@ int do_chmod(const char *path, mode_t mode) #endif } else code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ @@ -964,7 +945,6 @@ index cfabc3e..45604b1 100644 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 @@ -25,6 +25,7 @@ int modify_window = 0; @@ -975,7 +955,7 @@ index 02cfa69..9228d0c 100644 int preserve_xattrs = 0; mode_t orig_umask = 002; char number_separator = ','; -@@ -89,3 +90,23 @@ struct filter_list_struct daemon_filter_list; +@@ -84,3 +85,23 @@ filter_rule_list daemon_filter_list; { return "tester"; } @@ -1000,7 +980,6 @@ index 02cfa69..9228d0c 100644 +} +#endif diff --git a/util.c b/util.c -index 0cafed6..ed26a05 100644 --- a/util.c +++ b/util.c @@ -30,6 +30,7 @@ extern int module_id; @@ -1015,25 +994,41 @@ index 0cafed6..ed26a05 100644 exit_cleanup(RERR_MALLOC); } --int set_modtime(const char *fname, time_t modtime, mode_t mode) -+int set_modtime(const char *fname, time_t modtime, mode_t mode, uint32 fileflags) +-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) ++int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags) { - #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES + #ifndef CAN_SET_SYMLINK_TIMES if (S_ISLNK(mode)) -@@ -140,6 +141,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -140,15 +141,14 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) return 0; { + int ret; - #ifdef HAVE_UTIMES + #ifdef HAVE_UTIMENSAT + struct timespec t[2]; + t[0].tv_sec = 0; + t[0].tv_nsec = UTIME_NOW; + t[1].tv_sec = modtime; + t[1].tv_nsec = mod_nsec; +- if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) < 0) +- return S_ISLNK(mode) && errno == ENOSYS ? 1 : -1; +- return 0; ++#define SET_THE_TIME(fn) utimensat(AT_FDCWD, fn, t, AT_SYMLINK_NOFOLLOW) + #elif defined HAVE_UTIMES || defined HAVE_LUTIMES struct timeval t[2]; t[0].tv_sec = time(NULL); -@@ -153,20 +155,39 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) - return 0; - } - # endif +@@ -156,25 +156,44 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) + t[1].tv_sec = modtime; + t[1].tv_usec = mod_nsec / 1000; + # ifdef HAVE_LUTIMES +- if (lutimes(fname, t) < 0) +- return S_ISLNK(mode) && errno == ENOSYS ? 1 : -1; +- return 0; ++#define SET_THE_TIME(fn) lutimes(fn, t) + # else - return utimes(fname, t); +#define SET_THE_TIME(fn) utimes(fn, t) + # endif #elif defined HAVE_STRUCT_UTIMBUF struct utimbuf tbuf; tbuf.actime = time(NULL); @@ -1050,6 +1045,8 @@ index 0cafed6..ed26a05 100644 #error No file-time-modification routine found! #endif + ret = SET_THE_TIME(fname); ++ if (ret != 0 && S_ISLNK(mode) && errno == ENOSYS) ++ return 1; +#ifdef SUPPORT_FORCE_CHANGE + if (ret != 0 && force_change && errno == EPERM) { + if (fileflags == NO_FFLAGS) { @@ -1072,38 +1069,14 @@ index 0cafed6..ed26a05 100644 } diff --git a/xattrs.c b/xattrs.c -index 2d0e050..5d04599 100644 --- a/xattrs.c +++ b/xattrs.c -@@ -282,6 +282,10 @@ int get_xattr(const char *fname, stat_x *sxp) - { - sxp->xattr = new(item_list); - *sxp->xattr = empty_xattr; -+ -+ if (IS_SPECIAL(sxp->st.st_mode) || IS_DEVICE(sxp->st.st_mode)) -+ return 0; -+ - if (rsync_xal_get(fname, sxp->xattr) < 0) { - free_xattr(sxp); - return -1; -@@ -865,6 +869,11 @@ int set_xattr(const char *fname, const struct file_struct *file, - return -1; - } - -+ if (IS_SPECIAL(sxp->st.st_mode) || IS_DEVICE(sxp->st.st_mode)) { -+ errno = ENOTSUP; -+ return -1; -+ } -+ - ndx = F_XATTR(file); - return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp); - } -@@ -981,7 +990,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode) +@@ -1033,7 +1033,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) - do_chmod(fname, mode); + do_chmod(fname, mode, ST_FLAGS(fst)); - if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode)) + if (!IS_DEVICE(fst.st_mode)) fst.st_rdev = 0; /* just in case */