X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/58118c25b50ecc953096d3569aea7bbc6e0d3f25..8cec1eadd1339a0efc6ab45f559849143aa16e92:/g2r-basis-filename.diff

diff --git a/g2r-basis-filename.diff b/g2r-basis-filename.diff
index 787457e..3ef5a81 100644
--- a/g2r-basis-filename.diff
+++ b/g2r-basis-filename.diff
@@ -7,8 +7,8 @@ support for multiple --compare-dest options).
 
 You must run "make proto" before compiling.
 
---- generator.c	29 Jun 2004 19:19:00 -0000	1.92
-+++ generator.c	29 Jun 2004 19:24:22 -0000
+--- generator.c	30 Jun 2004 07:27:30 -0000	1.93
++++ generator.c	30 Jun 2004 07:45:03 -0000
 @@ -267,7 +267,7 @@ static void generate_and_send_sums(struc
   * out.  It might be wrong.
   */
@@ -121,7 +121,7 @@ You must run "make proto" before compiling.
  	write_int(f_out,i);
  	generate_and_send_sums(mapbuf, st.st_size, f_out);
  
-@@ -543,10 +559,11 @@ static void recv_generator(char *fname, 
+@@ -543,7 +559,8 @@ static void recv_generator(char *fname, 
  }
  
  
@@ -130,11 +130,7 @@ You must run "make proto" before compiling.
 +		    int f_nameout)
  {
  	int i;
--	int phase=0;
-+	int phase = 0;
- 	char fbuf[MAXPATHLEN];
- 
- 	if (verbose > 2) {
+ 	int phase = 0;
 @@ -584,7 +601,7 @@ void generate_files(int f, struct file_l
  		}
  
@@ -162,20 +158,18 @@ You must run "make proto" before compiling.
  	}
  
  	if (verbose > 2)
---- main.c	28 Jun 2004 17:45:40 -0000	1.201
-+++ main.c	29 Jun 2004 19:24:22 -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:45:03 -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
  		}
  	}
  
@@ -186,10 +180,9 @@ You must run "make proto" before compiling.
  		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)
@@ -225,8 +218,8 @@ You must run "make proto" before compiling.
  
  	get_redo_num(); /* Read final MSG_DONE and any prior messages. */
  	report(-1);
---- receiver.c	29 Jun 2004 15:12:01 -0000	1.83
-+++ receiver.c	29 Jun 2004 19:24:22 -0000
+--- receiver.c	30 Jun 2004 07:27:30 -0000	1.84
++++ receiver.c	30 Jun 2004 07:45:03 -0000
 @@ -293,14 +293,15 @@ static int receive_data(int f_in,struct 
   * main routine for receiver process.
   *