Do we need configure support for mktime()?
---- io.c 15 May 2004 19:31:10 -0000 1.121
-+++ io.c 17 May 2004 21:26:50 -0000
-@@ -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;
+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: a59a7b242393699fedeb4f66911e3fc9b4fadd73
+diff --git a/io.c b/io.c
+--- a/io.c
++++ b/io.c
+@@ -58,6 +58,7 @@ extern int remove_source_files;
+ extern int preserve_hard_links;
+ extern BOOL extra_flist_sending_enabled;
+ extern struct stats stats;
+extern time_t stop_at_utime;
- static int no_flush;
-
- extern int bwlimit;
-@@ -125,15 +126,20 @@ static void check_timeout(void)
- {
- time_t t;
-
+ extern struct file_list *cur_flist;
+ #ifdef ICONV_OPTION
+ extern int filesfrom_convert;
+@@ -168,11 +169,19 @@ static void check_timeout(BOOL allow_keepalive)
+ * generator might be blocked trying to send checksums, it needs to
+ * know that the receiver is active). Thus, as long as one or the
+ * other is successfully doing work, the generator will not timeout. */
- if (!io_timeout)
+ if (!io_timeout && !stop_at_utime)
return;
-+ t = time(NULL);
-+
+ t = time(NULL);
+
+ if (stop_at_utime && t >= stop_at_utime) {
+ rprintf(FERROR, "run-time limit exceeded\n");
+ exit_cleanup(RERR_TIMEOUT);
+ }
+
- if (!last_io) {
-- last_io = time(NULL);
-+ last_io = t;
- return;
- }
--
-- t = time(NULL);
-
- if (last_io && io_timeout && (t-last_io) >= io_timeout) {
- if (!am_server && !am_daemon) {
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 17 May 2004 21:26:50 -0000
-@@ -92,6 +92,7 @@ int modify_window = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
- unsigned int block_size = 0;
++ if (!io_timeout)
++ return;
++
+ if (allow_keepalive) {
+ /* This may put data into iobuf.msg w/o flushing. */
+ maybe_send_keepalive(t, 0);
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -113,6 +113,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. **/
-@@ -288,6 +289,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;
+@@ -788,6 +789,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=RATE limit socket I/O bandwidth\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");
- #ifdef INET6
-@@ -305,7 +308,7 @@ void usage(enum logcode F)
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-- OPT_READ_BATCH, OPT_WRITE_BATCH,
-+ OPT_READ_BATCH, OPT_WRITE_BATCH, 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");
+@@ -812,6 +815,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+ 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_BWLIMIT,
++ OPT_STOP_AT, OPT_TIME_LIMIT,
+ OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -377,6 +380,8 @@ static struct poptOption long_options[]
- {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
- {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
- {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
+@@ -1005,6 +1009,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 },
- {"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 },
-@@ -584,6 +589,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 },
+@@ -1780,6 +1786,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). */
-@@ -881,6 +916,15 @@ void server_options(char **args,int *arg
+ * turned this option off. */
+@@ -2506,6 +2542,15 @@ void server_options(char **args, int *argc_p)
+ args[ac++] = arg;
+ }
- if (bwlimit) {
- if (asprintf(&arg, "--bwlimit=%d", bwlimit) < 0)
-+ goto oom;
-+ args[ac++] = arg;
-+ }
-+
+ if (stop_at_utime) {
+ long mins = (stop_at_utime - time(NULL)) / 60;
+ if (mins <= 0)
+ mins = 1;
+ if (asprintf(&arg, "--time-limit=%ld", mins) < 0)
- goto oom;
- args[ac++] = arg;
- }
---- rsync.yo 7 May 2004 00:18:37 -0000 1.169
-+++ rsync.yo 17 May 2004 21:26:52 -0000
-@@ -346,6 +346,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
++ goto oom;
++ args[ac++] = arg;
++ }
++
+ if (backup_dir) {
+ args[ac++] = "--backup-dir";
+ args[ac++] = backup_dir;
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -433,6 +433,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=RATE limit socket I/O bandwidth
+ --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
- -4 --ipv4 prefer IPv4
-@@ -890,6 +892,18 @@ of rsync transfers, blocks of data are s
- 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.
-+
+ --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
+@@ -2418,6 +2420,19 @@ files can show up as being rapidly sent when the data is quickly buffered,
+ while other can show up as very slow when the flushing of the output buffer
+ occurs. This may be fixed in a future version.
+
+dit(bf(--stop-at=y-m-dTh:m)) This option allows you to specify at what
+time to stop rsync, in year-month-dayThour:minute numeric format (e.g.
-+2004-12-3lT23:59). You can specify a 2 or 4-digit year. You can also
++2004-12-31T23:59). You can specify a 2 or 4-digit year. You can also
+leave off various items and the result will be the next possible time
+that matches the specified data. For example, "1-30" specifies the next
+January 30th (at midnight), "04:00" specifies the next 4am, "1"
+specifies the next 1st of the month at midnight, and ":59" specifies the
-+next 59th minute after the hour.
++next 59th minute after the hour. If you prefer, you may separate the
++date numbers using slashes instead of dashes.
+
+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
---- util.c 15 May 2004 19:31:10 -0000 1.143
-+++ util.c 17 May 2004 21:26:52 -0000
-@@ -122,6 +122,132 @@ void overflow(char *str)
++
+ 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, and also the bf(--only-write-batch) option.
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -125,6 +125,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)
++
+ /* This returns 0 for success, 1 for a symlink if symlink time-setting
+ * is not possible, or -1 for any other error. */
+ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
git.samba.org / rsync-patches.git / blobdiff