Updated to apply cleanly.

[rsync/rsync-patches.git] / compare-dest.diff

diff --git a/compare-dest.diff b/compare-dest.diff
index 8270374..88ae3dc 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -7,8 +7,8 @@ they are suppled).
 
 Before compiling, be sure to run "make proto".
 
---- generator.c        29 Jun 2004 19:19:00 -0000      1.92
-+++ generator.c        30 Jun 2004 06:50:26 -0000
+--- generator.c        30 Jun 2004 07:27:30 -0000      1.93
++++ generator.c        30 Jun 2004 07:40:25 -0000
 @@ -42,7 +42,7 @@ extern int size_only;
  extern int io_timeout;
  extern int protocol_version;
@@ -166,7 +166,7 @@ Before compiling, be sure to run "make proto".
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  
-@@ -543,10 +563,11 @@ static void recv_generator(char *fname, 
+@@ -543,7 +563,8 @@ static void recv_generator(char *fname, 
  }
  
  
@@ -175,11 +175,7 @@ Before compiling, be sure to run "make proto".
 +                  int f_nameout)
  {
        int i;
--      int phase=0;
-+      int phase = 0;
-       char fbuf[MAXPATHLEN];
- 
-       if (verbose > 2) {
+       int phase = 0;
 @@ -584,7 +605,7 @@ void generate_files(int f, struct file_l
                }
  
@@ -207,20 +203,18 @@ Before compiling, be sure to run "make proto".
        }
  
        if (verbose > 2)
---- main.c     28 Jun 2004 17:45:40 -0000      1.201
-+++ main.c     30 Jun 2004 06:50:27 -0000
-@@ -428,8 +428,8 @@ static void do_server_sender(int f_in, i
- static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+--- main.c     30 Jun 2004 07:27:30 -0000      1.202
++++ main.c     30 Jun 2004 07:40:25 -0000
+@@ -429,7 +429,7 @@ static int do_recv(int f_in,int f_out,st
  {
        int pid;
--      int status=0;
+       int status = 0;
 -      int error_pipe[2];
-+      int status = 0;
 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);
-@@ -441,17 +441,19 @@ static int do_recv(int f_in,int f_out,st
+@@ -441,8 +441,8 @@ static int do_recv(int f_in,int f_out,st
                }
        }
  
@@ -231,10 +225,9 @@ Before compiling, be sure to run "make proto".
                exit_cleanup(RERR_SOCKETIO);
        }
  
-       io_flush(NORMAL_FLUSH);
+@@ -450,8 +450,10 @@ static int do_recv(int f_in,int f_out,st
  
--      if ((pid=do_fork()) == 0) {
-+      if ((pid = do_fork()) == 0) {
+       if ((pid = do_fork()) == 0) {
                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)
@@ -271,7 +264,7 @@ Before compiling, be sure to run "make proto".
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157
-+++ options.c  30 Jun 2004 06:50:27 -0000
++++ options.c  30 Jun 2004 07:40:26 -0000
 @@ -117,7 +117,8 @@ unsigned int backup_dir_remainder;
  
  char *backup_suffix = NULL;
@@ -398,8 +391,8 @@ Before compiling, be sure to run "make proto".
        }
  
        if (files_from && (!am_sender || remote_filesfrom_file)) {
---- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
-+++ receiver.c 30 Jun 2004 06:50:27 -0000
+--- receiver.c 30 Jun 2004 07:27:30 -0000      1.84
++++ receiver.c 30 Jun 2004 07:40:26 -0000
 @@ -36,7 +36,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;
@@ -465,7 +458,7 @@ Before compiling, be sure to run "make proto".
                         * wouldn't be necessary if robust_rename()
                         * and the underlying robust_unlink could cope
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
-+++ rsync.h    30 Jun 2004 06:50:27 -0000
++++ rsync.h    30 Jun 2004 07:40:26 -0000
 @@ -98,6 +98,8 @@
  
  #define MAX_ARGS 1000