Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganize the build-farm "prepare-source" magic a little.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
4c040b9
..
8ca164b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-63,6
+63,7
@@
extern int read_batch;
extern int write_batch;
extern int batch_fd;
extern int filesfrom_fd;
extern int write_batch;
extern int batch_fd;
extern int filesfrom_fd;
+extern int connect_timeout;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
@@
-1264,6
+1265,12
@@
static int start_client(int argc, char *argv[])
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
+ if (connect_timeout) {
+ rprintf(FERROR, "The --contimeout option may only be "
+ "used when connecting to an rsync daemon.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+
if (shell_machine) {
p = strrchr(shell_machine,'@');
if (p) {
if (shell_machine) {
p = strrchr(shell_machine,'@');
if (p) {