if (!am_server && !am_daemon) {
rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
(int)(t-last_io));
---- orig/options.c 2005-02-20 01:12:42
+--- orig/options.c 2005-02-21 10:51:52
+++ options.c 2005-01-28 19:35:23
@@ -104,6 +104,7 @@ int checksum_seed = 0;
int inplace = 0;
/** Network address family. **/
-@@ -337,6 +338,8 @@ void usage(enum logcode F)
+@@ -342,6 +343,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," --read-batch=FILE read a batched update from FILE\n");
#ifdef INET6
-@@ -354,6 +357,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -359,6 +362,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_TIMEOUT, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -439,6 +443,8 @@ static struct poptOption long_options[]
+@@ -444,6 +448,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 },
{"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 },
-@@ -853,6 +859,36 @@ int parse_arguments(int *argc, const cha
+@@ -860,6 +866,36 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1340,6 +1376,15 @@ void server_options(char **args,int *arg
+@@ -1349,6 +1385,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}