Split code to generate "rwx-----" strings into lib/permstring.c so it

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index 237e40c..72e0f99 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -23,8 +23,6 @@
 
 extern int am_server;
 
-extern int csum_length;
-
 extern int preserve_links;
 extern int preserve_perms;
 extern int preserve_devices;
@@ -36,34 +34,42 @@ extern int checksum_seed;
 
 
 extern int remote_version;
+extern int verbose;
+
+extern int read_batch;  /* dw */
+extern int write_batch;  /* dw */
 
 void setup_protocol(int f_out,int f_in)
 {
-  if (am_server) {
-    remote_version = read_int(f_in);
-    write_int(f_out,PROTOCOL_VERSION);
-    write_flush(f_out);
-  } else {
-    write_int(f_out,PROTOCOL_VERSION);
-    write_flush(f_out);
-    remote_version = read_int(f_in);
-  }
-
-  if (remote_version < MIN_PROTOCOL_VERSION ||
-      remote_version > MAX_PROTOCOL_VERSION) {
-    fprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
-    exit_cleanup(1);
-  }    
-
-  if (remote_version >= 12) {
-    if (am_server) {
-      checksum_seed = time(NULL);
-      write_int(f_out,checksum_seed);
-    } else {
-      checksum_seed = read_int(f_in);
-    }
-  }
+       if (remote_version == 0) {
+               if (am_server) {
+                       remote_version = read_int(f_in);
+                       write_int(f_out,PROTOCOL_VERSION);
+               } else {
+                       write_int(f_out,PROTOCOL_VERSION);
+                       remote_version = read_int(f_in);
+               }
+       }
 
-  checksum_init();
+       if (remote_version < MIN_PROTOCOL_VERSION ||
+           remote_version > MAX_PROTOCOL_VERSION) {
+               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);
+       }       
+       
+       if (remote_version >= 12) {
+               if (am_server) {
+                   if (read_batch || write_batch) /* dw */
+                       checksum_seed = 32761;
+                   else
+                       checksum_seed = time(NULL);
+                       write_int(f_out,checksum_seed);
+               } else {
+                       checksum_seed = read_int(f_in);
+               }
+       }
+       
+       checksum_init();
 }