added seed to file sum

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index a088720..038a2d2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -46,6 +46,8 @@ int delete_mode=0;
 int one_file_system=0;
 int remote_version=0;
 int sparse_files=0;
+int do_compression=0;
+
 extern int csum_length;
 
 int am_server = 0;
@@ -304,12 +306,19 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 {
   int pid;
   int status=0;
+  int recv_pipe[2];
 
   if (preserve_hard_links)
     init_hard_links(flist);
 
+  if (pipe(recv_pipe) < 0) {
+    fprintf(FERROR,"pipe failed in do_recv\n");
+    exit(1);
+  }
+  
+
   if ((pid=fork()) == 0) {
-    recv_files(f_in,flist,local_name);
+    recv_files(f_in,flist,local_name,recv_pipe[1]);
     if (preserve_hard_links)
       do_hard_links(flist);
     if (verbose > 2)
@@ -317,7 +326,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
     exit_cleanup(0);
   }
 
-  generate_files(f_out,flist,local_name);
+  generate_files(f_out,flist,local_name,recv_pipe[0]);
 
   waitpid(pid, &status, 0);
 
@@ -638,16 +647,7 @@ int main(int argc,char *argv[])
       verbose = MAX(verbose,1);
 
     if (am_server) {
-      remote_version = read_int(STDIN_FILENO);
-      if (remote_version < MIN_PROTOCOL_VERSION ||
-         remote_version > MAX_PROTOCOL_VERSION) {
-       fprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
-       exit_cleanup(1);
-      }
-      write_int(STDOUT_FILENO,PROTOCOL_VERSION);
-      write_flush(STDOUT_FILENO);
-
-      setup_protocol();
+      setup_protocol(STDOUT_FILENO,STDIN_FILENO);
        
       if (sender) {
        recv_exclude_list(STDIN_FILENO);
@@ -717,18 +717,7 @@ int main(int argc,char *argv[])
 
     pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
 
-    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);
-      }        
-    }
-
-    setup_protocol();
+    setup_protocol(f_out,f_in);
 
     if (verbose > 3) 
       fprintf(FERROR,"parent=%d child=%d sender=%d recurse=%d\n",