X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/99650e0dc5f77324a2854adffea07814f054f669..fc5573623194fab2a331d1ffc8d284c9e25e06e7:/time-limit.diff diff --git a/time-limit.diff b/time-limit.diff index 07b79ba..7e1fd66 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -9,17 +9,19 @@ To use this patch, run these commands for a successful build: ./configure (optional if already run) make ---- old/io.c -+++ new/io.c -@@ -52,6 +52,7 @@ extern int remove_source_files; +diff --git a/io.c b/io.c +index 6a89c8f..d248f0f 100644 +--- a/io.c ++++ b/io.c +@@ -53,6 +53,7 @@ extern int protocol_version; + 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; + extern struct file_list *cur_flist; #ifdef ICONV_OPTION - extern iconv_t ic_send, ic_recv; -@@ -179,16 +180,24 @@ static void check_timeout(void) + extern int filesfrom_convert; +@@ -182,16 +183,24 @@ static void check_timeout(void) { time_t t; @@ -47,9 +49,11 @@ To use this patch, run these commands for a successful build: if (t - last_io_in >= io_timeout) { if (!am_server && !am_daemon) { rprintf(FERROR, "io timeout after %d seconds -- exiting\n", ---- old/options.c -+++ new/options.c -@@ -109,6 +109,7 @@ size_t bwlimit_writemax = 0; +diff --git a/options.c b/options.c +index e7c6c61..6e72c02 100644 +--- a/options.c ++++ b/options.c +@@ -112,6 +112,7 @@ size_t bwlimit_writemax = 0; int ignore_existing = 0; int ignore_non_existing = 0; int need_messages_from_generator = 0; @@ -57,7 +61,7 @@ To use this patch, run these commands for a successful build: int max_delete = INT_MIN; OFF_T max_size = 0; OFF_T min_size = 0; -@@ -407,6 +408,8 @@ void usage(enum logcode F) +@@ -775,6 +776,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"); @@ -66,25 +70,25 @@ To use this patch, run these commands for a successful build: 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"); -@@ -431,7 +434,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP - OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, +@@ -798,7 +801,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, 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_ICONV, OPT_INFO, OPT_DEBUG, +- OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, ++ OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_STOP_AT, OPT_TIME_LIMIT, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -587,6 +590,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 }, +@@ -988,6 +991,8 @@ static struct poptOption long_options[] = { {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 }, + {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 }, + {"no-contimeout", 0, POPT_ARG_VAL, &connect_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 }, {"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 }, -@@ -1198,6 +1203,36 @@ int parse_arguments(int *argc, const cha +@@ -1742,6 +1747,36 @@ int parse_arguments(int *argc_p, const char ***argv_p) return 0; #endif @@ -121,7 +125,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1796,6 +1831,15 @@ void server_options(char **args,int *arg +@@ -2428,6 +2463,15 @@ void server_options(char **args, int *argc_p) args[ac++] = arg; } @@ -137,9 +141,11 @@ To use this patch, run these commands for a successful build: if (backup_dir) { args[ac++] = "--backup-dir"; args[ac++] = backup_dir; ---- old/rsync.yo -+++ new/rsync.yo -@@ -420,6 +420,8 @@ to the detailed description below for a +diff --git a/rsync.yo b/rsync.yo +index 941f7a5..6945d06 100644 +--- a/rsync.yo ++++ b/rsync.yo +@@ -431,6 +431,8 @@ to the detailed description below for a complete description. verb( --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 @@ -148,7 +154,7 @@ To use this patch, run these commands for a successful build: --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 -@@ -1892,6 +1894,19 @@ transfer was too fast, it will wait befo +@@ -2230,6 +2232,19 @@ transfer was too fast, it will wait before sending the next data block. The result is an average transfer rate equaling the specified limit. A value of zero specifies no limit. @@ -168,9 +174,11 @@ To use this patch, run these commands for a successful build: dit(bf(--write-batch=FILE)) Record a file that can later be applied to another identical destination with bf(--read-batch). See the "BATCH MODE" section for details, and also the bf(--only-write-batch) option. ---- old/util.c -+++ new/util.c -@@ -121,6 +121,133 @@ NORETURN void overflow_exit(const char * +diff --git a/util.c b/util.c +index 0cafed6..f3e2669 100644 +--- a/util.c ++++ b/util.c +@@ -123,6 +123,133 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); }