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 f53c433..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;
@@ -38,16 +36,17 @@ 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 (remote_version == 0) {
                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);
                }
        }
@@ -55,15 +54,15 @@ void setup_protocol(int f_out,int f_in)
        if (remote_version < MIN_PROTOCOL_VERSION ||
            remote_version > MAX_PROTOCOL_VERSION) {
                rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
-               exit_cleanup(1);
+               rprintf(FERROR,"(see the rsync man page for an explanation)\n");
+               exit_cleanup(RERR_PROTOCOL);
        }       
        
-       if (verbose > 2)
-               rprintf(FINFO, "local_version=%d remote_version=%d\n",
-                       PROTOCOL_VERSION, remote_version);
-       
        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 {