Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index 57563b0..ef34b37 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -29,21 +29,21 @@ 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 prune_empty_dirs;
 extern int protocol_version;
+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;
        }
@@ -59,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);
        }
@@ -78,6 +78,40 @@ void setup_protocol(int f_out,int f_in)
                exit_cleanup(RERR_PROTOCOL);
        }
 
+       if (protocol_version < 29) {
+               if (fuzzy_basis) {
+                       rprintf(FERROR,
+                           "--fuzzy requires protocol 29 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+
+               if (basis_dir_cnt && inplace) {
+                       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) {
+                       rprintf(FERROR,
+                           "Using more than one %s option requires protocol"
+                           " 29 or higher (negotiated %d).\n",
+                           dest_option, protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+
+               if (prune_empty_dirs) {
+                       rprintf(FERROR,
+                           "--prune-empty-dirs requires protocol 29 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+       }
+
        if (am_server) {
                if (!checksum_seed)
                        checksum_seed = time(NULL);