This patch provides --flags, which preserves the st_flags field. Modified from a patch that was written by Rolf Grossmann: http://www.progtech.net/rsync.flags-patch --- old/configure.in +++ new/configure.in @@ -527,7 +527,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) AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c +++ new/flist.c @@ -44,6 +44,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; +extern int preserve_flags; extern int preserve_uid; extern int preserve_gid; extern int relative_paths; @@ -299,6 +300,9 @@ static void send_file_entry(struct file_ unsigned short flags; static time_t modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS + static uint32 fileflags; +#endif static int64 dev; static dev_t rdev; static uint32 rdev_major; @@ -329,6 +333,12 @@ static void send_file_entry(struct file_ flags |= XMIT_SAME_MODE; else mode = file->mode; +#ifdef SUPPORT_FLAGS + if (file->fileflags == fileflags) + flags |= XMIT_SAME_FLAGS; + else + fileflags = file->fileflags; +#endif if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { @@ -412,6 +422,10 @@ static void send_file_entry(struct file_ write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FLAGS + if (preserve_flags && !(flags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); @@ -479,6 +493,9 @@ static struct file_struct *receive_file_ { static time_t modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS + static uint32 fileflags; +#endif static int64 dev; static dev_t rdev; static uint32 rdev_major; @@ -552,9 +569,12 @@ static struct file_struct *receive_file_ modtime = (time_t)read_int(f); if (!(flags & 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_flags && !(flags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); @@ -605,6 +625,9 @@ static struct file_struct *receive_file_ file->modtime = modtime; file->length = file_length; file->mode = mode; +#ifdef SUPPORT_FLAGS + file->fileflags = fileflags; +#endif file->uid = uid; file->gid = gid; @@ -857,6 +880,9 @@ struct file_struct *make_file(char *fnam file->modtime = st.st_mtime; file->length = st.st_size; file->mode = st.st_mode; +#ifdef SUPPORT_FLAGS + file->fileflags = st.st_flags; +#endif file->uid = st.st_uid; file->gid = st.st_gid; --- old/generator.c +++ new/generator.c @@ -123,6 +123,9 @@ static int delete_item(char *fname, int if (!S_ISDIR(mode)) { if (max_delete && ++deletion_count > max_delete) return 0; +#ifdef SUPPORT_FLAGS + make_mutable(fname); +#endif if (make_backups && (backup_dir || !is_backup_file(fname))) ok = make_backup(fname); else @@ -147,10 +150,17 @@ static int delete_item(char *fname, int ok = 0; errno = ENOTEMPTY; } else if (make_backups && !backup_dir && !is_backup_file(fname) - && !(flags & DEL_FORCE_RECURSE)) + && !(flags & DEL_FORCE_RECURSE)) { +#ifdef SUPPORT_FLAGS + make_mutable(fname); +#endif ok = make_backup(fname); - else + } else { +#ifdef SUPPORT_FLAGS + make_mutable(fname); +#endif ok = do_rmdir(fname) == 0; + } if (ok) { if (!(flags & DEL_TERSE)) log_delete(fname, mode); --- old/options.c +++ new/options.c @@ -48,6 +48,7 @@ int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_perms = 0; +int preserve_flags = 0; int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; @@ -200,6 +201,7 @@ static void print_rsync_version(enum log char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; + char const *flags = "no "; STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR @@ -222,6 +224,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif +#ifdef SUPPORT_FLAGS + flags = ""; +#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"); @@ -234,9 +240,9 @@ static void print_rsync_version(enum log /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ - rprintf(f, " %sinplace, %sIPv6, " + rprintf(f, " %sinplace, %sIPv6, %sfile flags, " "%d-bit system inums, %d-bit internal inums\n", - have_inplace, ipv6, + have_inplace, ipv6, flags, (int) (sizeof dumstat->st_ino * 8), (int) (sizeof (int64) * 8)); #ifdef MAINTAINER_MODE @@ -302,6 +308,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," --flags 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"); @@ -420,6 +427,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 }, + {"flags", 0, POPT_ARG_VAL, &preserve_flags, 1, 0, 0 }, + {"no-flags", 0, POPT_ARG_VAL, &preserve_flags, 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 }, @@ -1123,6 +1132,15 @@ int parse_arguments(int *argc, const cha } #endif +#ifndef SUPPORT_FLAGS + if (preserve_flags) { + snprintf(err_buf, sizeof err_buf, + "file flags are not supported on this %s\n", + am_server ? "server" : "client"); + return 0; + } +#endif + if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); @@ -1580,6 +1598,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; + if (preserve_flags) + args[ac++] = "--flags"; + 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; extern int preserve_perms; +extern int preserve_flags; extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; @@ -221,6 +222,19 @@ int set_file_attrs(char *fname, struct f } #endif +#ifdef SUPPORT_FLAGS + if (preserve_flags && !S_ISLNK(st->st_mode) + && st->st_flags != file->fileflags) { + if (do_chflags(fname, file->fileflags) != 0) { + rsyserr(FERROR, errno, + "failed to set file flags on %s", + full_fname(fname)); + return 0; + } + updated = 1; + } +#endif + if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); @@ -254,6 +268,10 @@ void finish_transfer(char *fname, char * { int ret; +#ifdef SUPPORT_FLAGS + make_mutable(fname); /* XXX */ +#endif + if (inplace) { if (verbose > 2) rprintf(FINFO, "finishing %s\n", fname); @@ -307,3 +325,21 @@ const char *who_am_i(void) return am_server ? "server" : "client"; return am_sender ? "sender" : am_generator ? "generator" : "receiver"; } + +#ifdef SUPPORT_FLAGS +/* remove immutable flags from an object, so it can be altered/removed. */ +void make_mutable(char *fname) +{ +#define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | UF_NOUNLINK | SF_IMMUTABLE | SF_APPEND | SF_NOUNLINK) + STRUCT_STAT stb; + + if (dry_run) + return; + + /* XXX get rid of this extra stat() */ + if (do_lstat(fname, &stb) < 0) + return; + if (stb.st_flags & NOCHANGEBITS) + do_chflags(fname, stb.st_flags & ~NOCHANGEBITS); +} +#endif --- 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) /* These flags are used in the live flist data. */ @@ -344,6 +345,10 @@ enum msgcode { #define schar char #endif +#ifdef HAVE_CHFLAGS +#define SUPPORT_FLAGS 1 +#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. */ @@ -526,6 +531,9 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; +#ifdef SUPPORT_FLAGS + uint32 fileflags; +#endif uid_t uid; gid_t gid; mode_t mode; --- old/rsync.yo +++ new/rsync.yo @@ -320,6 +320,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) @@ -503,7 +504,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 -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). 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-": @@ -798,6 +801,13 @@ quote(itemize( If bf(--perms) is enabled, this option is ignored. +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 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 +super-user and can only be unset below a certain secure-level (usually +single-user mode). + 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 } #endif +#ifdef SUPPORT_FLAGS +int do_chflags(const char *path, u_long flags) +{ + if (dry_run) return 0; + RETURN_ERROR_IF_RO_OR_LO; + return chflags(path, flags); +} +#endif + int do_rename(const char *fname1, const char *fname2) { if (dry_run) return 0;