int verbose = 0;
int quiet = 0;
int output_motd = 1;
-@@ -387,6 +391,7 @@ void usage(enum logcode F)
+@@ -388,6 +392,7 @@ void usage(enum logcode F)
rprintf(F," --timeout=SECONDS set I/O timeout in seconds\n");
rprintf(F," --contimeout=SECONDS set daemon connection timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
rprintf(F," --size-only skip files that match in size\n");
rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
-@@ -645,6 +650,7 @@ static struct poptOption long_options[] = {
+@@ -646,6 +651,7 @@ static struct poptOption long_options[] = {
{"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 },
-@@ -1140,6 +1146,26 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1141,6 +1147,26 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
break;
case OPT_WRITE_BATCH:
/* batch_name is already set */
write_batch = 1;
-@@ -1840,6 +1866,11 @@ void server_options(char **args, int *argc_p)
-
- argstr[x] = '\0';
-
-+ if (x > (int)sizeof argstr) { /* Not possible... */
-+ rprintf(FERROR, "argstr overflow in server_options().\n");
-+ exit_cleanup(RERR_MALLOC);
-+ }
-+
- args[ac++] = argstr;
-
- #ifdef ICONV_OPTION
-@@ -2061,6 +2092,16 @@ void server_options(char **args, int *argc_p)
+@@ -2063,6 +2089,16 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -412,6 +412,7 @@ to the detailed description below for a complete description. verb(
+@@ -416,6 +416,7 @@ to the detailed description below for a complete description. verb(
--progress show progress during transfer
-P same as --partial --progress
-i, --itemize-changes output a change-summary for all updates
--out-format=FORMAT output updates using the specified FORMAT
--log-file=FILE log what we're doing to the specified FILE
--log-file-format=FMT log updates using the specified FMT
-@@ -1026,16 +1027,16 @@ This is a good way to backup data without using a super-user, and to store
+@@ -1030,16 +1031,16 @@ This is a good way to backup data without using a super-user, and to store
ACLs from incompatible systems.
The bf(--fake-super) option only affects the side where the option is used.
This option is overridden by both bf(--super) and bf(--no-super).
-@@ -1288,6 +1289,36 @@ machine for use with the bf(--relative) option. For instance:
+@@ -1292,6 +1293,36 @@ machine for use with the bf(--relative) option. For instance:
quote(tt( rsync -avR --rsync-path="cd /a/b && rsync" host:c/d /e/))
dit(bf(-C, --cvs-exclude)) This is a useful shorthand for excluding a
broad range of files that you often don't want to transfer between
systems. It uses a similar algorithm to CVS to determine if
-@@ -1764,7 +1795,7 @@ option if you wish to override this.
+@@ -1768,7 +1799,7 @@ option if you wish to override this.
Here's a example command that requests the remote side to log what is
happening: