./configure (optional if already run)
make
-based-on: e6cfebb578924fb1dd331aba95c7616e1f196f87
+based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -38,12 +38,14 @@ extern int checksum_seed;
+@@ -40,6 +40,7 @@ extern int checksum_seed;
extern int basis_dir_cnt;
extern int prune_empty_dirs;
extern int protocol_version;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
- extern int preserve_atimes;
+@@ -47,6 +48,7 @@ extern int preserve_atimes;
+ extern int preserve_crtimes;
extern int preserve_acls;
extern int preserve_xattrs;
+extern int preserve_fileflags;
extern int xfer_flags_as_varint;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
-@@ -74,7 +76,7 @@ int inplace_partial = 0;
- int do_negotiated_strings = 0;
+@@ -86,7 +88,7 @@ struct name_num_item *xattr_sum_nni;
+ int xattr_sum_len = 0;
/* These index values are for the file-list's extra-attribute array. */
--int pathname_ndx, depth_ndx, atimes_ndx, uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
-+int pathname_ndx, depth_ndx, atimes_ndx, uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+-int pathname_ndx, depth_ndx, atimes_ndx, crtimes_ndx, uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
++int pathname_ndx, depth_ndx, atimes_ndx, crtimes_ndx, 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 */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
-@@ -468,6 +470,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -588,6 +590,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_acls && !am_sender)
acls_ndx = ++file_extra_cnt;
if (preserve_xattrs)
-@@ -623,6 +627,10 @@ void setup_protocol(int f_out,int f_in)
- want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
- proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
- xfer_flags_as_varint = compat_flags & CF_VARINT_FLIST_FLAGS ? 1 : 0;
+@@ -751,6 +755,10 @@ void setup_protocol(int f_out,int f_in)
+ fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --crtimes.\n");
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ if (!xfer_flags_as_varint && preserve_fileflags) {
+ fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --fileflags.\n");
+ exit_cleanup(RERR_PROTOCOL);
extern int delete_during;
extern int missing_args;
extern int eol_nulls;
-@@ -382,6 +383,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
- {
- static time_t modtime, atime;
+@@ -388,6 +389,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ static time_t crtime;
+ #endif
static mode_t mode;
+#ifdef SUPPORT_FILEFLAGS
+ static uint32 fileflags;
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
-@@ -425,6 +429,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -431,6 +435,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
if (preserve_devices && IS_DEVICE(mode)) {
if (protocol_version < 28) {
-@@ -575,6 +587,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
- write_varint(f, F_MOD_NSEC(file));
+@@ -592,6 +604,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ #endif
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
+#ifdef SUPPORT_FILEFLAGS
if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
write_varlong(f, atime, 4);
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
-@@ -666,6 +682,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
- {
- static int64 modtime, atime;
+@@ -686,6 +702,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+ static time_t crtime;
+ #endif
static mode_t mode;
+#ifdef SUPPORT_FILEFLAGS
+ static uint32 fileflags;
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
-@@ -775,6 +794,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
- mode = first->mode;
- if (atimes_ndx && !S_ISDIR(mode))
- atime = F_ATIME(first);
+@@ -803,6 +822,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+ #ifdef SUPPORT_CRTIMES
+ if (crtimes_ndx)
+ crtime = F_CRTIME(first);
++#endif
+#ifdef SUPPORT_FILEFLAGS
+ if (preserve_fileflags)
+ fileflags = F_FFLAGS(first);
-+#endif
+ #endif
if (preserve_uid)
uid = F_OWNER(first);
- if (preserve_gid)
-@@ -826,6 +849,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -876,6 +899,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);
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
-@@ -984,6 +1011,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -1057,6 +1084,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
}
#endif
file->mode = mode;
if (preserve_uid)
F_OWNER(file) = uid;
if (preserve_gid) {
-@@ -1383,6 +1414,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1470,6 +1501,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
}
#endif
file->mode = st.st_mode;
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -43,8 +43,10 @@ extern int write_devices;
+@@ -43,10 +43,12 @@ extern int preserve_devices;
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_executability;
+extern int preserve_fileflags;
extern int preserve_perms;
- extern int preserve_times;
+ extern int preserve_mtimes;
+ extern int omit_dir_times;
+ extern int omit_link_times;
+extern int force_change;
extern int delete_mode;
extern int delete_before;
extern int delete_during;
-@@ -474,6 +476,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+@@ -486,6 +488,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
return 0;
if (perms_differ(file, sxp))
return 0;
if (ownership_differs(file, sxp))
return 0;
#ifdef SUPPORT_ACLS
-@@ -527,6 +533,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -547,6 +553,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
iflags |= ITEM_REPORT_OWNER;
if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
-@@ -1413,6 +1424,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1454,6 +1465,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!preserve_perms) { /* See comment in non-dir code below. */
file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0);
}
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code);
if (j == -2) {
-@@ -1455,10 +1470,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1496,10 +1511,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
* readable and writable permissions during the time we are
* putting files within them. This is then restored to the
* former permissions after the transfer is done. */
rsyserr(FERROR_XFER, errno,
"failed to modify permissions on %s",
full_fname(fname));
-@@ -1493,6 +1513,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
- int exists = statret == 0 && !S_ISDIR(sx.st.st_mode);
+@@ -1534,6 +1554,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ int exists = statret == 0 && stype != FT_DIR;
file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, exists);
}
+#ifdef SUPPORT_FORCE_CHANGE
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
-@@ -2073,17 +2097,25 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+@@ -2107,17 +2131,25 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
continue;
fname = f_name(file, NULL);
if (fix_dir_perms)
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
-@@ -720,7 +720,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
- : S_ISLNK(file->mode) ? 'U' : 'u';
+@@ -725,7 +725,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+ : iflags & ITEM_REPORT_ATIME ? 'u' : 'n';
c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
- c[11] = '\0';
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -27,6 +27,9 @@
- #include <locale.h>
+@@ -31,6 +31,9 @@
+ #ifdef __TANDEM
+ #include <floss.h(floss_execlp)>
#endif
- #include <popt.h>
+#ifdef SUPPORT_FORCE_CHANGE
+#include <sys/sysctl.h>
+#endif
extern int dry_run;
extern int list_only;
-@@ -53,6 +56,7 @@ extern int copy_unsafe_links;
- extern int keep_dirlinks;
- extern int preserve_hard_links;
- extern int protocol_version;
+@@ -49,6 +52,7 @@ extern int need_messages_from_generator;
+ extern int kluge_around_eof;
+ extern int got_xfer_error;
+ extern int old_style_args;
+extern int force_change;
- extern int file_total;
- extern int recurse;
- extern int xfer_dirs;
-@@ -951,6 +955,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
+ extern int msgs2stderr;
+ extern int module_id;
+ extern int read_only;
+@@ -966,6 +970,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
* points to an identical file won't be replaced by the referent. */
copy_links = copy_dirlinks = copy_unsafe_links = 0;
int preserve_executability = 0;
int preserve_devices = 0;
int preserve_specials = 0;
-@@ -92,6 +93,7 @@ int numeric_ids = 0;
- int msgs2stderr = 0;
+@@ -98,6 +99,7 @@ int msgs2stderr = 2; /* Default: send errors to stderr for local & remote-shell
+ int saw_stderr_opt = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
+int force_change = 0;
int io_timeout = 0;
int prune_empty_dirs = 0;
int use_qsort = 0;
-@@ -640,6 +642,11 @@ static void print_capabilities(enum logcode f)
- #endif
- "prealloc",
-
-+#ifndef SUPPORT_FILEFLAGS
-+ "no "
-+#endif
-+ "file-flags",
-+
- "*" /* All options after this point are hidden w/o -V -V */
- #ifndef HAVE_SIMD
- "no "
-@@ -801,6 +808,8 @@ static struct poptOption long_options[] = {
+@@ -622,6 +624,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 },
{"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 },
-@@ -894,6 +903,12 @@ static struct poptOption long_options[] = {
+@@ -720,6 +724,12 @@ 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 },
{"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 },
-@@ -1177,6 +1192,14 @@ static void set_refuse_options(void)
- #ifndef HAVE_SETVBUF
- parse_one_refuse_match(0, "outbuf", list_end);
+@@ -1015,6 +1025,14 @@ static void set_refuse_options(void)
+ #ifndef SUPPORT_CRTIMES
+ parse_one_refuse_match(0, "crtimes", list_end);
#endif
+#ifndef SUPPORT_FILEFLAGS
+ parse_one_refuse_match(0, "fileflags", list_end);
/* Now we use the descrip values to actually mark the options for refusal. */
for (op = long_options; op != list_end; op++) {
-@@ -2628,6 +2651,9 @@ void server_options(char **args, int *argc_p)
+@@ -2712,6 +2730,9 @@ void server_options(char **args, int *argc_p)
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
goto oom;
-@@ -2731,6 +2757,16 @@ void server_options(char **args, int *argc_p)
+@@ -2807,6 +2828,16 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -360,6 +360,7 @@ detailed description below for a complete description.
+@@ -410,6 +410,7 @@ has its own detailed description later in this manpage.
--keep-dirlinks, -K treat symlinked dir on receiver as dir
--hard-links, -H preserve hard links
--perms, -p preserve permissions
--executability, -E preserve executability
--chmod=CHMOD affect file and/or directory permissions
--acls, -A preserve ACLs (implies --perms)
-@@ -399,7 +400,10 @@ detailed description below for a complete description.
+@@ -451,7 +452,10 @@ has its own detailed description later in this manpage.
--ignore-missing-args ignore missing source args without error
--delete-missing-args delete missing source args from destination
--ignore-errors delete even if there are I/O errors
--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
-@@ -697,6 +701,8 @@ your home directory (remove the '=' for that).
-
- Note that `-a` **does not preserve hardlinks**, because finding
- multiply-linked files is expensive. You must separately specify `-H`.
-+ Note also that for backward compatibility, `-a` currently does **not**
-+ imply the `--fileflags` option.
-
- 0. `--no-OPTION`
+@@ -795,6 +799,7 @@ expand it.
+ recursion and want to preserve almost everything. Be aware that it does
+ **not** include preserving ACLs (`-A`), xattrs (`-X`), atimes (`-U`),
+ crtimes (`-N`), nor the finding and preserving of hardlinks (`-H`).
++ It also does **not** imply [`--fileflags`](#opt).
-@@ -1035,7 +1041,7 @@ your home directory (remove the '=' for that).
+ The only exception to the above equivalence is when [`--files-from`](#opt)
+ is specified, in which case [`-r`](#opt) is not implied.
+@@ -1254,7 +1259,7 @@ expand it.
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
-- `--force` or `--delete` is in effect).
-+ `--force-delete` or `--delete` is in effect).
+- [`--force`](#opt) or [`--delete`](#opt) is in effect).
++ [`--force-delete`](#opt) or [`--delete`](#opt) is in effect).
- See also `--keep-dirlinks` for an analogous option for the receiving side.
+ See also [`--keep-dirlinks`](#opt) for an analogous option for the
+ receiving side.
+@@ -1449,6 +1454,37 @@ expand it.
+ those used by [`--fake-super`](#opt)) unless you repeat the option (e.g. `-XX`).
+ This "copy all xattrs" mode cannot be used with [`--fake-super`](#opt).
-@@ -1221,6 +1227,29 @@ your home directory (remove the '=' for that).
- those used by `--fake-super`) unless you repeat the option (e.g. `-XX`).
- This "copy all xattrs" mode cannot be used with `--fake-super`.
-
-+0. `--fileflags` This option causes rsync to update the file-flags to be the
-+ same as the source files and directories (if your OS supports the
-+ **chflags**(2) system call). Some flags can only be altered by the
-+ super-user and some might only be unset below a certain secure-level
-+ (usually single-user mode). It will not make files alterable that are set
-+ to immutable on the receiver. To do that, see `--force-change`,
-+ `--force-uchange`, and `--force-schange`.
++0. `--fileflags`
++
++ This option causes rsync to update the file-flags to be the same as the
++ source files and directories (if your OS supports the **chflags**(2) system
++ call). Some flags can only be altered by the super-user and some might
++ only be unset below a certain secure-level (usually single-user mode). It
++ will not make files alterable that are set to immutable on the receiver.
++ To do that, see [`--force-change`](#opt), [`--force-uchange`](#opt), and
++ [`--force-schange`](#opt).
+
-+0. `--force-change` This option causes rsync to disable both user-immutable
-+ and system-immutable flags on files and directories that are being updated
-+ or deleted on the receiving side. This option overrides `--force-uchange`
-+ and `--force-schange`.
++0. `--force-change`
+
-+0. `--force-uchange` This option causes rsync to disable user-immutable flags
-+ on files and directories that are being updated or deleted on the receiving
-+ side. It does not try to affect system flags. This option overrides
-+ `--force-change` and `--force-schange`.
++ This option causes rsync to disable both user-immutable and
++ system-immutable flags on files and directories that are being updated or
++ deleted on the receiving side. This option overrides
++ [`--force-uchange`](#opt) and [`--force-schange`](#opt).
+
-+0. `--force-schange` This option causes rsync to disable system-immutable
-+ flags on files and directories that are being updated or deleted on the
-+ receiving side. It does not try to affect user flags. This option
-+ overrides `--force-change` and `--force-uchange`.
++0. `--force-uchange`
+
- 0. `--chmod`
++ This option causes rsync to disable user-immutable flags on files and
++ directories that are being updated or deleted on the receiving side. It
++ does not try to affect system flags. This option overrides
++ [`--force-change`](#opt) and [`--force-schange`](#opt).
++
++0. `--force-schange`
++
++ This option causes rsync to disable system-immutable flags on files and
++ directories that are being updated or deleted on the receiving side. It
++ does not try to affect user flags. This option overrides
++ [`--force-change`](#opt) and [`--force-uchange`](#opt).
++
+ 0. `--chmod=CHMOD`
This option tells rsync to apply one or more comma-separated "chmod" modes
-@@ -1680,7 +1709,7 @@ your home directory (remove the '=' for that).
- option a step farther: each missing arg will become a deletion request of
- the corresponding destination file on the receiving side (should it exist).
- If the destination file is a non-empty directory, it will only be
-- successfully deleted if `--force` or `--delete` are in effect. Other than
-+ successfully deleted if `--force-delee` or `--delete` are in effect. Other than
- that, this option is independent of any other type of delete processing.
+@@ -1969,8 +2005,8 @@ expand it.
+ [`--ignore-missing-args`](#opt) option a step farther: each missing arg
+ will become a deletion request of the corresponding destination file on the
+ receiving side (should it exist). If the destination file is a non-empty
+- directory, it will only be successfully deleted if [`--force`](#opt) or
+- [`--delete`](#opt) are in effect. Other than that, this option is
++ directory, it will only be successfully deleted if [`--force-delete`](#opt)
++ or [`--delete`](#opt) are in effect. Other than that, this option is
+ independent of any other type of delete processing.
The missing source files are represented by special file-list entries which
-@@ -1691,15 +1720,16 @@ your home directory (remove the '=' for that).
- Tells `--delete` to go ahead and delete files even when there are I/O
- errors.
+@@ -1981,14 +2017,14 @@ expand it.
+ Tells [`--delete`](#opt) to go ahead and delete files even when there are
+ I/O errors.
-0. `--force`
-+0. `--force-delee`
++0. `--force-delete`, `--force`
This option tells rsync to delete a non-empty directory when it is to be
replaced by a non-directory. This is only relevant if deletions are not
- active (see `--delete` for details).
+ active (see [`--delete`](#opt) for details).
- Note for older rsync versions: `--force` used to still be required when
-- using `--delete-after`, and it used to be non-functional unless the
-- `--recursive` option was also enabled.
-+ This option can be abbreviated `--force` for backward compatibility. Note
-+ that some older rsync versions used to still require `--force` when using
-+ `--delete-after`, and it used to be non-functional unless the `--recursive`
-+ option was also enabled.
+- using [`--delete-after`](#opt), and it used to be non-functional unless the
++ Note that some older rsync versions used to require `--force` when using
++ [`--delete-after`](#opt), and it used to be non-functional unless the
+ [`--recursive`](#opt) option was also enabled.
0. `--max-delete=NUM`
-
-@@ -2540,7 +2570,7 @@ your home directory (remove the '=' for that).
- output of other verbose messages).
+@@ -3046,7 +3082,7 @@ expand it.
+ also turns on the output of other verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
- format is like the string `YXcstpoguax`, where **Y** is replaced by the type
extern int preserve_perms;
+extern int preserve_fileflags;
extern int preserve_executability;
- extern int preserve_times;
- extern int am_root;
-@@ -467,6 +468,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
+ extern int preserve_mtimes;
+ extern int omit_dir_times;
+@@ -468,6 +469,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
return new_mode;
}
static int same_mtime(struct file_struct *file, STRUCT_STAT *st, int extra_accuracy)
{
#ifdef ST_MTIME_NSEC
-@@ -543,7 +577,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -544,7 +578,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
if (am_root >= 0) {
uid_t uid = change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid;
gid_t gid = change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid;
/* We shouldn't have attempted to change uid
* or gid unless have the privilege. */
rsyserr(FERROR_XFER, errno, "%s %s failed",
-@@ -629,7 +663,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -654,7 +688,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)) {
if (ret < 0) {
rsyserr(FERROR_XFER, errno,
"failed to set permissions on %s",
-@@ -641,6 +675,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -666,6 +700,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
}
#endif
if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
if (updated)
rprintf(FCLIENT, "%s\n", fname);
-@@ -718,7 +765,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -743,7 +790,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,
-- ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
+- ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
+ ATTRS_DELAY_IMMUTABLE
-+ | (ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME));
++ | (ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME));
/* move tmp file over real file */
if (DEBUG_GTE(RECV, 1))
-@@ -735,6 +783,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -760,6 +808,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. */
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
/* The following XMIT flags require an rsync that uses a varint for the flag values */
-#define XMIT_RESERVED_16 (1<<16) /* reserved for future fileflags use */
+#define XMIT_SAME_FLAGS (1<<16) /* any protocol - restricted by command-line option */
- #define XMIT_RESERVED_17 (1<<17) /* reserved for future crtimes use */
+ #define XMIT_CRTIME_EQ_MTIME (1<<17) /* any protocol - restricted by command-line option */
/* These flags are used in the live flist data. */
-@@ -181,6 +181,7 @@
+@@ -192,6 +192,7 @@
#define ATTRS_SKIP_MTIME (1<<1)
#define ATTRS_ACCURATE_TIME (1<<2)
#define ATTRS_SKIP_ATIME (1<<3)
+#define ATTRS_DELAY_IMMUTABLE (1<<4)
+ #define ATTRS_SKIP_CRTIME (1<<5)
#define MSG_FLUSH 2
- #define FULL_FLUSH 1
-@@ -208,6 +209,7 @@
+@@ -220,6 +221,7 @@
#define ITEM_REPORT_GROUP (1<<6)
#define ITEM_REPORT_ACL (1<<7)
#define ITEM_REPORT_XATTR (1<<8)
+#define ITEM_REPORT_FFLAGS (1<<9)
+ #define ITEM_REPORT_CRTIME (1<<10)
#define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
#define ITEM_XNAME_FOLLOWS (1<<12)
- #define ITEM_IS_NEW (1<<13)
-@@ -548,6 +550,31 @@ typedef unsigned int size_t;
- #endif
+@@ -593,6 +595,31 @@ typedef unsigned int size_t;
+ #define SUPPORT_CRTIMES 1
#endif
+#define NO_FFLAGS ((uint32)-1)
/* 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. */
-@@ -761,6 +788,7 @@ extern int pathname_ndx;
+@@ -824,6 +851,7 @@ extern int pathname_ndx;
extern int depth_ndx;
extern int uid_ndx;
extern int gid_ndx;
+extern int fileflags_ndx;
extern int acls_ndx;
extern int xattrs_ndx;
-
-@@ -811,6 +839,11 @@ extern int xattrs_ndx;
+ extern int file_sum_extra_cnt;
+@@ -879,6 +907,11 @@ extern int file_sum_extra_cnt;
/* 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
extern int inplace;
extern int preallocate_files;
extern int preserve_perms;
-@@ -68,7 +69,23 @@ int do_unlink(const char *fname)
+@@ -81,7 +82,23 @@ int do_unlink(const char *path)
{
if (dry_run) return 0;
RETURN_ERROR_IF_RO_OR_LO;
-- return unlink(fname);
-+ if (unlink(fname) == 0)
+- return unlink(path);
++ if (unlink(path) == 0)
+ return 0;
+#ifdef SUPPORT_FORCE_CHANGE
+ if (force_change && errno == EPERM) {
+ STRUCT_STAT st;
+
-+ if (x_lstat(fname, &st, NULL) == 0
-+ && make_mutable(fname, st.st_mode, st.st_flags, force_change) > 0) {
-+ if (unlink(fname) == 0)
++ if (x_lstat(path, &st, NULL) == 0
++ && make_mutable(path, st.st_mode, st.st_flags, force_change) > 0) {
++ if (unlink(path) == 0)
+ return 0;
-+ undo_make_mutable(fname, st.st_flags);
++ undo_make_mutable(path, st.st_flags);
+ }
+ /* TODO: handle immutable directories */
+ errno = EPERM;
}
#ifdef SUPPORT_LINKS
-@@ -129,14 +146,35 @@ int do_link(const char *old_path, const char *new_path)
+@@ -146,14 +163,35 @@ int do_link(const char *old_path, const char *new_path)
}
#endif
}
int do_mknod(const char *pathname, mode_t mode, dev_t dev)
-@@ -176,7 +214,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
+@@ -193,7 +231,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
return -1;
close(sock);
#ifdef HAVE_CHMOD
#else
return 0;
#endif
-@@ -193,7 +231,22 @@ int do_rmdir(const char *pathname)
+@@ -210,7 +248,22 @@ int do_rmdir(const char *pathname)
{
if (dry_run) return 0;
RETURN_ERROR_IF_RO_OR_LO;
}
int do_open(const char *pathname, int flags, mode_t mode)
-@@ -212,7 +265,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
+@@ -229,7 +282,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
}
#ifdef HAVE_CHMOD
-int do_chmod(const char *path, mode_t mode)
+int do_chmod(const char *path, mode_t mode, UNUSED(uint32 fileflags))
{
+ static int switch_step = 0;
int code;
- if (dry_run) return 0;
-@@ -235,17 +288,72 @@ int do_chmod(const char *path, mode_t mode)
- } else
- code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
- #endif /* !HAVE_LCHMOD */
+@@ -268,17 +321,72 @@ int do_chmod(const char *path, mode_t mode)
+ code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
+ break;
+ }
+#ifdef SUPPORT_FORCE_CHANGE
+ if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) {
+ if (fileflags == NO_FFLAGS) {
diff --git a/t_stub.c b/t_stub.c
--- a/t_stub.c
+++ b/t_stub.c
-@@ -28,6 +28,8 @@ int protect_args = 0;
+@@ -29,6 +29,8 @@ int protect_args = 0;
int module_id = -1;
int relative_paths = 0;
int module_dirlen = 0;
+int force_change = 0;
+int preserve_acls = 0;
- int preserve_times = 0;
int preserve_xattrs = 0;
int preserve_perms = 0;
-@@ -109,3 +111,23 @@ filter_rule_list daemon_filter_list;
+ int preserve_executability = 0;
+@@ -111,3 +113,23 @@ filter_rule_list daemon_filter_list;
{
return cst ? 0 : 0;
}
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
-@@ -23,9 +23,9 @@ todir="$tmpdir/to"
- chkdir="$tmpdir/chk"
+@@ -26,9 +26,9 @@ chkfile="$scratchdir/rsync.chk"
+ outfile="$scratchdir/rsync.out"
# For itemized output:
-all_plus='+++++++++'
tab_ch=' ' # a single tab character
# Berkley's nice.
-diff --git a/util.c b/util.c
---- a/util.c
-+++ b/util.c
-@@ -33,6 +33,7 @@ extern int relative_paths;
- extern int preserve_times;
+diff --git a/usage.c b/usage.c
+--- a/usage.c
++++ b/usage.c
+@@ -138,6 +138,11 @@ static void print_info_flags(enum logcode f)
+ #endif
+ "crtimes",
+
++#ifndef SUPPORT_FILEFLAGS
++ "no "
++#endif
++ "file-flags",
++
+ "*Optimizations",
+
+ #ifndef USE_ROLL_SIMD
+diff --git a/util1.c b/util1.c
+--- a/util1.c
++++ b/util1.c
+@@ -34,6 +34,7 @@ extern int relative_paths;
extern int preserve_xattrs;
+ extern int omit_link_times;
extern int preallocate_files;
+extern int force_change;
extern char *module_dir;
extern unsigned int module_dirlen;
extern char *partial_dir;
-@@ -115,6 +116,33 @@ void print_child_argv(const char *prefix, char **cmd)
+@@ -116,6 +117,33 @@ void print_child_argv(const char *prefix, char **cmd)
rprintf(FCLIENT, " (%d args)\n", cnt);
}
/* This returns 0 for success, 1 for a symlink if symlink time-setting
* is not possible, or -1 for any other error. */
int set_times(const char *fname, STRUCT_STAT *stp)
-@@ -142,6 +170,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
+@@ -143,6 +171,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
#include "case_N.h"
if (do_utimensat(fname, stp) == 0)
break;
if (errno != ENOSYS)
return -1;
switch_step++;
-@@ -151,6 +183,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
+@@ -152,6 +184,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
#include "case_N.h"
if (do_lutimes(fname, stp) == 0)
break;
if (errno != ENOSYS)
return -1;
switch_step++;
-@@ -172,6 +208,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
+@@ -173,6 +209,10 @@ int set_times(const char *fname, STRUCT_STAT *stp)
if (do_utime(fname, stp) == 0)
break;
#endif
diff --git a/xattrs.c b/xattrs.c
--- a/xattrs.c
+++ b/xattrs.c
-@@ -1216,7 +1216,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
+@@ -1086,7 +1086,7 @@ int set_xattr(const char *fname, const struct file_struct *file, const char *fna
+ && !S_ISLNK(sxp->st.st_mode)
+ #endif
+ && access(fname, W_OK) < 0
+- && do_chmod(fname, (sxp->st.st_mode & CHMOD_BITS) | S_IWUSR) == 0)
++ && do_chmod(fname, (sxp->st.st_mode & CHMOD_BITS) | S_IWUSR, ST_FLAGS(sxp->st)) == 0)
+ added_write_perm = 1;
+
+ ndx = F_XATTR(file);
+@@ -1094,7 +1094,7 @@ int set_xattr(const char *fname, const struct file_struct *file, const char *fna
+ lst = &glst->xa_items;
+ int return_value = rsync_xal_set(fname, lst, fnamecmp, sxp);
+ if (added_write_perm) /* remove the temporary write permission */
+- do_chmod(fname, sxp->st.st_mode);
++ do_chmod(fname, sxp->st.st_mode, ST_FLAGS(sxp->st));
+ return return_value;
+ }
+
+@@ -1211,7 +1211,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)
git.samba.org / rsync.git / patches.git / blobdiff