./configure
make
-TODO: fix --delete-delay to work with --flags option.
-
+--- old/compat.c
++++ new/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)
+ gid_ndx = ++file_extra_cnt;
++ if (preserve_fileflags)
++ fileflags_ndx = ++file_extra_cnt;
+ if (preserve_acls && !am_sender)
+ acls_ndx = ++file_extra_cnt;
+ if (preserve_xattrs)
--- old/configure.in
+++ new/configure.in
-@@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -544,7 +544,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
-- strerror putenv iconv_open locale_charset nl_langinfo \
-+ chflags strerror putenv iconv_open locale_charset nl_langinfo \
- sigaction sigprocmask)
+- 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)
AC_CHECK_FUNCS(getpgrp tcgetpgrp)
--- old/flist.c
+++ new/flist.c
-@@ -44,6 +44,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;
-+extern int preserve_fileflags;
- extern int preserve_uid;
- extern int preserve_gid;
- extern int relative_paths;
-@@ -312,6 +313,9 @@ static void send_file_entry(struct file_
- unsigned short flags;
++extern int fileflags_ndx;
+ extern int uid_ndx;
+ extern int gid_ndx;
+ extern int eol_nulls;
+@@ -339,6 +340,9 @@ static void send_file_entry(int f, struc
+ {
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;
-@@ -342,6 +346,12 @@ static void send_file_entry(struct file_
- flags |= XMIT_SAME_MODE;
+ #endif
+@@ -397,6 +401,12 @@ static void send_file_entry(int f, struc
+ xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
+#ifdef SUPPORT_FLAGS
-+ if (file->fileflags == fileflags)
-+ flags |= XMIT_SAME_FLAGS;
++ if (F_FFLAGS(file) == fileflags)
++ xflags |= XMIT_SAME_FLAGS;
+ else
-+ fileflags = file->fileflags;
++ fileflags = F_FFLAGS(file);
+#endif
+
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
- if (protocol_version < 28) {
-@@ -428,6 +438,10 @@ static void send_file_entry(struct file_
- write_int(f, modtime);
- if (!(flags & XMIT_SAME_MODE))
+@@ -517,6 +527,10 @@ static void send_file_entry(int f, struc
+ }
+ 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)) {
- if (!numeric_ids)
- add_uid(uid);
-@@ -496,6 +510,9 @@ static struct file_struct *recv_file_ent
+ if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
+ if (protocol_version < 30)
+ write_int(f, uid);
+@@ -605,6 +619,9 @@ static struct file_struct *recv_file_ent
{
- 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;
-@@ -570,9 +587,12 @@ static struct file_struct *recv_file_ent
- modtime = (time_t)read_int(f);
- if (!(flags & XMIT_SAME_MODE))
+ #endif
+@@ -736,9 +753,12 @@ static struct file_struct *recv_file_ent
+ }
+ if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
-
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_int(f);
-@@ -650,6 +670,10 @@ static struct file_struct *recv_file_ent
+ if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
+ if (protocol_version < 30)
+@@ -858,6 +878,10 @@ static struct file_struct *recv_file_ent
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)
- F_UID(file) = uid;
- if (preserve_gid)
-@@ -927,6 +951,10 @@ struct file_struct *make_file(const char
+ if (uid_ndx)
+ F_OWNER(file) = uid;
+ if (gid_ndx) {
+@@ -1182,6 +1206,10 @@ struct file_struct *make_file(const char
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)
- F_UID(file) = st.st_uid;
- if (preserve_gid)
+ if (uid_ndx)
+ F_OWNER(file) = st.st_uid;
+ if (gid_ndx)
--- old/generator.c
+++ new/generator.c
-@@ -102,6 +102,12 @@ static char *deldelay_buf = NULL;
- static int deldelay_fd = -1;
- static BOOL solo_file = 0;
+@@ -112,6 +112,14 @@ static int need_retouch_dir_times;
+ static int need_retouch_dir_perms;
+ static const char *solo_file = NULL;
+#ifdef SUPPORT_FLAGS
-+#define FILEFLAGS(ff) ff
++#define FF_PTR(p) F_FFLAGS(p)
++#define FF_STAT(s) s.st_flags
+#else
-+#define FILEFLAGS(ff) 0
++#define FF_PTR(p) 0
++#define FF_STAT(s) 0
+#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 */
-@@ -117,7 +123,6 @@ enum delret {
+@@ -127,7 +135,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;
-@@ -130,17 +135,20 @@ static int is_backup_file(char *fn)
+@@ -140,17 +147,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.)
*/
if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
ignore_perishable = 1;
/* If DEL_RECURSE is not set, this just reports emptiness. */
-@@ -252,7 +260,7 @@ static enum delret delete_dir_contents(c
+@@ -262,7 +272,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)
++ if (delete_item(fname, fp->mode, FF_PTR(fp), NULL, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
-@@ -308,8 +316,9 @@ static int remember_delete(struct file_s
-
+@@ -318,8 +328,9 @@ static int remember_delete(struct file_s
+
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),
++ (int)file->mode, (int)FF_PTR(file),
+ fname, '\0');
if ((deldelay_cnt += len) <= deldelay_size)
break;
if (deldelay_fd < 0 && !start_delete_delay_temp())
-@@ -322,7 +331,7 @@ static int remember_delete(struct file_s
+@@ -332,7 +343,7 @@ static int remember_delete(struct file_s
return 1;
}
{
static int read_pos = 0;
int j, len, mode;
-@@ -364,7 +373,7 @@ static int read_delay_line(char *buf)
+@@ -374,12 +385,12 @@ static int read_delay_line(char *buf)
bp = deldelay_buf + read_pos;
invalid_data:
rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
return -1;
-@@ -387,15 +396,15 @@ static int read_delay_line(char *buf)
+ }
+- past_space = strchr(bp, ' ') + 1;
++ past_space = strchr(strchr(bp, ' ') + 1, ' ') + 1;
+ len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */
+ read_pos = j + 1;
+
+@@ -397,15 +408,15 @@ static int read_delay_line(char *buf)
static void do_delayed_deletions(char *delbuf)
{
if (deldelay_fd >= 0)
close(deldelay_fd);
}
-@@ -476,7 +485,7 @@ static void delete_in_dir(struct file_li
+@@ -472,7 +483,7 @@ static void delete_in_dir(char *fbuf, st
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);
++ delete_item(delbuf, fp->mode, FF_PTR(fp), NULL, DEL_RECURSE);
}
}
-@@ -1177,7 +1186,7 @@ static void recv_generator(char *fname,
+@@ -1296,7 +1307,7 @@ static void recv_generator(char *fname,
+ * full later (right before we handle its contents). */
+ if (statret == 0
+ && (S_ISDIR(sx.st.st_mode)
+- || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0))
++ || delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0))
+ goto cleanup; /* Any errors get reported later. */
+ if (do_mkdir(fname, file->mode & 0700) == 0)
+ file->flags |= FLAG_DIR_CREATED;
+@@ -1308,7 +1319,7 @@ static void recv_generator(char *fname,
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
- if (statret == 0 && !S_ISDIR(st.st_mode)) {
-- if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
-+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "directory", del_opts) != 0)
- return;
+ 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, FF_STAT(sx.st), "directory", del_opts) != 0)
+ goto skipping_dir_contents;
statret = -1;
}
-@@ -1275,7 +1284,7 @@ static void recv_generator(char *fname,
+@@ -1437,7 +1448,7 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
-- if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
-+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "symlink", del_opts) != 0)
- return;
+- if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
++ if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "symlink", del_opts) != 0)
+ goto cleanup;
} else if (basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -1354,7 +1363,7 @@ static void recv_generator(char *fname,
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
+@@ -1516,7 +1527,7 @@ static void recv_generator(char *fname,
goto return_with_success;
- return;
+ goto cleanup;
}
-- if (delete_item(fname, st.st_mode, t, del_opts) != 0)
-+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), t, del_opts) != 0)
- return;
+- if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
++ if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), t, del_opts) != 0)
+ goto cleanup;
} else if (basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -1445,7 +1454,7 @@ static void recv_generator(char *fname,
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
+@@ -1607,7 +1618,7 @@ static void recv_generator(char *fname,
fnamecmp_type = FNAMECMP_FNAME;
- if (statret == 0 && !S_ISREG(st.st_mode)) {
-- if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
-+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "regular file", del_opts) != 0)
- return;
+ 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, FF_STAT(sx.st), "regular file", del_opts) != 0)
+ goto cleanup;
statret = -1;
stat_errno = ENOENT;
--- old/options.c
+++ new/options.c
-@@ -48,6 +48,7 @@ int copy_links = 0;
- int preserve_links = 0;
- int preserve_hard_links = 0;
+@@ -51,6 +51,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;
-@@ -201,6 +202,7 @@ static void print_rsync_version(enum log
- char const *hardlinks = "no ";
+@@ -221,6 +222,7 @@ static void print_rsync_version(enum log
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
-@@ -223,6 +225,10 @@ static void print_rsync_version(enum log
- ipv6 = "";
+ #if SUBPROTOCOL_VERSION != 0
+@@ -250,6 +252,9 @@ static void print_rsync_version(enum log
+ #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-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -233,8 +239,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);
+@@ -263,8 +268,8 @@ static void print_rsync_version(enum log
(int)(sizeof (int64) * 8));
rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
got_socketpair, hardlinks, links, ipv6, have_inplace);
-- rprintf(f, " %sappend\n",
-- have_inplace);
-+ rprintf(f, " %sappend, %sfile-flags\n",
-+ have_inplace, 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());
-@@ -300,6 +306,7 @@ void usage(enum logcode F)
+@@ -331,6 +336,7 @@ void usage(enum logcode F)
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -p, --perms preserve permissions\n");
+ rprintf(F," --fileflags preserve file-flags\n");
rprintf(F," -E, --executability preserve the file's executability\n");
rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
- rprintf(F," -o, --owner preserve owner (super-user only)\n");
-@@ -421,6 +428,8 @@ static struct poptOption long_options[]
+ #ifdef SUPPORT_ACLS
+@@ -470,6 +476,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 },
+ {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 },
+ {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 },
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
- {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
- {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
-@@ -1126,6 +1135,15 @@ int parse_arguments(int *argc, const cha
+ {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
+ {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
+@@ -1284,6 +1292,15 @@ int parse_arguments(int *argc_p, const c
}
#endif
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
-@@ -1223,6 +1241,8 @@ int parse_arguments(int *argc, const cha
- preserve_uid = ++flist_extra_cnt;
- if (preserve_gid)
- preserve_gid = ++flist_extra_cnt;
-+ if (preserve_fileflags)
-+ preserve_fileflags = ++flist_extra_cnt;
-
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
-@@ -1585,6 +1605,9 @@ void server_options(char **args,int *arg
+@@ -1792,6 +1809,9 @@ void server_options(char **args, int *ar
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
goto oom;
--- old/rsync.c
+++ new/rsync.c
-@@ -30,9 +30,12 @@
- #include <langinfo.h>
- #endif
-
-+#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK)
-+
- extern int verbose;
- extern int dry_run;
+@@ -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;
-@@ -176,6 +179,41 @@ mode_t dest_mode(mode_t flist_mode, mode
+ extern int am_root;
+@@ -60,6 +61,16 @@ iconv_t ic_chck = (iconv_t)-1;
+ iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
+ # endif
+
++#ifdef SUPPORT_FLAGS
++#ifndef UF_NOUNLINK
++#define UF_NOUNLINK 0
++#endif
++#ifndef SF_NOUNLINK
++#define SF_NOUNLINK 0
++#endif
++#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK)
++#endif
++
+ static const char *default_charset(void)
+ {
+ # if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
+@@ -337,6 +348,41 @@ mode_t dest_mode(mode_t flist_mode, mode
return new_mode;
}
+}
+
+/* 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))
+ return;
+}
+
+/* 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))
+ return;
+}
+#endif
+
- int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
- int flags)
+ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ const char *fnamecmp, int flags)
{
-@@ -274,6 +312,15 @@ int set_file_attrs(char *fname, struct f
+@@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, st
}
#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;
+ }
if (verbose > 1 && flags & ATTRS_REPORT) {
if (updated)
rprintf(FCLIENT, "%s\n", fname);
-@@ -321,6 +368,9 @@ void finish_transfer(char *fname, char *
- set_file_attrs(fnametmp, file, NULL,
+@@ -527,6 +582,9 @@ void finish_transfer(const char *fname,
+ 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);
++ 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);
-@@ -335,6 +385,9 @@ void finish_transfer(char *fname, char *
+@@ -541,6 +599,9 @@ void finish_transfer(const char *fname,
}
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);
++ undo_make_mutable(fname, file->mode, F_FFLAGS(file));
+#endif
return;
}
/* The file was copied, so tweak the perms of the copied file. If it
--- old/rsync.h
+++ new/rsync.h
-@@ -54,6 +54,7 @@
- #define XMIT_HAS_IDEV_DATA (1<<9)
- #define XMIT_SAME_DEV (1<<10)
- #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
-+#define XMIT_SAME_FLAGS (1<<12)
+@@ -57,6 +57,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. */
-@@ -348,6 +349,10 @@ enum msgcode {
- #define schar char
+@@ -441,6 +442,10 @@ typedef unsigned int size_t;
+ #endif
#endif
+#ifdef HAVE_CHFLAGS
/* 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. */
-@@ -553,6 +558,7 @@ extern int preserve_gid;
+@@ -608,6 +613,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;
+
+@@ -645,6 +651,7 @@ extern int xattrs_ndx;
/* When the associated option is on, all entries will have these present: */
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
-+#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags).num
-
- /* These items are per-entry optional and mutally exclusive: */
- #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
+ #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
--- old/rsync.yo
+++ new/rsync.yo
-@@ -321,6 +321,7 @@ to the detailed description below for a
+@@ -338,6 +338,7 @@ to the detailed description below for a
-K, --keep-dirlinks treat symlinked dir on receiver as dir
-H, --hard-links preserve hard links
-p, --perms preserve permissions
+ --flags preserve file flags
-E, --executability preserve executability
--chmod=CHMOD affect file and/or directory permissions
- -o, --owner preserve owner (super-user only)
-@@ -510,7 +511,9 @@ specified, in which case bf(-r) is not i
+ -A, --acls preserve ACLs (implies -p)
+@@ -539,7 +540,9 @@ specified, in which case bf(-r) is not i
Note that bf(-a) bf(does not preserve hardlinks), because
finding multiply-linked files is expensive. You must separately
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-":
-@@ -805,6 +808,13 @@ quote(itemization(
-
- If bf(--perms) is enabled, this option is ignored.
+@@ -908,6 +911,13 @@ super-user copies all namespaces except
+ 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
+to be the same as the source file, if your OS supports the bf(chflags)(2)
transfer. The resulting value is treated as though it was the permissions
--- old/syscall.c
+++ new/syscall.c
-@@ -153,6 +153,15 @@ int do_chmod(const char *path, mode_t mo
+@@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mo
}
#endif
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff