X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/d1cfcd415f677c56430bff609fbd6a6086b11f0e..a7219d2067fb9923061cfe7da56477d85e03d51a:/time-limit.diff diff --git a/time-limit.diff b/time-limit.diff index 149cb50..9ddfb65 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -3,7 +3,7 @@ to be simpler and more efficient by Wayne Davison. Do we need configure support for mktime()? ---- orig/io.c 2005-01-28 06:51:59 +--- orig/io.c 2005-02-03 02:04:20 +++ io.c 2004-07-17 15:28:36 @@ -51,6 +51,7 @@ extern int eol_nulls; extern int csum_length; @@ -39,9 +39,9 @@ Do we need configure support for mktime()? - if (t - last_io >= io_timeout) { + if (io_timeout && t - last_io >= io_timeout) { if (!am_server && !am_daemon) { - rprintf(FERROR, "io timeout after %d seconds - exiting\n", + rprintf(FERROR, "io timeout after %d seconds -- exiting\n", (int)(t-last_io)); ---- orig/options.c 2005-01-28 19:08:20 +--- orig/options.c 2005-02-01 10:39:22 +++ options.c 2005-01-28 19:35:23 @@ -102,6 +102,7 @@ int checksum_seed = 0; int inplace = 0; @@ -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 (opt-BASE is its index). */ -@@ -1210,6 +1246,15 @@ void server_options(char **args,int *arg +@@ -1216,6 +1252,15 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -130,18 +130,18 @@ Do we need configure support for mktime()? if (backup_dir) { args[ac++] = "--backup-dir"; args[ac++] = backup_dir; ---- orig/rsync.yo 2005-01-28 17:12:14 -+++ rsync.yo 2005-01-28 19:35:35 -@@ -387,6 +387,8 @@ verb( +--- orig/rsync.yo 2005-02-01 10:39:23 ++++ rsync.yo 2005-02-01 10:46:35 +@@ -376,6 +376,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 + --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute + --time-limit=MINS Stop rsync after MINS minutes have elapsed - --write-batch=FILE write a batched update to FILE + --write-batch=FILE write a batched update to FILE --read-batch=FILE read a batched update from FILE --checksum-seed=NUM set block/file checksum seed (advanced) -@@ -1124,6 +1126,19 @@ transfer was too fast, it will wait befo +@@ -1108,6 +1110,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. @@ -159,7 +159,7 @@ Do we need configure support for mktime()? +number of minutes rsync will run for. + dit(bf(--write-batch=FILE)) Record a file that can later be applied to - another identical destination with --read-batch. See the "BATCH MODE" + another identical destination with bf(--read-batch). See the "BATCH MODE" section for details. --- orig/util.c 2005-01-28 19:08:20 +++ util.c 2004-07-03 20:23:22