X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ffc188460d94afdf8da233d822e7312e676b146a..a5e6228afbf1809d33d9a31e0895c5e955c39ce1:/flags.diff diff --git a/flags.diff b/flags.diff index 4c9e233..ea30598 100644 --- a/flags.diff +++ b/flags.diff @@ -1,4 +1,4 @@ -This patch provides --flags, which preserves the st_flags field. +This patch provides --fileflags, which preserves the st_flags stat() field. Modified from a patch that was written by Rolf Grossmann. To use this patch, run these commands for a successful build: @@ -8,311 +8,313 @@ To use this patch, run these commands for a successful build: ./configure make -TODO: fix --delete-delay to work with --flags option. - ---- old/compat.c -+++ new/compat.c -@@ -62,6 +62,8 @@ void setup_protocol(int f_out,int f_in) - preserve_uid = ++file_extra_cnt; +diff --git a/compat.c b/compat.c +--- a/compat.c ++++ b/compat.c +@@ -44,6 +44,7 @@ extern int protocol_version; + extern int protect_args; + extern int preserve_uid; + extern int preserve_gid; ++extern int preserve_fileflags; + extern int preserve_acls; + extern int preserve_xattrs; + extern int need_messages_from_generator; +@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv; + #endif + + /* These index values are for the file-list's extra-attribute array. */ +-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx; ++int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx; + + #ifdef ICONV_OPTION + int filesfrom_convert = 0; +@@ -124,6 +125,8 @@ void setup_protocol(int f_out,int f_in) + uid_ndx = ++file_extra_cnt; if (preserve_gid) - preserve_gid = ++file_extra_cnt; + gid_ndx = ++file_extra_cnt; + if (preserve_fileflags) -+ preserve_fileflags = ++file_extra_cnt; ++ fileflags_ndx = ++file_extra_cnt; if (preserve_acls && !am_sender) - preserve_acls = ++file_extra_cnt; - ---- old/configure.in -+++ new/configure.in -@@ -559,7 +559,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd + acls_ndx = ++file_extra_cnt; + if (preserve_xattrs) +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 \ 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 \ -+ chflags strerror putenv iconv_open locale_charset nl_langinfo \ - sigaction sigprocmask) - - AC_CHECK_FUNCS(getpgrp tcgetpgrp) ---- old/flist.c -+++ new/flist.c -@@ -47,6 +47,7 @@ extern int preserve_links; +- 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) + + dnl cygwin iconv.h defines iconv_open as libiconv_open +diff --git a/flist.c b/flist.c +--- a/flist.c ++++ b/flist.c +@@ -50,6 +50,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; -+extern int preserve_fileflags; - extern int preserve_uid; - extern int preserve_gid; - extern int relative_paths; -@@ -350,6 +351,9 @@ static void send_file_entry(int f, struc ++extern int fileflags_ndx; + extern int uid_ndx; + extern int gid_ndx; + extern int eol_nulls; +@@ -344,6 +345,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ { static time_t modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS + static uint32 fileflags; +#endif + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; - static uint32 rdev_major; -@@ -370,6 +374,12 @@ static void send_file_entry(int f, struc - flags |= XMIT_SAME_MODE; + #endif +@@ -403,6 +407,14 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ + xflags |= XMIT_SAME_MODE; else mode = file->mode; +#ifdef SUPPORT_FLAGS -+ if (file->fileflags == fileflags) -+ flags |= XMIT_SAME_FLAGS; -+ else -+ fileflags = file->fileflags; ++ if (fileflags_ndx) { ++ if (F_FFLAGS(file) == fileflags) ++ xflags |= XMIT_SAME_FLAGS; ++ else ++ fileflags = F_FFLAGS(file); ++ } +#endif + if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { - if (protocol_version < 28) { -@@ -483,6 +493,10 @@ static void send_file_entry(int f, struc - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) +@@ -522,6 +534,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ + } + if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) { - write_abbrevint30(f, uid); - if (flags & XMIT_USER_NAME_FOLLOWS) { -@@ -561,6 +575,9 @@ static struct file_struct *recv_file_ent + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) + write_int(f, uid); +@@ -610,6 +626,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, { - static time_t modtime; + static int64 modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS -+ static uint32 fileflags; ++ static uint32 fileflags; +#endif + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; - static uint32 rdev_major; -@@ -656,9 +673,12 @@ static struct file_struct *recv_file_ent - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) - mode = from_wire_mode(read_int(f)); -- + #endif +@@ -744,6 +763,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, + if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif - if (preserve_uid && !(flags & XMIT_SAME_UID)) { - uid = (uid_t)read_abbrevint30(f); -@@ -766,6 +786,10 @@ static struct file_struct *recv_file_ent + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) +@@ -865,6 +888,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist, OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags) ++ if (fileflags_ndx) + F_FFLAGS(file) = fileflags; +#endif - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = uid; - if (preserve_gid) -@@ -1071,6 +1095,10 @@ struct file_struct *make_file(const char + if (gid_ndx) { +@@ -1199,6 +1226,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } file->mode = st.st_mode; +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags) ++ if (fileflags_ndx) + F_FFLAGS(file) = st.st_flags; +#endif - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = st.st_uid; - if (preserve_gid) ---- old/generator.c -+++ new/generator.c -@@ -111,6 +111,12 @@ static int dir_tweaking; - static int need_retouch_dir_times; - static const char *solo_file = NULL; - + if (gid_ndx) +diff --git a/generator.c b/generator.c +--- a/generator.c ++++ b/generator.c +@@ -122,6 +122,7 @@ static const char *solo_file = NULL; + #define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */ + #define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */ + #define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */ ++#define DEL_AN_IMMUTABLE (1<<8) /* item has an immutable flag set */ + + #define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL) + +@@ -161,6 +162,10 @@ static enum delret delete_item(char *fbuf, int mode, int flags) + + if (!am_root && !(mode & S_IWUSR) && flags & DEL_OWNED_BY_US) + do_chmod(fbuf, mode |= S_IWUSR); +#ifdef SUPPORT_FLAGS -+#define FILEFLAGS(ff) ff -+#else -+#define FILEFLAGS(ff) 0 ++ if (fileflags_ndx && flags & DEL_AN_IMMUTABLE) ++ make_mutable(fbuf, mode, NODELETE_FLAGS); +#endif -+ - /* For calling delete_item() and delete_dir_contents(). */ - #define DEL_RECURSE (1<<1) /* recurse */ - #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ -@@ -126,7 +132,6 @@ enum delret { - /* Forward declaration for delete_item(). */ - static enum delret delete_dir_contents(char *fname, int flags); - -- - static int is_backup_file(char *fn) - { - int k = strlen(fn) - backup_suffix_len; -@@ -139,17 +144,20 @@ static int is_backup_file(char *fn) - * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's - * a directory! (The buffer is used for recursion, but returned unchanged.) - */ --static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) -+static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags) - { - enum delret ret; - char *what; - int ok; - - if (verbose > 2) { -- rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", -- fbuf, mode, flags); -+ rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n", -+ fbuf, mode, fileflags, flags); - } -+#ifdef SUPPORT_FLAGS -+ make_mutable(fbuf, mode, fileflags); -+#endif if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { ignore_perishable = 1; - /* If DEL_RECURSE is not set, this just reports emptiness. */ -@@ -261,7 +269,7 @@ static enum delret delete_dir_contents(c - if (S_ISDIR(fp->mode) - && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) - ret = DR_NOT_EMPTY; -- if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) -+ if (delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags) != DR_SUCCESS) - ret = DR_NOT_EMPTY; - } +@@ -282,6 +287,14 @@ static enum delret delete_dir_contents(char *fname, int flags) + flags |= DEL_OWNED_BY_US; + else + flags &= ~DEL_OWNED_BY_US; ++#ifdef SUPPORT_FLAGS ++ if (fileflags_ndx) { ++ if (F_FFLAGS(fp) & NODELETE_FLAGS) ++ flags |= DEL_AN_IMMUTABLE; ++ else ++ flags &= ~DEL_AN_IMMUTABLE; ++ } ++#endif + /* Save stack by recursing to ourself directly. */ + if (S_ISDIR(fp->mode)) { + if (!am_root && !(fp->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) +@@ -341,15 +354,22 @@ static int flush_delete_delay(void) + + static int remember_delete(struct file_struct *file, const char *fname, int flags) + { +- const char *plus = (!am_root && !(file->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) +- ? "+" : ""; ++ char buf[16], *bp = buf; + int len; -@@ -317,8 +325,9 @@ static int remember_delete(struct file_s - ++ if (!am_root && !(file->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) ++ *bp++ = '+'; ++#ifdef SUPPORT_FLAGS ++ if (flags & DEL_AN_IMMUTABLE) ++ *bp++ = '-'; ++#endif ++ *bp = '\0'; ++ while (1) { len = snprintf(deldelay_buf + deldelay_cnt, -- deldelay_size - deldelay_cnt, -- "%x %s%c", (int)file->mode, fname, '\0'); -+ deldelay_size - deldelay_cnt, "%x %x %s%c", -+ (int)file->mode, (int)FILEFLAGS(file->fileflags), -+ fname, '\0'); + deldelay_size - deldelay_cnt, + "%s%x %s%c", +- plus, (int)file->mode, fname, '\0'); ++ buf, (int)file->mode, fname, '\0'); if ((deldelay_cnt += len) <= deldelay_size) break; if (deldelay_fd < 0 && !start_delete_delay_temp()) -@@ -331,7 +340,7 @@ static int remember_delete(struct file_s +@@ -362,10 +382,10 @@ static int remember_delete(struct file_struct *file, const char *fname, int flag return 1; } --static int read_delay_line(char *buf) -+static int read_delay_line(char *buf, int *fileflags_p) +-static int read_delay_line(char *buf, int *own_flag_p) ++static int read_delay_line(char *buf, int *flags_p) { static int read_pos = 0; - int j, len, mode; -@@ -373,7 +382,7 @@ static int read_delay_line(char *buf) +- int j, len, mode; ++ int j, len, mode, flags = 0; + char *bp, *past_space; + while (1) { +@@ -405,9 +425,15 @@ static int read_delay_line(char *buf, int *own_flag_p) bp = deldelay_buf + read_pos; + if (*bp == '+') { + bp++; +- *own_flag_p = DEL_OWNED_BY_US; +- } else +- *own_flag_p = 0; ++ flags |= DEL_OWNED_BY_US; ++ } ++#ifdef SUPPORT_FLAGS ++ if (*bp == '-') { ++ bp++; ++ flags |= DEL_AN_IMMUTABLE; ++ } ++#endif ++ *flags_p = flags; -- if (sscanf(bp, "%x ", &mode) != 1) { -+ if (sscanf(bp, "%x %x ", &mode, fileflags_p) != 2) { + if (sscanf(bp, "%x ", &mode) != 1) { invalid_data: - rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n"); - return -1; -@@ -396,15 +405,15 @@ static int read_delay_line(char *buf) +@@ -432,15 +458,15 @@ static int read_delay_line(char *buf, int *own_flag_p) static void do_delayed_deletions(char *delbuf) { -- int mode; -+ int mode, fileflags; +- int mode, own_flag; ++ int mode, flags; if (deldelay_fd >= 0) { if (deldelay_cnt && !flush_delete_delay()) return; lseek(deldelay_fd, 0, 0); } -- while ((mode = read_delay_line(delbuf)) >= 0) -- delete_item(delbuf, mode, NULL, DEL_RECURSE); -+ while ((mode = read_delay_line(delbuf, &fileflags)) >= 0) -+ delete_item(delbuf, mode, fileflags, NULL, DEL_RECURSE); +- while ((mode = read_delay_line(delbuf, &own_flag)) >= 0) +- delete_item(delbuf, mode, own_flag | DEL_RECURSE); ++ while ((mode = read_delay_line(delbuf, &flags)) >= 0) ++ delete_item(delbuf, mode, DEL_RECURSE | flags); if (deldelay_fd >= 0) close(deldelay_fd); } -@@ -472,7 +481,7 @@ static void delete_in_dir(struct file_li - if (!remember_delete(fp, delbuf)) - break; - } else -- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); -+ delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE); +@@ -503,6 +529,9 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) } - } + if (flist_find(cur_flist, fp) < 0) { + int flags = DEL_RECURSE ++#ifdef SUPPORT_FLAGS ++ | (fileflags_ndx && F_FFLAGS(fp) & NODELETE_FLAGS ? DEL_AN_IMMUTABLE : 0) ++#endif + | (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0); + f_name(fp, delbuf); + if (delete_during == 2) { +@@ -1316,6 +1345,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, -@@ -1178,7 +1187,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(sx.st.st_mode)) { -- if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0) -+ if (delete_item(fname, sx.st.st_mode, FILEFLAGS(sx.st.st_flags), "directory", del_opts) != 0) - return; - statret = -1; - } -@@ -1291,7 +1300,7 @@ static void recv_generator(char *fname, - } - /* Not the right symlink (or not a symlink), so - * delete it. */ -- if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0) -+ if (delete_item(fname, sx.st.st_mode, FILEFLAGS(sx.st.st_flags), "symlink", del_opts) != 0) - goto cleanup; - } else if (basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, -@@ -1368,7 +1377,7 @@ static void recv_generator(char *fname, - goto return_with_success; - goto cleanup; - } -- if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0) -+ if (delete_item(fname, sx.st.st_mode, FILEFLAGS(sx.st.st_flags), t, del_opts) != 0) - goto cleanup; - } else if (basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, -@@ -1457,7 +1466,7 @@ static void recv_generator(char *fname, - fnamecmp_type = FNAMECMP_FNAME; - - if (statret == 0 && !S_ISREG(sx.st.st_mode)) { -- if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0) -+ if (delete_item(fname, sx.st.st_mode, FILEFLAGS(sx.st.st_flags), "regular file", del_opts) != 0) - goto cleanup; - statret = -1; - stat_errno = ENOENT; ---- old/options.c -+++ new/options.c -@@ -48,6 +48,7 @@ int preserve_links = 0; - int preserve_hard_links = 0; + if (statret == 0 && sx.st.st_uid == our_uid) + del_opts |= DEL_OWNED_BY_US; ++#ifdef SUPPORT_FLAGS ++ if (statret == 0 && fileflags_ndx && sx.st.st_flags & NODELETE_FLAGS) ++ del_opts |= DEL_AN_IMMUTABLE; ++#endif + + if (S_ISDIR(file->mode)) { + if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR) +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -52,6 +52,7 @@ int preserve_hard_links = 0; int preserve_acls = 0; + int preserve_xattrs = 0; int preserve_perms = 0; +int preserve_fileflags = 0; int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -202,6 +203,7 @@ static void print_rsync_version(enum log - char const *acls = "no "; +@@ -223,6 +224,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; + char const *iconv = "no "; char const *ipv6 = "no "; -+ char const *fileflags = "no "; ++ char const *fileflags = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR -@@ -228,6 +230,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -252,6 +254,9 @@ static void print_rsync_version(enum logcode f) + #ifdef ICONV_OPTION + iconv = ""; #endif - +#ifdef SUPPORT_FLAGS + fileflags = ""; +#endif -+ - rprintf(f, "%s version %s protocol version %d\n", - RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); - rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -238,8 +244,8 @@ static void print_rsync_version(enum log + + rprintf(f, "%s version %s protocol version %d%s\n", + RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); +@@ -265,8 +270,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); -- rprintf(f, " %sappend, %sACLs\n", -- have_inplace, acls); -+ rprintf(f, " %sappend, %sACLs, %sfile-flags\n", -+ have_inplace, acls, fileflags); +- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv\n", +- have_inplace, acls, xattrs, iconv); ++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %sfile-flags\n", ++ have_inplace, acls, xattrs, iconv, fileflags); #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -305,6 +311,7 @@ void usage(enum logcode F) +@@ -333,6 +338,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"); @@ -320,7 +322,7 @@ TODO: fix --delete-delay to work with --flags option. rprintf(F," -E, --executability preserve the file's executability\n"); rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); #ifdef SUPPORT_ACLS -@@ -429,6 +436,8 @@ static struct poptOption long_options[] +@@ -473,6 +479,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 }, @@ -329,14 +331,14 @@ TODO: fix --delete-delay to work with --flags option. {"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 }, -@@ -1161,6 +1170,15 @@ int parse_arguments(int *argc, const cha +@@ -1289,6 +1297,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) } #endif +#ifndef SUPPORT_FLAGS + if (preserve_fileflags) { + snprintf(err_buf, sizeof err_buf, -+ "file flags are not supported on this %s\n", ++ "the --fileflags option is not supported on this %s\n", + am_server ? "server" : "client"); + return 0; + } @@ -345,36 +347,28 @@ TODO: fix --delete-delay to work with --flags option. if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); -@@ -1624,6 +1642,9 @@ void server_options(char **args,int *arg +@@ -1804,6 +1821,9 @@ void server_options(char **args, int *argc_p) if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; + if (preserve_fileflags) -+ args[ac++] = "--flags"; ++ args[ac++] = "--fileflags"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) goto oom; ---- old/rsync.c -+++ new/rsync.c -@@ -33,6 +33,7 @@ extern int verbose; - extern int dry_run; +diff --git a/rsync.c b/rsync.c +--- a/rsync.c ++++ b/rsync.c +@@ -32,6 +32,7 @@ extern int dry_run; extern int preserve_acls; + extern int preserve_xattrs; extern int preserve_perms; +extern int preserve_fileflags; extern int preserve_executability; extern int preserve_times; - extern int omit_dir_times; -@@ -53,6 +54,8 @@ extern int make_backups; - extern struct file_list *cur_flist, *first_flist, *dir_flist; - extern struct chmod_mode_struct *daemon_chmod_modes; - -+#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK) -+ - #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H - iconv_t ic_chck = (iconv_t)-1; - -@@ -228,6 +231,41 @@ mode_t dest_mode(mode_t flist_mode, mode + extern int am_root; +@@ -338,6 +339,41 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, return new_mode; } @@ -383,7 +377,7 @@ TODO: fix --delete-delay to work with --flags option. +static int set_fileflags(const char *fname, uint32 fileflags) +{ + if (do_chflags(fname, fileflags) != 0) { -+ rsyserr(FERROR, errno, ++ rsyserr(FERROR_XFER, errno, + "failed to set file flags on %s", + full_fname(fname)); + return 0; @@ -393,9 +387,9 @@ TODO: fix --delete-delay to work with --flags option. +} + +/* Remove immutable flags from an object, so it can be altered/removed. */ -+void make_mutable(char *fname, mode_t mode, uint32 fileflags) ++void make_mutable(const char *fname, mode_t mode, uint32 fileflags) +{ -+ if (!preserve_fileflags && S_ISLNK(mode)) ++ if (S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) @@ -403,9 +397,9 @@ TODO: fix --delete-delay to work with --flags option. +} + +/* Undo a prior make_mutable() call. */ -+void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags) ++void undo_make_mutable(const char *fname, mode_t mode, uint32 fileflags) +{ -+ if (!preserve_fileflags && S_ISLNK(mode)) ++ if (S_ISLNK(mode)) + return; + + if (fileflags & NOCHANGE_FLAGS) @@ -413,17 +407,17 @@ TODO: fix --delete-delay to work with --flags option. +} +#endif + - int set_file_attrs(char *fname, struct file_struct *file, statx *sxp, - int flags) + int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, + const char *fnamecmp, int flags) { -@@ -346,6 +384,15 @@ int set_file_attrs(char *fname, struct f +@@ -469,6 +505,15 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, } #endif +#ifdef SUPPORT_FLAGS -+ if (preserve_fileflags && !S_ISLNK(st->st_mode) -+ && st->st_flags != file->fileflags) { -+ if (!set_fileflags(fname, file->fileflags)) ++ if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode) ++ && sxp->st.st_flags != F_FFLAGS(file)) { ++ if (!set_fileflags(fname, F_FFLAGS(file))) + return 0; + updated = 1; + } @@ -432,89 +426,103 @@ TODO: fix --delete-delay to work with --flags option. if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -398,6 +445,9 @@ void finish_transfer(char *fname, char * - set_file_attrs(fnametmp, file, NULL, +@@ -530,6 +575,10 @@ int finish_transfer(const char *fname, const char *fnametmp, + set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); +#ifdef SUPPORT_FLAGS -+ make_mutable(fnametmp, file->mode, file->fileflags); ++ if (preserve_fileflags) ++ make_mutable(fnametmp, file->mode, F_FFLAGS(file)); +#endif /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); -@@ -412,6 +462,9 @@ void finish_transfer(char *fname, char * +@@ -547,6 +596,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. */ +#ifdef SUPPORT_FLAGS -+ undo_make_mutable(fname, file->mode, file->fileflags); ++ if (preserve_fileflags) ++ undo_make_mutable(fname, file->mode, F_FFLAGS(file)); +#endif - return; + return 1; } /* The file was copied, so tweak the perms of the copied file. If it ---- old/rsync.h -+++ new/rsync.h -@@ -56,6 +56,7 @@ - #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) - #define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */ - #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */ -+#define XMIT_SAME_FLAGS (1<<15) +diff --git a/rsync.h b/rsync.h +--- a/rsync.h ++++ b/rsync.h +@@ -60,6 +60,7 @@ + #define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */ + #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ + #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */ ++#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */ /* These flags are used in the live flist data. */ -@@ -389,6 +390,10 @@ enum msgcode { +@@ -451,6 +452,21 @@ typedef unsigned int size_t; #endif #endif +#ifdef HAVE_CHFLAGS +#define SUPPORT_FLAGS 1 +#endif ++ ++#ifdef SUPPORT_FLAGS ++#ifndef UF_NOUNLINK ++#define UF_NOUNLINK 0 ++#endif ++#ifndef SF_NOUNLINK ++#define SF_NOUNLINK 0 ++#endif ++#define NODELETE_FLAGS (UF_IMMUTABLE|UF_NOUNLINK|SF_IMMUTABLE|SF_NOUNLINK) ++#define NOCHANGE_FLAGS (NODELETE_FLAGS|UF_APPEND|SF_APPEND) ++#endif + /* 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. */ -@@ -570,6 +575,7 @@ struct file_struct { - extern int file_extra_cnt; - extern int preserve_uid; - extern int preserve_gid; -+extern int preserve_fileflags; - extern int preserve_acls; - - #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) -@@ -603,6 +609,7 @@ extern int preserve_acls; +@@ -619,6 +635,7 @@ extern int file_extra_cnt; + extern int inc_recurse; + extern int uid_ndx; + extern int gid_ndx; ++extern int fileflags_ndx; + extern int acls_ndx; + extern int xattrs_ndx; + +@@ -656,6 +673,7 @@ extern int xattrs_ndx; /* When the associated option is on, all entries will have these present: */ - #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum - #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum -+#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags).unum - #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum - - /* These items are per-entry optional and mutally exclusive: */ ---- old/rsync.yo -+++ new/rsync.yo -@@ -321,6 +321,7 @@ to the detailed description below for a + #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum + #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum ++#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum + #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num + #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 +--- a/rsync.yo ++++ b/rsync.yo +@@ -338,6 +338,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 -+ --flags preserve file flags ++ --fileflags preserve file-flags -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions -A, --acls preserve ACLs (implies -p) -@@ -511,7 +512,9 @@ specified, in which case bf(-r) is not i +@@ -540,7 +541,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 -specify bf(-H). -+specify bf(-H). Note also that for compatibility, bf(-a) -+currently bf(does not include --flags) (see there) to include preserving -+change file flags (if supported by the OS). ++specify bf(-H). Note also that for backward compatibility, bf(-a) ++currently does bf(not) imply the bf(--fileflags) option. 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-": -@@ -831,6 +834,13 @@ dit(bf(-A, --acls)) This option causes r - ACLs to be the same as the source ACLs. This nonstandard option only - works if the remote rsync also supports it. bf(--acls) implies bf(--perms). +@@ -922,6 +924,13 @@ 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. -+dit(bf(--flags)) This option causes rsync to update the change file flags ++dit(bf(--fileflags)) This option causes rsync to update the file-flags +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 @@ -524,9 +532,10 @@ TODO: fix --delete-delay to work with --flags option. 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 ---- old/syscall.c -+++ new/syscall.c -@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo +diff --git a/syscall.c b/syscall.c +--- a/syscall.c ++++ b/syscall.c +@@ -174,6 +174,15 @@ int do_chmod(const char *path, mode_t mode) } #endif