Do we need configure support for mktime()?
---- io.c 15 May 2004 19:31:10 -0000 1.121
-+++ io.c 22 May 2004 19:33:07 -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;
+--- orig/io.c 2005-08-17 06:45:07
++++ io.c 2005-05-19 09:01:27
+@@ -57,6 +57,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;
- static int no_flush;
+ extern struct file_list *the_file_list;
- extern int bwlimit;
-@@ -125,16 +126,21 @@ static void check_timeout(void)
+ const char phase_unknown[] = "unknown";
+@@ -165,16 +166,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 (last_io && 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",
---- options.c 22 May 2004 06:09:22 -0000 1.151
-+++ options.c 22 May 2004 19:33:07 -0000
-@@ -92,6 +92,7 @@ int modify_window = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
- unsigned int block_size = 0;
+ rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
+--- orig/options.c 2005-08-27 21:11:26
++++ options.c 2005-08-27 21:27:57
+@@ -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. */
+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");
+@@ -344,6 +345,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=PREFIX write batch fileset starting with PREFIX\n");
- rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n");
- rprintf(F," --checksum-seed=NUM set block/file checksum seed\n");
-@@ -306,7 +309,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,
+ 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");
+@@ -364,6 +367,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+ OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, 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_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
++ OPT_STOP_AT, OPT_TIME_LIMIT,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -378,6 +381,8 @@ static struct poptOption long_options[]
- {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
+@@ -458,6 +462,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 },
+ {"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", 'b', POPT_ARG_NONE, &make_backups, 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 },
-@@ -587,6 +592,36 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
+ {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
+@@ -916,6 +922,36 @@ int parse_arguments(int *argc, const cha
+ basis_dir[basis_dir_cnt++] = (char *)arg;
+ break;
+ case OPT_STOP_AT:
+ arg = poptGetOptArg(pc);
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -886,6 +921,15 @@ void server_options(char **args,int *arg
+ * turned this option off. */
+@@ -1412,6 +1448,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
---- rsync.yo 21 May 2004 09:44:32 -0000 1.170
-+++ rsync.yo 22 May 2004 19:33:08 -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
+--- orig/rsync.yo 2005-08-27 21:05:12
++++ rsync.yo 2005-02-01 10:46:35
+@@ -378,6 +378,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=PREFIX write batch fileset starting with PREFIX
- --read-batch=PREFIX read batch fileset starting with PREFIX
- --checksum-seed=NUM set block/file checksum seed
-@@ -892,6 +894,18 @@ 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
+@@ -1320,6 +1322,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, "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
- PREFIX. See the "BATCH MODE" section for details.
---- util.c 21 May 2004 08:40:25 -0000 1.144
-+++ util.c 22 May 2004 19:33:08 -0000
-@@ -125,6 +125,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.
+--- orig/util.c 2005-08-17 06:45:08
++++ util.c 2004-07-03 20:23:22
+@@ -126,6 +126,132 @@ void overflow_exit(char *str)
exit_cleanup(RERR_MALLOC);
}
+}
- int set_modtime(char *fname, time_t modtime)
+ int set_modtime(char *fname, time_t modtime, mode_t mode)
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff