Do we need configure support for mktime()?
---- orig/io.c 2004-06-23 01:13:56
-+++ io.c 2004-07-03 20:23:22
-@@ -44,6 +44,7 @@ static int io_multiplexing_in;
- static int multiplex_in_fd = -1;
- static int multiplex_out_fd = -1;
- static time_t last_io;
+--- orig/io.c 2004-11-25 16:32:40
++++ io.c 2004-07-17 15:28:36
+@@ -50,6 +50,7 @@ extern int am_generator;
+ extern int eol_nulls;
+ extern int checksum_seed;
+ extern int protocol_version;
+extern time_t stop_at_utime;
- static int no_flush;
+ extern char *remote_filesfrom_file;
+ extern struct stats stats;
- extern int bwlimit;
-@@ -128,16 +129,21 @@ static void check_timeout(void)
+@@ -136,17 +137,22 @@ static void check_timeout(void)
{
time_t t;
- t = time(NULL);
-
- if (last_io && io_timeout && (t-last_io) >= io_timeout) {
+- 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",
---- orig/options.c 2004-06-20 19:30:00
-+++ options.c 2004-07-03 20:23:22
-@@ -95,6 +95,7 @@ int modify_window = 0;
- int blocking_io = -1;
+ (int)(t-last_io));
+--- orig/options.c 2004-11-27 18:27:35
++++ options.c 2004-11-11 22:22:25
+@@ -98,6 +98,7 @@ int blocking_io = -1;
int checksum_seed = 0;
+ int inplace = 0;
unsigned int block_size = 0;
+time_t stop_at_utime = 0;
/** Network address family. **/
-@@ -292,6 +293,8 @@ void usage(enum logcode F)
+@@ -305,6 +306,8 @@ void usage(enum logcode F)
rprintf(F," --log-format=FORMAT log file transfers using specified format\n");
rprintf(F," --password-file=FILE get password from FILE\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");
+ rprintf(F," --time-limit=MINS Stop rsync after MINS minutes have elapsed\n");
- rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n");
- rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n");
- rprintf(F," --checksum-seed=NUM set block/file checksum seed\n");
-@@ -311,6 +314,7 @@ enum {OPT_VERSION = 1000, OPT_SENDER, OP
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
+ rprintf(F," --write-batch=FILE write a batch to FILE\n");
+ rprintf(F," --read-batch=FILE read a batch from FILE\n");
+ #ifdef INET6
+@@ -323,6 +326,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+ OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
+ OPT_STOP_AT, OPT_TIME_LIMIT,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -383,6 +387,8 @@ static struct poptOption long_options[]
- {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
+@@ -395,6 +399,8 @@ static struct poptOption long_options[]
+ {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
{"log-format", 0, POPT_ARG_STRING, &log_format, 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 },
- {"address", 0, POPT_ARG_STRING, &bind_address, 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 },
-@@ -596,6 +602,36 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
+ {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
+@@ -749,6 +755,36 @@ int parse_arguments(int *argc, const cha
+ basis_dir[basis_dir_cnt++] = (char *)arg;
+ break;
+ case OPT_STOP_AT:
+ arg = poptGetOptArg(pc);
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -903,6 +939,15 @@ void server_options(char **args,int *arg
+@@ -1140,6 +1176,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
---- orig/rsync.yo 2004-06-17 06:32:00
-+++ rsync.yo 2004-07-03 20:23:22
-@@ -347,6 +347,8 @@ verb(
+--- orig/rsync.yo 2004-11-27 17:53:24
++++ rsync.yo 2004-07-15 02:44:40
+@@ -375,6 +375,8 @@ verb(
--log-format=FORMAT log file transfers using specified format
--password-file=FILE get password from FILE
--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=PREFIX write batch fileset starting with PREFIX
- --read-batch=PREFIX read batch fileset starting with PREFIX
+ --write-batch=FILE write a batch to FILE
+ --read-batch=FILE read a batch from FILE
--checksum-seed=NUM set block/file checksum seed
-@@ -897,6 +899,19 @@ transfer was too fast, it will wait befo
+@@ -987,6 +989,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.
+dit(bf(--time-limit=MINS)) This option allows you to specify the maximum
+number of minutes rsync will run for.
+
- dit(bf(--write-batch=PREFIX)) Generate a set of files that can be
- transferred as a batch update. Each filename in the set starts with
- PREFIX. See the "BATCH MODE" section for details.
---- orig/util.c 2004-06-09 21:54:47
+ dit(bf(--write-batch=FILE)) Record a file that can later be applied to
+ another identical destination with --read-batch. See the "BATCH MODE"
+ section for details.
+--- orig/util.c 2004-09-07 21:45:30
+++ util.c 2004-07-03 20:23:22
-@@ -125,6 +125,132 @@ void overflow(char *str)
+@@ -126,6 +126,132 @@ void overflow(char *str)
exit_cleanup(RERR_MALLOC);
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff