Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index f30a9f5..ef34b37 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -28,13 +28,15 @@
 int remote_protocol = 0;
 
 extern int verbose;
-extern int itemize_changes;
 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)
 {
@@ -76,15 +78,39 @@ void setup_protocol(int f_out,int f_in)
                exit_cleanup(RERR_PROTOCOL);
        }
 
-       if (fuzzy_basis && protocol_version < 29) {
-               rprintf(FERROR,
-                       "--fuzzy requres protocol 29 or higher (negotiated %d).\n",
-                       protocol_version);
-               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 (itemize_changes && protocol_version < 29)
-               itemize_changes = 0;
+               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)