From: Wayne Davison <wayned@samba.org>
Date: Thu, 14 Oct 2004 17:21:03 +0000 (+0000)
Subject: Fixed failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/cc6497db24201ec1b784dcfe3fa03aa304f1745b

Fixed failing hunk.
---

diff --git a/fname-convert.diff b/fname-convert.diff
index ce29dd3..2e5232c 100644
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -47,7 +47,7 @@ some utility functions.
 Note that you'll need to run 'make proto' after applying this patch.
 
 
---- orig/Makefile.in	2004-08-13 07:18:58
+--- orig/Makefile.in	2004-10-14 17:11:40
 +++ Makefile.in	2004-07-03 20:18:02
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
  	main.o checksum.o match.o syscall.o log.o backup.o
@@ -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-29 16:08:03
+--- orig/cleanup.c	2004-10-14 17:11:40
 +++ 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
-@@ -122,6 +123,8 @@ void _exit_cleanup(int code, const char 
+@@ -124,6 +125,8 @@ void _exit_cleanup(int code, const char 
  		finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
  	}
  	io_flush(FULL_FLUSH);
@@ -382,7 +382,7 @@ 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-09-20 19:50:13
+--- orig/generator.c	2004-10-06 00:12:16
 +++ generator.c	2004-07-03 20:18:02
 @@ -252,6 +252,12 @@ static void generate_and_send_sums(int f
   *
@@ -407,7 +407,7 @@ 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-09-29 17:58:26
+--- orig/main.c	2004-10-08 20:16:26
 +++ main.c	2004-07-22 00:31:47
 @@ -332,7 +332,7 @@ static pid_t do_cmd(char *cmd, char *mac
  			whole_file = 1;
@@ -418,8 +418,8 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  	if (dir)
  		free(dir);
---- orig/options.c	2004-09-23 17:42:07
-+++ options.c	2004-07-03 20:18:02
+--- orig/options.c	2004-10-14 17:11:40
++++ options.c	2004-10-14 17:19:47
 @@ -129,6 +129,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
@@ -436,14 +436,14 @@ Note that you'll need to run 'make proto' after applying this patch.
    rprintf(F," -z, --compress              compress file data\n");
    rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS does\n");
    rprintf(F,"     --exclude=PATTERN       exclude files matching PATTERN\n");
-@@ -378,6 +380,7 @@ static struct poptOption long_options[] 
+@@ -371,6 +373,7 @@ static struct poptOption long_options[] 
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
-   {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
+   {"link-dest",        0,  POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 },
 +  {"fname-convert",    0,  POPT_ARG_STRING, &fname_convert_cmd, 0, 0, 0 },
    /* 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 },
+   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
 --- orig/pipe.c	2004-08-12 18:34:38
 +++ pipe.c	2004-07-03 20:18:02
 @@ -23,7 +23,6 @@
@@ -475,9 +475,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  	if (pid == -1) {
  		rsyserr(FERROR, errno, "fork");
  		exit_cleanup(RERR_IPC);
---- orig/syscall.c	2004-08-02 21:56:59
+--- orig/syscall.c	2004-10-06 00:12:16
 +++ syscall.c	2004-07-02 21:39:00
-@@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
+@@ -265,3 +265,34 @@ char *d_name(struct dirent *di)
  	return di->d_name;
  #endif
  }