./configure (optional if already run)
make
-based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
+based-on: 109dbc0b7535e8f8094802182f9067bfdc88dfc9
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
See the `--perms` and `--executability` options for how the resulting
permission value can be applied to the files in the transfer.
-@@ -2648,6 +2650,10 @@ your home directory (remove the '=' for that).
+@@ -2652,6 +2654,10 @@ your home directory (remove the '=' for that).
"`--usermap=*:foo --groupmap=*:bar`", only easier. If your shell complains
about the wildcards, use `--protect-args` (`-s`).
0. `--timeout=SECONDS`
This option allows you to set a maximum I/O timeout in seconds. If no data
-@@ -3645,6 +3651,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3650,6 +3656,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
rules that exclude things like "CVS" and "`*.o`" are marked as perishable,
and will not prevent a directory that was removed on the source from being
deleted on the destination.
- An `x` indicates that a rule affects xattr names in xattr copy/delete
operations (and is thus ignored when matching file/dir names). If no
xattr-matching rules are specified, a default xattr filtering rule is used
-@@ -3702,6 +3717,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3707,6 +3722,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
rules in the file must not specify sides (via a modifier or a rule prefix
such as `hide`).
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -181,6 +181,9 @@
+@@ -183,6 +183,9 @@
#define NO_FILTERS 0
#define SERVER_FILTERS 1
#define ALL_FILTERS 2
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_OLD_PREFIXES (1<<1)
-@@ -979,6 +982,8 @@ struct map_struct {
+@@ -980,6 +983,8 @@ struct map_struct {
int status; /* first errno from read errors */
};
#define NAME_IS_FILE (0) /* filter name as a file */
#define NAME_IS_DIR (1<<0) /* filter name as a dir */
#define NAME_IS_XATTR (1<<2) /* filter name as an xattr */
-@@ -1004,8 +1009,18 @@ struct map_struct {
+@@ -1005,8 +1010,18 @@ struct map_struct {
#define FILTRULE_CLEAR_LIST (1<<18)/* this item is the "!" token */
#define FILTRULE_PERISHABLE (1<<19)/* perishable if parent dir goes away */
#define FILTRULE_XATTR (1<<20)/* rule only applies to xattr names */
typedef struct filter_struct {
struct filter_struct *next;
-@@ -1015,6 +1030,11 @@ typedef struct filter_struct {
+@@ -1016,6 +1031,11 @@ typedef struct filter_struct {
int slash_cnt;
struct filter_list_struct *mergelist;
} u;
diff --git a/util1.c b/util1.c
--- a/util1.c
+++ b/util1.c
-@@ -884,6 +884,25 @@ size_t stringjoin(char *dest, size_t destsize, ...)
+@@ -889,6 +889,25 @@ size_t stringjoin(char *dest, size_t destsize, ...)
return ret;
}