Do we need configure support for mktime()?
---- io.c 15 May 2004 19:31:10 -0000 1.121
-+++ io.c 17 May 2004 19:39:48 -0000
+--- io.c 9 Jun 2004 03:07:50 -0000 1.129
++++ io.c 18 Jun 2004 17:38:20 -0000
@@ -44,6 +44,7 @@ static int io_multiplexing_in;
static int multiplex_in_fd = -1;
static int multiplex_out_fd = -1;
static int no_flush;
extern int bwlimit;
-@@ -125,15 +126,20 @@ static void check_timeout(void)
+@@ -128,16 +129,21 @@ static void check_timeout(void)
{
time_t t;
+ last_io = t;
return;
}
--
-- t = time(NULL);
+- 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 19:39:48 -0000
-@@ -92,6 +92,7 @@ int modify_window = 0;
+ rprintf(FERROR, "io timeout after %d seconds - exiting\n",
+--- options.c 7 Jun 2004 22:05:22 -0000 1.156
++++ options.c 18 Jun 2004 17:38:21 -0000
+@@ -95,6 +95,7 @@ int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
unsigned int block_size = 0;
/** Network address family. **/
-@@ -288,6 +289,8 @@ void usage(enum logcode F)
+@@ -292,6 +293,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," --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,
+ 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,
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_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
++ OPT_STOP_AT, OPT_TIME_LIMIT,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -377,6 +380,8 @@ static struct poptOption long_options[]
+@@ -383,6 +387,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 },
{"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
+@@ -596,6 +602,36 @@ int parse_arguments(int *argc, const cha
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
+@@ -903,6 +939,15 @@ void server_options(char **args,int *arg
+ 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 19:39:49 -0000
-@@ -346,6 +346,8 @@ verb(
++ goto oom;
++ args[ac++] = arg;
++ }
++
+ if (backup_dir) {
+ args[ac++] = "--backup-dir";
+ args[ac++] = backup_dir;
+--- rsync.yo 5 Jun 2004 16:16:30 -0000 1.171
++++ rsync.yo 18 Jun 2004 17:38:21 -0000
+@@ -347,6 +347,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
+ --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
+ --checksum-seed=NUM set block/file checksum seed
+@@ -897,6 +899,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(--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, "1T"
-+specifies the next 1st of the month at midnight, and "59" specifies the
-+next 59th minute after the hour.
++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. 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 19:39:49 -0000
-@@ -122,6 +122,129 @@ void overflow(char *str)
+ PREFIX. See the "BATCH MODE" section for details.
+--- util.c 9 Jun 2004 21:51:07 -0000 1.149
++++ util.c 18 Jun 2004 17:38:22 -0000
+@@ -125,6 +125,132 @@ void overflow(char *str)
exit_cleanup(RERR_MALLOC);
}
+ const char *cp;
+ time_t val, now = time(NULL);
+ struct tm t, *today = localtime(&now);
-+ int in_date = 1, n;
++ int in_date, n;
+
+ memset(&t, 0, sizeof t);
+ t.tm_year = t.tm_mon = t.tm_mday = -1;
+ t.tm_hour = t.tm_min = t.tm_isdst = -1;
-+ for (cp = arg; ; cp++) {
-+ if (isdigit(*cp)) {
-+ n = 0;
-+ do {
-+ n = n * 10 + *cp++ - '0';
-+ } while (isdigit(*cp));
-+ } else if ((*cp == 'T' || *cp == 't') && in_date) {
-+ in_date = 0;
-+ continue;
-+ } else
++ cp = arg;
++ if (*cp == 'T' || *cp == 't' || *cp == ':') {
++ cp++;
++ in_date = 0;
++ } else
++ in_date = 1;
++ for ( ; ; cp++) {
++ if (!isdigit(*cp))
+ return -1;
++
++ n = 0;
++ do {
++ n = n * 10 + *cp++ - '0';
++ } while (isdigit(*cp));
++
++ if (*cp == ':')
++ in_date = 0;
+ if (in_date) {
-+ if (*cp == ':' || (!*cp && t.tm_mday < 0))
-+ in_date = 0;
-+ else {
-+ if (t.tm_year != -1)
-+ return -1;
-+ t.tm_year = t.tm_mon;
-+ t.tm_mon = t.tm_mday;
-+ t.tm_mday = n;
-+ if (!*cp)
++ if (t.tm_year != -1)
++ return -1;
++ t.tm_year = t.tm_mon;
++ t.tm_mon = t.tm_mday;
++ t.tm_mday = n;
++ if (!*cp)
++ break;
++ if (*cp == 'T' || *cp == 't') {
++ if (!cp[1])
+ break;
-+ if (*cp == 'T' || *cp == 't') {
-+ if (!cp[1])
-+ break;
-+ in_date = 0;
-+ } else if (*cp != '-' && *cp != '/')
-+ return -1;
-+ continue;
-+ }
++ in_date = 0;
++ } else if (*cp != '-' && *cp != '/')
++ return -1;
++ continue;
+ }
+ if (t.tm_hour != -1)
+ return -1;
+ } else
+ t.tm_mon--;
+ if (t.tm_mday < 0) {
-+ if (t.tm_min < 0)
-+ return -1;
+ t.tm_mday = today->tm_mday;
+ in_date = 3;
+ }
+ n = 60*60;
+ }
+
-+ if ((val = mktime(&t)) == (time_t)-1)
++ if (t.tm_hour > 23 || t.tm_min > 59
++ || t.tm_mon < 0 || t.tm_mon >= 12
++ || t.tm_mday < 1 || t.tm_mday > 31
++ || (val = mktime(&t)) == (time_t)-1)
+ return -1;
+
+ if (val <= now && in_date) {
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff