X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/dc3ae351000b9ac2c8c77093a45e2984d562ad08..2f5fa77e39d1beb21a251e1ca17aa119525f9f68:/fname-convert.diff

diff --git a/fname-convert.diff b/fname-convert.diff
index 2e20027..052bbeb 100644
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -58,7 +58,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
  	popt/popthelp.o popt/poptparse.o
---- orig/cleanup.c	2004-07-02 18:11:26
+--- orig/cleanup.c	2004-07-20 21:36:07
 +++ cleanup.c	2004-07-03 20:18:02
 @@ -24,6 +24,7 @@
  extern int io_error;
@@ -68,7 +68,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  /**
   * Close all open sockets and files, allowing a (somewhat) graceful
-@@ -124,6 +125,8 @@ void _exit_cleanup(int code, const char 
+@@ -121,6 +122,8 @@ void _exit_cleanup(int code, const char 
  		finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
  	}
  	io_flush(FULL_FLUSH);
@@ -87,7 +87,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
---- orig/flist.c	2004-07-15 02:21:10
+--- orig/flist.c	2004-07-17 15:20:05
 +++ flist.c	2004-07-03 20:18:02
 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
@@ -382,9 +382,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +	if (verbose > 2)
 +		rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}
---- orig/generator.c	2004-07-16 19:35:29
+--- orig/generator.c	2004-07-21 23:59:35
 +++ generator.c	2004-07-03 20:18:02
-@@ -249,6 +249,12 @@ static void generate_and_send_sums(struc
+@@ -256,6 +256,12 @@ static void generate_and_send_sums(int f
   *
   * @note This comment was added later by mbp who was trying to work it
   * out.  It might be wrong.
@@ -407,18 +407,18 @@ Note that you'll need to run 'make proto' after applying this patch.
  	{ RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
  	{ RERR_WAITCHILD  , "some error returned by waitpid()" },
  	{ RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c	2004-07-15 17:02:03
-+++ main.c	2004-07-03 20:18:02
-@@ -318,7 +318,7 @@ static pid_t do_cmd(char *cmd, char *mac
+--- orig/main.c	2004-07-21 23:59:35
++++ main.c	2004-07-22 00:31:47
+@@ -329,7 +329,7 @@ static pid_t do_cmd(char *cmd, char *mac
  			whole_file = 1;
  		ret = local_child(argc, args, f_in, f_out, child_main);
- 	} else {
+ 	} else
 -		ret = piped_child(args,f_in,f_out);
 +		ret = piped_child(args, f_in, f_out, blocking_io, 1);
- 	}
  
  	if (dir)
---- orig/options.c	2004-07-16 20:07:22
+ 		free(dir);
+--- orig/options.c	2004-07-21 23:59:35
 +++ options.c	2004-07-03 20:18:02
 @@ -128,6 +128,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
@@ -444,7 +444,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
---- orig/pipe.c	2004-07-15 02:21:11
+--- orig/pipe.c	2004-07-21 23:59:35
 +++ pipe.c	2004-07-03 20:18:02
 @@ -23,7 +23,6 @@
  
@@ -452,9 +452,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  extern int am_server;
 -extern int blocking_io;
  extern int orig_umask;
- extern int read_batch;
  extern int write_batch;
-@@ -41,8 +40,10 @@ extern int filesfrom_fd;
+ extern int filesfrom_fd;
+@@ -40,8 +39,10 @@ extern int filesfrom_fd;
   * If blocking_io is set then use blocking io on both fds. That can be
   * used to cope with badly broken rsh implementations like the one on
   * Solaris.
@@ -466,7 +466,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  {
  	pid_t pid;
  	int to_child_pipe[2];
-@@ -57,7 +58,7 @@ pid_t piped_child(char **command, int *f
+@@ -56,7 +57,7 @@ pid_t piped_child(char **command, int *f
  		exit_cleanup(RERR_IPC);
  	}