John Taylor's patch for implementing --time-limit and --stop-at, reworked
to be simpler and more efficient by Wayne Davison.
-Do we need configure support for mktime() and strptime()?
+Do we need configure support for mktime()?
---- io.c 8 May 2004 18:03:43 -0000 1.120
-+++ io.c 8 May 2004 18:42:14 -0000
+--- io.c 15 May 2004 19:31:10 -0000 1.121
++++ io.c 17 May 2004 19:39:48 -0000
@@ -44,6 +44,7 @@ static int io_multiplexing_in;
static int multiplex_in_fd = -1;
static int multiplex_out_fd = -1;
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 8 May 2004 18:42:14 -0000
++++ options.c 17 May 2004 19:39:48 -0000
@@ -92,6 +92,7 @@ int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
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=YY-MM-DD@HH:MM Stop rsync at year-month-day@hour:minute\n");
-+ rprintf(F," --time-limit=TIME Stop rsync after TIME minutes have elapsed\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
{"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 },
-@@ -471,6 +476,7 @@ int parse_arguments(int *argc, const cha
- {
- int opt;
- char *ref = lp_refuse_options(module_id);
-+ struct tm stop_at_tm;
- const char *arg;
- poptContext pc;
-
-@@ -584,6 +590,37 @@ int parse_arguments(int *argc, const cha
+@@ -584,6 +589,36 @@ int parse_arguments(int *argc, const cha
return 0;
#endif
+ case OPT_STOP_AT:
+ arg = poptGetOptArg(pc);
-+ if (!strptime(arg, "%y-%m-%d@%H:%M", &stop_at_tm)) {
++ if ((stop_at_utime = parse_time(arg)) == (time_t)-1) {
+ snprintf(err_buf, sizeof err_buf,
+ "invalid --stop-at format: %s\n",
+ arg);
+ rprintf(FERROR, "ERROR: %s", err_buf);
+ return 0;
+ }
-+ stop_at_utime = mktime(&stop_at_tm);
+ if (stop_at_utime < time(NULL)) {
+ snprintf(err_buf, sizeof err_buf,
+ "--stop-at time is in the past: %s\n",
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -881,6 +918,15 @@ void server_options(char **args,int *arg
+@@ -881,6 +916,15 @@ void server_options(char **args,int *arg
if (bwlimit) {
if (asprintf(&arg, "--bwlimit=%d", bwlimit) < 0)
args[ac++] = arg;
}
--- rsync.yo 7 May 2004 00:18:37 -0000 1.169
-+++ rsync.yo 8 May 2004 18:42:15 -0000
++++ rsync.yo 17 May 2004 19:39:49 -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
-+ --stop-at=YY-MM-DD@HH:MM Stop rsync at year-month-day@hour:minute
-+ --time-limit=TIME Stop rsync after TIME minutes have elapsed
++ --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,13 @@ of rsync transfers, blocks of data are s
+@@ -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.
+
-+dit(bf(--stop-at=YY-MM-DD@HH:MM)) This option allows you to specify at what
-+time to stop rsync, in year-month-day@hour:minute numeric format (e.g.
-+04-12-3l@23:59).
++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
++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.
+
-+dit(bf(--time-limit=TIME)) This option allows you to specify the maximum
++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)
+ exit_cleanup(RERR_MALLOC);
+ }
+
++/* Allow the user to specify a time in the format yyyy-mm-ddThh:mm while
++ * also allowing abbreviated data. For instance, if the time is omitted,
++ * it defaults to midnight. If the date is omitted, it defaults to the
++ * next possible date in the future with the specified time. Even the
++ * year or year-month can be omitted, again defaulting to the next date
++ * in the future that matches the specified information. A 2-digit year
++ * is also OK, as is using '/' instead of '-'. */
++time_t parse_time(const char *arg)
++{
++ const char *cp;
++ time_t val, now = time(NULL);
++ struct tm t, *today = localtime(&now);
++ int in_date = 1, 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
++ return -1;
++ 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)
++ break;
++ if (*cp == 'T' || *cp == 't') {
++ if (!cp[1])
++ break;
++ in_date = 0;
++ } else if (*cp != '-' && *cp != '/')
++ return -1;
++ continue;
++ }
++ }
++ if (t.tm_hour != -1)
++ return -1;
++ t.tm_hour = t.tm_min;
++ t.tm_min = n;
++ if (!*cp)
++ break;
++ if (*cp != ':')
++ return -1;
++ }
++
++ in_date = 0;
++ if (t.tm_year < 0) {
++ t.tm_year = today->tm_year;
++ in_date = 1;
++ } else if (t.tm_year < 100) {
++ while (t.tm_year < today->tm_year)
++ t.tm_year += 100;
++ } else
++ t.tm_year -= 1900;
++ if (t.tm_mon < 0) {
++ t.tm_mon = today->tm_mon;
++ in_date = 2;
++ } 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 = 0;
++ if (t.tm_min < 0) {
++ t.tm_hour = t.tm_min = 0;
++ } else if (t.tm_hour < 0) {
++ if (in_date != 3)
++ return -1;
++ in_date = 0;
++ t.tm_hour = today->tm_hour;
++ n = 60*60;
++ }
++
++ if ((val = mktime(&t)) == (time_t)-1)
++ return -1;
++
++ if (val <= now && in_date) {
++ tweak_date:
++ switch (in_date) {
++ case 3:
++ t.tm_mday++;
++ break;
++ case 2:
++ if (++t.tm_mon == 12)
++ t.tm_mon = 0;
++ else
++ break;
++ case 1:
++ t.tm_year++;
++ break;
++ }
++ if ((val = mktime(&t)) == (time_t)-1) {
++ if (in_date == 3 && t.tm_mday > 28) {
++ t.tm_mday = 1;
++ in_date = 2;
++ goto tweak_date;
++ }
++ return -1;
++ }
++ }
++ if (n) {
++ while (val <= now)
++ val += n;
++ }
++ return val;
++}
+
+
+ int set_modtime(char *fname, time_t modtime)
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff