X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/c2f72cffa35594e7d9330f16ded74f65d18b8a94..36ae7f0bb8bdad791108429219eff845c5732eca:/time-limit.diff diff --git a/time-limit.diff b/time-limit.diff index 1415f88..7351306 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -3,9 +3,9 @@ to be simpler and more efficient by Wayne Davison. Do we need configure support for mktime()? ---- orig/io.c 2005-04-07 17:04:26 -+++ io.c 2005-03-05 00:32:06 -@@ -56,6 +56,7 @@ extern int remove_sent_files; +--- orig/io.c 2005-08-17 06:45:07 ++++ io.c 2005-05-19 09:01:27 +@@ -57,6 +57,7 @@ extern int remove_sent_files; extern int preserve_hard_links; extern char *filesfrom_host; extern struct stats stats; @@ -13,7 +13,7 @@ Do we need configure support for mktime()? extern struct file_list *the_file_list; const char phase_unknown[] = "unknown"; -@@ -163,16 +164,24 @@ static void check_timeout(void) +@@ -165,16 +166,24 @@ static void check_timeout(void) { time_t t; @@ -30,20 +30,20 @@ Do we need configure support for mktime()? if (!io_timeout || ignore_timeout) return; - if (!last_io) { -- last_io = time(NULL); -+ last_io = t; + if (!last_io_in) { +- last_io_in = time(NULL); ++ last_io_in = t; return; } - t = time(NULL); - - if (t - last_io >= io_timeout) { + if (t - last_io_in >= io_timeout) { if (!am_server && !am_daemon) { rprintf(FERROR, "io timeout after %d seconds -- exiting\n", ---- orig/options.c 2005-04-09 18:00:28 -+++ options.c 2005-04-09 18:03:53 -@@ -106,6 +106,7 @@ int checksum_seed = 0; +--- orig/options.c 2005-11-15 07:01:03 ++++ options.c 2005-08-27 21:27:57 +@@ -110,6 +110,7 @@ int checksum_seed = 0; int inplace = 0; int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ @@ -51,7 +51,7 @@ Do we need configure support for mktime()? /** Network address family. **/ -@@ -345,6 +346,8 @@ void usage(enum logcode F) +@@ -355,6 +356,8 @@ void usage(enum logcode F) rprintf(F," --password-file=FILE read 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"); @@ -60,24 +60,24 @@ Do we need configure support for mktime()? 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"); -@@ -365,6 +368,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, - OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, - OPT_TIMEOUT, OPT_MAX_SIZE, +@@ -375,6 +378,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_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, + OPT_STOP_AT, OPT_TIME_LIMIT, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -451,6 +455,8 @@ static struct poptOption long_options[] +@@ -476,6 +480,8 @@ static struct poptOption long_options[] {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 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 }, - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, - {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 }, -@@ -873,6 +879,36 @@ int parse_arguments(int *argc, const cha + {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, +@@ -997,6 +1003,36 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -114,7 +114,7 @@ Do we need configure support for mktime()? default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1360,6 +1396,15 @@ void server_options(char **args,int *arg +@@ -1523,6 +1559,15 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -130,9 +130,9 @@ Do we need configure support for mktime()? if (backup_dir) { args[ac++] = "--backup-dir"; args[ac++] = backup_dir; ---- orig/rsync.yo 2005-04-09 18:00:29 +--- orig/rsync.yo 2005-11-15 07:01:04 +++ rsync.yo 2005-02-01 10:46:35 -@@ -379,6 +379,8 @@ to the detailed description below for a +@@ -381,6 +381,8 @@ to the detailed description below for a --password-file=FILE read password from FILE --list-only list the files instead of copying them --bwlimit=KBPS limit I/O bandwidth; KBytes per second @@ -141,7 +141,7 @@ Do we need configure support for mktime()? --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 -@@ -1274,6 +1276,19 @@ transfer was too fast, it will wait befo +@@ -1371,6 +1373,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. @@ -160,10 +160,10 @@ Do we need configure support for mktime()? + 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. ---- orig/util.c 2005-04-04 16:28:37 + section for details, and also the bf(--only-write-batch) option. +--- orig/util.c 2005-11-12 20:13:05 +++ util.c 2004-07-03 20:23:22 -@@ -126,6 +126,132 @@ void overflow(char *str) +@@ -128,6 +128,132 @@ void overflow_exit(char *str) exit_cleanup(RERR_MALLOC); } @@ -295,4 +295,4 @@ Do we need configure support for mktime()? +} - int set_modtime(char *fname, time_t modtime) + int set_modtime(char *fname, time_t modtime, mode_t mode)