X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5ff5e82f366d036c89cae48182daa9b6ced9a20d..e66d6d511b675d31a3c55b51fd28d5d2558d094a:/time-limit.diff diff --git a/time-limit.diff b/time-limit.diff index 55c7086..0c76ec2 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -9,17 +9,18 @@ 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 +--- a/io.c ++++ b/io.c +@@ -54,6 +54,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; - - const char phase_unknown[] = "unknown"; -@@ -172,16 +173,24 @@ static void check_timeout(void) + extern struct file_list *cur_flist; + #ifdef ICONV_OPTION + extern int filesfrom_convert; +@@ -221,16 +222,24 @@ static void check_timeout(void) { time_t t; @@ -47,17 +48,18 @@ 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 -@@ -108,6 +108,7 @@ size_t bwlimit_writemax = 0; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -113,6 +113,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; -@@ -390,6 +391,8 @@ void usage(enum logcode F) +@@ -424,6 +425,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 +68,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"); -@@ -411,7 +414,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -446,7 +449,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, 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_ICONV, ++ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_STOP_AT, OPT_TIME_LIMIT, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -540,6 +543,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 }, +@@ -626,6 +629,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 }, - {"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 }, -@@ -1148,6 +1153,36 @@ int parse_arguments(int *argc, const cha + {"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 }, +@@ -1260,6 +1265,36 @@ int parse_arguments(int *argc_p, const char ***argv_p) return 0; #endif @@ -121,7 +123,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. */ -@@ -1715,6 +1750,15 @@ void server_options(char **args,int *arg +@@ -1897,6 +1932,15 @@ void server_options(char **args, int *argc_p) args[ac++] = arg; } @@ -137,9 +139,10 @@ 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 -@@ -397,6 +397,8 @@ to the detailed description below for a +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -418,6 +418,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 +151,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 -@@ -1797,6 +1799,19 @@ transfer was too fast, it will wait befo +@@ -2007,6 +2009,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 +171,10 @@ 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 -@@ -120,6 +120,133 @@ NORETURN void overflow_exit(const char * +diff --git a/util.c b/util.c +--- a/util.c ++++ b/util.c +@@ -122,6 +122,133 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); }