Do we need configure support for mktime()?
---- orig/io.c 2004-11-03 20:30:45
-+++ io.c 2004-07-17 15:28:36
-@@ -49,6 +49,7 @@ extern int am_sender;
- extern int eol_nulls;
- extern int checksum_seed;
- extern int protocol_version;
-+extern time_t stop_at_utime;
- extern char *remote_filesfrom_file;
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/time-limit.diff
+ ./configure (optional if already run)
+ make
+
+based-on: 3b8f8192227b14e708bf535072485e50f4362270
+diff --git a/io.c b/io.c
+--- a/io.c
++++ b/io.c
+@@ -57,6 +57,7 @@ extern int remove_source_files;
+ extern int preserve_hard_links;
+ extern BOOL extra_flist_sending_enabled;
extern struct stats stats;
-
-@@ -135,17 +136,22 @@ static void check_timeout(void)
++extern time_t stop_at_utime;
+ extern struct file_list *cur_flist;
+ #ifdef ICONV_OPTION
+ extern int filesfrom_convert;
+@@ -137,16 +138,24 @@ static void check_timeout(void)
{
time_t t;
-- if (!io_timeout)
-+ if (!io_timeout && !stop_at_utime)
- return;
-
++ if ((!io_timeout || ignore_timeout) && !stop_at_utime)
++ return;
++
+ t = time(NULL);
+
+ if (stop_at_utime && t >= stop_at_utime) {
+ exit_cleanup(RERR_TIMEOUT);
+ }
+
- if (!last_io) {
-- last_io = time(NULL);
-+ last_io = t;
+ if (!io_timeout || ignore_timeout)
+ return;
+
+ if (!last_io_in) {
+- last_io_in = time(NULL);
++ last_io_in = t;
return;
}
- t = time(NULL);
-
-- if (t - last_io >= io_timeout) {
-+ if (io_timeout && 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",
- (int)(t-last_io));
---- orig/options.c 2004-11-11 22:13:09
-+++ options.c 2004-11-11 22:22:25
-@@ -97,6 +97,7 @@ int blocking_io = -1;
- int checksum_seed = 0;
- int inplace = 0;
- unsigned int block_size = 0;
+ rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -112,6 +112,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. **/
-@@ -299,6 +300,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");
+ int max_delete = INT_MIN;
+ OFF_T max_size = 0;
+ OFF_T min_size = 0;
+@@ -776,6 +777,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");
+ rprintf(F," --time-limit=MINS Stop rsync after MINS minutes have elapsed\n");
- rprintf(F," --write-batch=FILE write a batch to FILE\n");
- rprintf(F," --read-batch=FILE read a batch from FILE\n");
- #ifdef INET6
-@@ -316,6 +319,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
-+ OPT_STOP_AT, OPT_TIME_LIMIT,
- OPT_REFUSED_BASE = 9000};
+ 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");
+@@ -799,7 +802,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+ 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_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG,
+- OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN,
++ OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_STOP_AT, OPT_TIME_LIMIT,
+ OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -387,6 +391,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 },
+@@ -989,6 +992,8 @@ static struct poptOption long_options[] = {
+ {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 },
+ {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 },
+ {"no-contimeout", 0, POPT_ARG_VAL, &connect_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-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 },
-@@ -716,6 +722,36 @@ int parse_arguments(int *argc, const cha
+ {"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 },
+@@ -1744,6 +1749,36 @@ int parse_arguments(int *argc_p, const char ***argv_p)
return 0;
#endif
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -1100,6 +1136,15 @@ void server_options(char **args,int *arg
+ * turned this option off. */
+@@ -2446,6 +2481,15 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
---- orig/rsync.yo 2004-11-11 22:13:11
-+++ rsync.yo 2004-07-15 02:44:40
-@@ -379,6 +379,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
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -431,6 +431,8 @@ to the detailed description below for a complete description. verb(
+ --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
+ --time-limit=MINS Stop rsync after MINS minutes have elapsed
- --write-batch=FILE write a batch to FILE
- --read-batch=FILE read a batch from FILE
- --checksum-seed=NUM set block/file checksum seed
-@@ -1007,6 +1009,19 @@ transfer was too fast, it will wait befo
+ --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
+@@ -2280,6 +2282,19 @@ transfer was too fast, it will wait before sending the next data block. The
result is an average transfer rate equaling the specified limit. A value
of zero specifies no limit.
+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"
- section for details.
---- orig/util.c 2004-09-07 21:45:30
-+++ util.c 2004-07-03 20:23:22
-@@ -126,6 +126,132 @@ void overflow(char *str)
+ another identical destination with bf(--read-batch). See the "BATCH MODE"
+ section for details, and also the bf(--only-write-batch) option.
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -123,6 +123,133 @@ NORETURN void overflow_exit(const char *str)
exit_cleanup(RERR_MALLOC);
}
+ } else
+ in_date = 1;
+ for ( ; ; cp++) {
-+ if (!isdigit(*cp))
++ if (!isDigit(cp))
+ return -1;
+
+ n = 0;
+ do {
+ n = n * 10 + *cp++ - '0';
-+ } while (isdigit(*cp));
++ } while (isDigit(cp));
+
+ if (*cp == ':')
+ in_date = 0;
+ }
+ return val;
+}
-
-
- int set_modtime(char *fname, time_t modtime)
++
+ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
+ {
+ #ifndef CAN_SET_SYMLINK_TIMES