X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f9df736a3e22f15307f9e304eb9069b06e94208f..41b674b3ed541263d70a10d7796aca5d6cd73e03:/fileflags.diff diff --git a/fileflags.diff b/fileflags.diff index eead498..97f30e3 100644 --- a/fileflags.diff +++ b/fileflags.diff @@ -20,7 +20,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) \ -@@ -105,7 +105,7 @@ getgroups$(EXEEXT): getgroups.o +@@ -107,7 +107,7 @@ getgroups$(EXEEXT): getgroups.o getfsdev$(EXEEXT): getfsdev.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS) @@ -44,7 +44,7 @@ diff --git a/compat.c b/compat.c extern int preserve_acls; extern int preserve_xattrs; extern int need_messages_from_generator; -@@ -60,7 +62,7 @@ extern iconv_t ic_send, ic_recv; +@@ -61,7 +63,7 @@ extern char *iconv_opt; #endif /* These index values are for the file-list's extra-attribute array. */ @@ -52,8 +52,8 @@ diff --git a/compat.c b/compat.c +int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx; int receiver_symlink_times = 0; /* receiver can set the time on a symlink */ - -@@ -134,6 +136,8 @@ void setup_protocol(int f_out,int f_in) + int sender_symlink_iconv = 0; /* sender should convert symlink content */ +@@ -137,6 +139,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -65,8 +65,8 @@ diff --git a/compat.c b/compat.c diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -551,7 +551,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ - memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \ +@@ -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 \ @@ -85,7 +85,7 @@ diff --git a/flist.c b/flist.c extern int uid_ndx; extern int gid_ndx; extern int eol_nulls; -@@ -346,6 +347,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ +@@ -395,6 +396,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 +95,7 @@ diff --git a/flist.c b/flist.c #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif -@@ -405,6 +409,14 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ +@@ -424,6 +428,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 +110,7 @@ diff --git a/flist.c b/flist.c if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { -@@ -524,6 +536,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ +@@ -538,6 +550,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 +121,7 @@ diff --git a/flist.c b/flist.c if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -612,6 +628,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -624,6 +640,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, { static int64 modtime; static mode_t mode; @@ -131,7 +131,7 @@ diff --git a/flist.c b/flist.c #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif -@@ -746,6 +765,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -759,6 +778,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); @@ -142,9 +142,9 @@ diff --git a/flist.c b/flist.c if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) -@@ -867,6 +890,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, - OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); +@@ -899,6 +922,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } + #endif file->mode = mode; +#ifdef SUPPORT_FILEFLAGS + if (preserve_fileflags) @@ -153,9 +153,9 @@ diff --git a/flist.c b/flist.c if (preserve_uid) F_OWNER(file) = uid; if (preserve_gid) { -@@ -1201,6 +1228,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, - OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); +@@ -1273,6 +1300,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } + #endif file->mode = st.st_mode; +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE + if (fileflags_ndx) @@ -164,10 +164,18 @@ 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, + #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; diff --git a/generator.c b/generator.c --- a/generator.c +++ b/generator.c -@@ -43,8 +43,10 @@ extern int preserve_devices; +@@ -42,8 +42,10 @@ extern int preserve_devices; extern int preserve_specials; extern int preserve_hard_links; extern int preserve_executability; @@ -178,7 +186,7 @@ diff --git a/generator.c b/generator.c extern int uid_ndx; extern int gid_ndx; extern int delete_mode; -@@ -162,7 +164,7 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) +@@ -166,7 +168,7 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) } if (flags & DEL_NO_UID_WRITE) @@ -187,7 +195,7 @@ diff --git a/generator.c b/generator.c if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { int save_uid_ndx = uid_ndx; -@@ -170,6 +172,13 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) +@@ -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; @@ -201,7 +209,7 @@ diff --git a/generator.c b/generator.c ignore_perishable = 1; /* If DEL_RECURSE is not set, this just reports emptiness. */ ret = delete_dir_contents(fbuf, flags); -@@ -290,8 +299,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags) +@@ -294,8 +303,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags) } strlcpy(p, fp->basename, remainder); @@ -215,8 +223,8 @@ diff --git a/generator.c b/generator.c /* Save stack by recursing to ourself directly. */ if (S_ISDIR(fp->mode)) { if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) -@@ -585,6 +598,11 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) - if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) +@@ -599,6 +612,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; +#ifdef SUPPORT_FILEFLAGS @@ -224,10 +232,10 @@ diff --git a/generator.c b/generator.c + return 0; +#endif + - if (preserve_executability && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0))) + if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)) return 0; -@@ -646,6 +664,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre +@@ -664,6 +682,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; @@ -239,7 +247,7 @@ diff --git a/generator.c b/generator.c #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { if (!ACL_READY(*sxp)) -@@ -1391,6 +1414,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1442,6 +1465,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); } @@ -250,7 +258,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); -@@ -1427,10 +1454,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1482,10 +1509,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. */ @@ -267,7 +275,7 @@ diff --git a/generator.c b/generator.c rsyserr(FERROR_XFER, errno, "failed to modify permissions on %s", full_fname(fname)); -@@ -1461,6 +1493,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, +@@ -1520,6 +1552,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); } @@ -278,26 +286,30 @@ diff --git a/generator.c b/generator.c #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_HLINK_NOT_FIRST(file) -@@ -1948,9 +1984,13 @@ static void touch_up_dirs(struct file_list *flist, int ndx) +@@ -2054,13 +2090,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) continue; fname = f_name(file, NULL); if (!(file->mode & S_IWUSR)) - do_chmod(fname, file->mode); + do_chmod(fname, file->mode, 0); - if (need_retouch_dir_times) -- set_modtime(fname, file->modtime, file->mode); -+ set_modtime(fname, file->modtime, 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); + } +#ifdef SUPPORT_FORCE_CHANGE + if (force_change && F_FFLAGS(file) & force_change) + undo_make_mutable(fname, F_FFLAGS(file)); +#endif - if (allowed_lull && !(counter % lull_mod)) - maybe_send_keepalive(); - else if (!(counter & 0xFF)) + if (counter >= loopchk_limit) { + if (allowed_lull) + maybe_send_keepalive(); diff --git a/log.c b/log.c --- a/log.c +++ b/log.c -@@ -644,7 +644,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op, +@@ -660,7 +660,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'; @@ -309,7 +321,7 @@ diff --git a/log.c b/log.c diff --git a/options.c b/options.c --- a/options.c +++ b/options.c -@@ -52,6 +52,7 @@ int preserve_hard_links = 0; +@@ -53,6 +53,7 @@ int preserve_hard_links = 0; int preserve_acls = 0; int preserve_xattrs = 0; int preserve_perms = 0; @@ -317,7 +329,7 @@ diff --git a/options.c b/options.c int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -84,6 +85,7 @@ int implied_dirs = 1; +@@ -85,6 +86,7 @@ int implied_dirs = 1; int numeric_ids = 0; int allow_8bit_chars = 0; int force_delete = 0; @@ -325,7 +337,7 @@ diff --git a/options.c b/options.c int io_timeout = 0; int allowed_lull = 0; int prune_empty_dirs = 0; -@@ -224,6 +226,7 @@ static void print_rsync_version(enum logcode f) +@@ -225,6 +227,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -333,7 +345,7 @@ diff --git a/options.c b/options.c STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -256,6 +259,9 @@ static void print_rsync_version(enum logcode f) +@@ -258,6 +261,9 @@ static void print_rsync_version(enum logcode f) #if defined HAVE_LUTIMES && defined HAVE_UTIMES symtimes = ""; #endif @@ -343,7 +355,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); -@@ -269,8 +275,8 @@ static void print_rsync_version(enum logcode f) +@@ -271,8 +277,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); @@ -354,7 +366,7 @@ diff --git a/options.c b/options.c #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -337,6 +343,9 @@ void usage(enum logcode F) +@@ -339,6 +345,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"); @@ -364,7 +376,7 @@ 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 -@@ -374,7 +383,12 @@ void usage(enum logcode F) +@@ -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"); rprintf(F," --ignore-errors delete even if there are I/O errors\n"); @@ -378,7 +390,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"); -@@ -477,6 +491,10 @@ static struct poptOption long_options[] = { +@@ -481,6 +495,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 }, @@ -389,21 +401,22 @@ 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 }, -@@ -551,6 +569,13 @@ static struct poptOption long_options[] = { - {"remove-sent-files",0, POPT_ARG_VAL, &remove_source_files, 2, 0, 0 }, /* deprecated */ +@@ -559,6 +577,14 @@ static struct poptOption long_options[] = { {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 }, - {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, -+ {"force-delete", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, + {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 }, + {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 }, ++ {"force-delete", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 }, ++ {"no-force-delete", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 }, +#ifdef SUPPORT_FORCE_CHANGE + {"force-change", 0, POPT_ARG_VAL, &force_change, ALL_IMMUTABLE, 0, 0 }, + {"no-force-change", 0, POPT_ARG_VAL, &force_change, 0, 0, 0 }, + {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 }, + {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 }, +#endif - {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, + {"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 }, - {0, 'F', POPT_ARG_NONE, 0, 'F', 0, 0 }, -@@ -1826,6 +1851,9 @@ void server_options(char **args, int *argc_p) +@@ -1868,6 +1894,9 @@ void server_options(char **args, int *argc_p) if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -413,7 +426,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; -@@ -1913,6 +1941,16 @@ void server_options(char **args, int *argc_p) +@@ -1955,6 +1984,16 @@ void server_options(char **args, int *argc_p) args[ac++] = "--delete-excluded"; if (force_delete) args[ac++] = "--force"; @@ -441,7 +454,7 @@ diff --git a/rsync.c b/rsync.c extern int preserve_executability; extern int preserve_times; extern int am_root; -@@ -339,6 +340,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, +@@ -377,6 +378,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, return new_mode; } @@ -481,7 +494,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) { -@@ -392,7 +426,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -430,7 +464,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) { @@ -490,7 +503,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)); -@@ -428,7 +462,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -466,7 +500,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, @@ -500,7 +513,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", -@@ -460,7 +495,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -498,7 +533,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)) { @@ -509,7 +522,7 @@ diff --git a/rsync.c b/rsync.c if (ret < 0) { rsyserr(FERROR_XFER, errno, "failed to set permissions on %s", -@@ -472,6 +507,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -510,6 +545,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, } #endif @@ -529,7 +542,7 @@ diff --git a/rsync.c b/rsync.c if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -531,7 +579,8 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -573,7 +621,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, @@ -539,7 +552,7 @@ diff --git a/rsync.c b/rsync.c /* move tmp file over real file */ if (verbose > 2) -@@ -550,6 +599,10 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -592,6 +641,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. */ @@ -561,7 +574,7 @@ diff --git a/rsync.h b/rsync.h /* These flags are used in the live flist data. */ -@@ -149,6 +150,7 @@ +@@ -154,6 +155,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -569,7 +582,7 @@ diff --git a/rsync.h b/rsync.h #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -174,6 +176,7 @@ +@@ -180,6 +182,7 @@ #define ITEM_REPORT_GROUP (1<<6) #define ITEM_REPORT_ACL (1<<7) #define ITEM_REPORT_XATTR (1<<8) @@ -577,7 +590,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) -@@ -452,6 +455,28 @@ typedef unsigned int size_t; +@@ -462,6 +465,28 @@ typedef unsigned int size_t; #endif #endif @@ -595,8 +608,8 @@ diff --git a/rsync.h b/rsync.h +#ifndef SF_NOUNLINK +#define SF_NOUNLINK 0 +#endif -+#define USR_IMMUTABLE (UF_IMMUTABLE|UF_NOUNLINK) -+#define SYS_IMMUTABLE (SF_IMMUTABLE|SF_NOUNLINK) ++#define USR_IMMUTABLE (UF_IMMUTABLE|UF_NOUNLINK|UF_APPEND) ++#define SYS_IMMUTABLE (SF_IMMUTABLE|SF_NOUNLINK|SF_APPEND) +#define ALL_IMMUTABLE (USR_IMMUTABLE|SYS_IMMUTABLE) +#define ST_FLAGS(st) (st.st_flags) +#else @@ -606,7 +619,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. */ -@@ -620,6 +645,7 @@ extern int file_extra_cnt; +@@ -632,6 +657,7 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -614,7 +627,7 @@ diff --git a/rsync.h b/rsync.h extern int acls_ndx; extern int xattrs_ndx; -@@ -657,6 +683,11 @@ extern int xattrs_ndx; +@@ -669,6 +695,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 @@ -629,7 +642,7 @@ diff --git a/rsync.h b/rsync.h diff --git a/rsync.yo b/rsync.yo --- a/rsync.yo +++ b/rsync.yo -@@ -338,6 +338,7 @@ to the detailed description below for a complete description. verb( +@@ -342,6 +342,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 @@ -637,7 +650,7 @@ 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) -@@ -369,7 +370,10 @@ to the detailed description below for a complete description. verb( +@@ -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 --ignore-errors delete even if there are I/O errors @@ -649,7 +662,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 -@@ -540,7 +544,8 @@ specified, in which case bf(-r) is not implied. +@@ -544,7 +548,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 @@ -659,7 +672,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-": -@@ -785,7 +790,7 @@ they would be using bf(--copy-links). +@@ -802,7 +807,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 @@ -668,7 +681,7 @@ diff --git a/rsync.yo b/rsync.yo See also bf(--keep-dirlinks) for an analogous option for the receiving side. -@@ -922,6 +927,29 @@ super-user copies all namespaces except system.*. A normal user only copies +@@ -939,6 +944,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. @@ -698,7 +711,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 -@@ -1177,12 +1205,13 @@ See bf(--delete) (which is implied) for more details on file-deletion. +@@ -1201,12 +1229,13 @@ See bf(--delete) (which is implied) for more details on file-deletion. dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files even when there are I/O errors. @@ -715,7 +728,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 -@@ -1638,7 +1667,7 @@ with older versions of rsync, but that also turns on the output of other +@@ -1667,7 +1696,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 @@ -724,7 +737,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. -@@ -1689,7 +1718,7 @@ quote(itemization( +@@ -1723,7 +1752,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). @@ -854,7 +867,7 @@ diff --git a/syscall.c b/syscall.c @@ -168,17 +223,74 @@ int do_chmod(const char *path, mode_t mode) #endif } else - code = chmod(path, mode & CHMOD_BITS); + code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ +#ifdef SUPPORT_FORCE_CHANGE + if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) { + if (fileflags == NO_FFLAGS) { @@ -875,7 +888,7 @@ diff --git a/syscall.c b/syscall.c + fileflags = 0; /* avoid compiler warning */ +#endif if (code != 0 && (preserve_perms || preserve_executability)) - return code; + return code; return 0; } #endif @@ -935,10 +948,10 @@ diff --git a/t_stub.c b/t_stub.c 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 *module_dir; -@@ -83,3 +84,23 @@ struct filter_list_struct server_filter_list; +@@ -89,3 +90,23 @@ struct filter_list_struct daemon_filter_list; { return "tester"; } @@ -970,10 +983,10 @@ diff --git a/util.c b/util.c extern int relative_paths; extern int human_readable; +extern int force_change; + extern int preserve_xattrs; extern char *module_dir; extern unsigned int module_dirlen; - extern mode_t orig_umask; -@@ -122,7 +123,7 @@ NORETURN void overflow_exit(const char *str) +@@ -123,7 +124,7 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } @@ -982,7 +995,7 @@ diff --git a/util.c b/util.c { #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(mode)) -@@ -139,6 +140,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -140,6 +141,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) return 0; { @@ -990,7 +1003,7 @@ diff --git a/util.c b/util.c #ifdef HAVE_UTIMES struct timeval t[2]; t[0].tv_sec = time(NULL); -@@ -152,20 +154,39 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -153,20 +155,39 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) return 0; } # endif @@ -1036,7 +1049,30 @@ diff --git a/util.c b/util.c diff --git a/xattrs.c b/xattrs.c --- a/xattrs.c +++ b/xattrs.c -@@ -915,7 +915,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode) +@@ -281,6 +281,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; +@@ -864,6 +868,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); + } +@@ -980,7 +989,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)