--- old/io.c
+++ new/io.c
-@@ -53,6 +53,7 @@ extern int remove_source_files;
+@@ -52,6 +52,7 @@ extern int remove_source_files;
extern int preserve_hard_links;
extern char *filesfrom_host;
extern struct stats stats;
+extern time_t stop_at_utime;
extern struct file_list *cur_flist, *first_flist;
-
- const char phase_unknown[] = "unknown";
-@@ -173,16 +174,24 @@ static void check_timeout(void)
+ #ifdef ICONV_OPTION
+ extern iconv_t ic_send, ic_recv;
+@@ -179,16 +180,24 @@ static void check_timeout(void)
{
time_t t;
rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
--- old/options.c
+++ new/options.c
-@@ -106,6 +106,7 @@ size_t bwlimit_writemax = 0;
+@@ -109,6 +109,7 @@ size_t bwlimit_writemax = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
int need_messages_from_generator = 0;
+time_t stop_at_utime = 0;
- int max_delete = -1;
+ int max_delete = INT_MIN;
OFF_T max_size = 0;
OFF_T min_size = 0;
-@@ -374,6 +375,8 @@ void usage(enum logcode F)
+@@ -413,6 +414,8 @@ void usage(enum logcode F)
rprintf(F," --password-file=FILE read daemon-access password from FILE\n");
rprintf(F," --list-only list the files instead of copying them\n");
rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n");
rprintf(F," --write-batch=FILE write a batched update to FILE\n");
rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n");
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
-@@ -395,7 +398,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -435,7 +438,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
-- OPT_NO_D,
-+ OPT_NO_D, OPT_STOP_AT, OPT_TIME_LIMIT,
+- OPT_NO_D, OPT_APPEND,
++ OPT_NO_D, OPT_APPEND, OPT_STOP_AT, OPT_TIME_LIMIT,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -514,6 +517,8 @@ static struct poptOption long_options[]
- {"log-format", 0, POPT_ARG_STRING, &stdout_format, 0, 0, 0 }, /* DEPRECATED */
- {"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 0, 0 },
- {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
+@@ -593,6 +596,8 @@ static struct poptOption long_options[]
+ {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 },
+ {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
+ {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 },
+ {"stop-at", 0, POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 },
+ {"time-limit", 0, POPT_ARG_STRING, 0, OPT_TIME_LIMIT, 0, 0 },
- {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
- {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
- {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -1093,6 +1098,36 @@ int parse_arguments(int *argc, const cha
- usage(FINFO);
- exit_cleanup(0);
+ {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
+ {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
+ {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+@@ -1205,6 +1210,36 @@ int parse_arguments(int *argc, const cha
+ return 0;
+ #endif
+ case OPT_STOP_AT:
+ arg = poptGetOptArg(pc);
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1656,6 +1691,15 @@ void server_options(char **args,int *arg
+@@ -1803,6 +1838,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
args[ac++] = backup_dir;
--- old/rsync.yo
+++ new/rsync.yo
-@@ -395,6 +395,8 @@ to the detailed description below for a
+@@ -421,6 +421,8 @@ to the detailed description below for a
--password-file=FILE read daemon-access password from FILE
--list-only list the files instead of copying them
--bwlimit=KBPS limit I/O bandwidth; KBytes per second
--write-batch=FILE write a batched update to FILE
--only-write-batch=FILE like --write-batch but w/o updating dest
--read-batch=FILE read a batched update from FILE
-@@ -1748,6 +1750,19 @@ transfer was too fast, it will wait befo
+@@ -1902,6 +1904,19 @@ transfer was too fast, it will wait befo
result is an average transfer rate equaling the specified limit. A value
of zero specifies no limit.