- Added set_io_timeout(), which sets all the timeout-dependent

[rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index 6bd1a57d597f4d3a309219963ba3fe646aee5001..be0bf473cb5e425682217ce3f1fb1967fccc1f0a 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -27,26 +27,31 @@
 
 int remote_protocol = 0;
 
+extern int verbose;
 extern int am_server;
-
+extern int am_sender;
+extern int inplace;
+extern int fuzzy_basis;
+extern int read_batch;
 extern int checksum_seed;
-
+extern int basis_dir_cnt;
 extern int protocol_version;
-extern int verbose;
+extern char *dest_option;
 
 void setup_protocol(int f_out,int f_in)
 {
        if (remote_protocol == 0) {
-               if (am_server) {
-                       remote_protocol = read_int(f_in);
+               if (!read_batch)
                        write_int(f_out, protocol_version);
-               } else {
-                       write_int(f_out, protocol_version);
-                       remote_protocol = read_int(f_in);
-               }
+               remote_protocol = read_int(f_in);
                if (protocol_version > remote_protocol)
                        protocol_version = remote_protocol;
        }
+       if (read_batch && remote_protocol > protocol_version) {
+               rprintf(FERROR, "The protocol version in the batch file is too new (%d > %d).\n",
+                       remote_protocol, protocol_version);
+               exit_cleanup(RERR_PROTOCOL);
+       }
 
        if (verbose > 3) {
                rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n",
@@ -54,7 +59,7 @@ void setup_protocol(int f_out,int f_in)
        }
        if (remote_protocol < MIN_PROTOCOL_VERSION
         || remote_protocol > MAX_PROTOCOL_VERSION) {
-               rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
+               rprintf(FERROR,"protocol version mismatch -- is your shell clean?\n");
                rprintf(FERROR,"(see the rsync man page for an explanation)\n");
                exit_cleanup(RERR_PROTOCOL);
        }
@@ -73,6 +78,27 @@ void setup_protocol(int f_out,int f_in)
                exit_cleanup(RERR_PROTOCOL);
        }
 
+       if (fuzzy_basis && protocol_version < 29) {
+               rprintf(FERROR,
+                       "--fuzzy requires protocol 29 or higher (negotiated %d).\n",
+                       protocol_version);
+               exit_cleanup(RERR_PROTOCOL);
+       }
+
+       if (basis_dir_cnt && inplace && protocol_version < 29) {
+               rprintf(FERROR,
+                       "%s with --inplace requires protocol 29 or higher (negotiated %d).\n",
+                       dest_option, protocol_version);
+               exit_cleanup(RERR_PROTOCOL);
+       }
+
+       if (basis_dir_cnt > 1 && protocol_version < 29) {
+               rprintf(FERROR,
+                       "Multiple %s options requires protocol 29 or higher (negotiated %d).\n",
+                       dest_option, protocol_version);
+               exit_cleanup(RERR_PROTOCOL);
+       }
+
        if (am_server) {
                if (!checksum_seed)
                        checksum_seed = time(NULL);