Do we need configure support for mktime()?
---- orig/io.c 2005-04-07 17:04:26
-+++ io.c 2005-03-05 00:32:06
-@@ -56,6 +56,7 @@ extern int remove_sent_files;
+--- old/io.c
++++ new/io.c
+@@ -57,6 +57,7 @@ extern int remove_sent_files;
extern int preserve_hard_links;
extern char *filesfrom_host;
extern struct stats stats;
extern struct file_list *the_file_list;
const char phase_unknown[] = "unknown";
-@@ -163,16 +164,24 @@ static void check_timeout(void)
+@@ -168,16 +169,24 @@ static void check_timeout(void)
{
time_t t;
if (!io_timeout || ignore_timeout)
return;
- if (!last_io) {
-- last_io = time(NULL);
-+ last_io = t;
+ if (!last_io_in) {
+- last_io_in = time(NULL);
++ last_io_in = t;
return;
}
- t = time(NULL);
-
- if (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",
---- orig/options.c 2005-05-10 15:32:58
-+++ options.c 2005-04-09 18:03:53
-@@ -106,6 +106,7 @@ int checksum_seed = 0;
+--- old/options.c
++++ new/options.c
+@@ -116,6 +116,7 @@ int checksum_seed = 0;
int inplace = 0;
int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
/** Network address family. **/
-@@ -344,6 +345,8 @@ void usage(enum logcode F)
+@@ -365,6 +366,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," --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");
-@@ -365,6 +368,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH,
- OPT_TIMEOUT, OPT_MAX_SIZE,
-+ OPT_STOP_AT, OPT_TIME_LIMIT,
- OPT_REFUSED_BASE = 9000};
+@@ -385,7 +388,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+ OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
+ 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_NO_D, OPT_STOP_AT, OPT_TIME_LIMIT,
+ OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -451,6 +455,8 @@ static struct poptOption long_options[]
+@@ -494,6 +497,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 },
+ {"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 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 },
+ {"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 },
- {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
-@@ -882,6 +888,36 @@ int parse_arguments(int *argc, const cha
- basis_dir[basis_dir_cnt++] = (char *)arg;
- break;
+ {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
+@@ -1060,6 +1065,36 @@ int parse_arguments(int *argc, const cha
+ usage(FINFO);
+ exit_cleanup(0);
+ case OPT_STOP_AT:
+ arg = poptGetOptArg(pc);
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1369,6 +1405,15 @@ void server_options(char **args,int *arg
+@@ -1610,6 +1645,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
---- orig/rsync.yo 2005-05-10 16:14:33
-+++ rsync.yo 2005-02-01 10:46:35
-@@ -379,6 +379,8 @@ to the detailed description below for a
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -388,6 +388,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
--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
-@@ -1278,6 +1280,19 @@ transfer was too fast, it will wait befo
+@@ -1584,6 +1586,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(--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-05-03 16:47:33
-+++ util.c 2004-07-03 20:23:22
-@@ -126,6 +126,132 @@ void overflow(char *str)
+--- old/util.c
++++ new/util.c
+@@ -125,6 +125,133 @@ void overflow_exit(char *str)
exit_cleanup(RERR_MALLOC);
}
+ }
+ return val;
+}
-
-
- int set_modtime(char *fname, time_t modtime)
++
+ int set_modtime(char *fname, time_t modtime, mode_t mode)
+ {
+ #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff