Do we need configure support for mktime()?
---- orig/io.c 2005-03-01 03:11:36
-+++ io.c 2005-03-01 03:12:23
-@@ -51,6 +51,7 @@ extern int eol_nulls;
- extern int csum_length;
- extern int checksum_seed;
- extern int protocol_version;
-+extern time_t stop_at_utime;
+--- 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;
+ 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;
-@@ -137,16 +138,24 @@ static void check_timeout(void)
+ const char phase_unknown[] = "unknown";
+@@ -163,16 +164,24 @@ static void check_timeout(void)
{
time_t t;
if (t - last_io >= io_timeout) {
if (!am_server && !am_daemon) {
rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- orig/options.c 2005-03-01 05:49:24
-+++ options.c 2005-01-28 19:35:23
-@@ -105,6 +105,7 @@ int checksum_seed = 0;
+--- 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;
int inplace = 0;
int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
/** Network address family. **/
-@@ -341,6 +342,8 @@ void usage(enum logcode F)
+@@ -345,6 +346,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");
+ 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=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");
- #ifdef INET6
-@@ -358,6 +361,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
- OPT_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST,
+@@ -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_TIMEOUT, OPT_MAX_SIZE,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH,
+ OPT_TIMEOUT, OPT_MAX_SIZE,
+ OPT_STOP_AT, OPT_TIME_LIMIT,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -442,6 +446,8 @@ static struct poptOption long_options[]
+@@ -451,6 +455,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 },
{"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 },
-@@ -854,6 +860,36 @@ int parse_arguments(int *argc, const cha
+@@ -873,6 +879,36 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1344,6 +1380,15 @@ void server_options(char **args,int *arg
+@@ -1360,6 +1396,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 2005-03-01 01:22:59
+--- orig/rsync.yo 2005-04-09 18:00:29
+++ rsync.yo 2005-02-01 10:46:35
-@@ -378,6 +378,8 @@ to the detailed description below for a
+@@ -379,6 +379,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
+ --only-write-batch=FILE like --write-batch but w/o updating dest
--read-batch=FILE read a batched update from FILE
- --checksum-seed=NUM set block/file checksum seed (advanced)
-@@ -1225,6 +1227,19 @@ transfer was too fast, it will wait befo
+@@ -1274,6 +1276,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(--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-02-23 02:57:27
+--- orig/util.c 2005-04-04 16:28:37
+++ util.c 2004-07-03 20:23:22
@@ -126,6 +126,132 @@ void overflow(char *str)
exit_cleanup(RERR_MALLOC);