X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fb11cdd77dfe8262cade8b6de6a08e213b9d40f3..9668a39c888edb2391f80624c2fd9e87128c3e37:/time-limit.diff diff --git a/time-limit.diff b/time-limit.diff index 6c5c259..81c1e2d 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -11,15 +11,15 @@ To use this patch, run these commands for a successful build: --- old/io.c +++ new/io.c -@@ -50,6 +50,7 @@ extern int remove_source_files; +@@ -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 *the_file_list; - - const char phase_unknown[] = "unknown"; -@@ -147,16 +148,24 @@ static void check_timeout(void) + extern struct file_list *cur_flist; + #ifdef ICONV_OPTION + extern int filesfrom_convert; +@@ -215,16 +216,24 @@ static void check_timeout(void) { time_t t; @@ -49,16 +49,16 @@ To use this patch, run these commands for a successful build: rprintf(FERROR, "io timeout after %d seconds -- exiting\n", --- old/options.c +++ new/options.c -@@ -116,6 +116,7 @@ int checksum_seed = 0; - int inplace = 0; - int delay_updates = 0; - long block_size = 0; /* "long" because popt can't set an int32. */ +@@ -110,6 +110,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; - - - /** Network address family. **/ -@@ -377,6 +378,8 @@ void usage(enum logcode F) - rprintf(F," --password-file=FILE read password from FILE\n"); + int max_delete = INT_MIN; + OFF_T max_size = 0; + OFF_T min_size = 0; +@@ -416,6 +417,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," --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute\n"); @@ -66,27 +66,27 @@ 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"); -@@ -398,7 +401,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -438,7 +441,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[] = { -@@ -516,6 +519,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 }, +@@ -603,6 +606,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 }, -@@ -1089,6 +1094,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 }, +@@ -1221,6 +1226,36 @@ int parse_arguments(int *argc_p, const c + return 0; + #endif + case OPT_STOP_AT: + arg = poptGetOptArg(pc); @@ -121,7 +121,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. */ -@@ -1642,6 +1677,15 @@ void server_options(char **args,int *arg +@@ -1841,6 +1876,15 @@ void server_options(char **args, int *ar args[ac++] = arg; } @@ -139,8 +139,8 @@ To use this patch, run these commands for a successful build: args[ac++] = backup_dir; --- old/rsync.yo +++ new/rsync.yo -@@ -394,6 +394,8 @@ to the detailed description below for a - --password-file=FILE read password from FILE +@@ -422,6 +422,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 + --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute @@ -148,7 +148,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 -@@ -1739,6 +1741,19 @@ transfer was too fast, it will wait befo +@@ -1933,6 +1935,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. @@ -170,7 +170,7 @@ To use this patch, run these commands for a successful build: 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 * +@@ -122,6 +122,133 @@ NORETURN void overflow_exit(const char * exit_cleanup(RERR_MALLOC); }