Fixed failing hunk.

diff --git a/fname-convert.diff b/fname-convert.diff
index 51c6cb0..1789e19 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -87,8 +87,8 @@ 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-08-11 23:42:23
-+++ flist.c    2004-07-03 20:18:02
+--- orig/flist.c       2004-08-12 18:34:38
++++ flist.c    2004-08-12 18:35:53
 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
  extern int recurse;
@@ -116,7 +116,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      if (fname_convert_cmd && !am_server) /* fname conversion always done on client */
 +              convert_fname(thisname, lastname, MAXPATHLEN);
 +
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
  
        if (sanitize_paths)
 @@ -1057,6 +1064,9 @@ struct file_list *send_file_list(int f, 
@@ -397,7 +397,7 @@ Note that you'll need to run 'make proto' after applying this patch.
   */
  static void recv_generator(char *fname, struct file_struct *file, int i,
                           int f_out)
---- orig/log.c 2004-06-09 15:34:38
+--- orig/log.c 2004-08-12 18:34:38
 +++ log.c      2004-07-03 20:18:02
 @@ -57,6 +57,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
@@ -418,7 +418,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2004-08-11 23:42:23
+--- orig/options.c     2004-08-12 18:34:38
 +++ options.c  2004-07-03 20:18:02
 @@ -129,6 +129,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-21 23:59:35
+--- orig/pipe.c        2004-08-12 18:34:38
 +++ pipe.c     2004-07-03 20:18:02
 @@ -23,7 +23,6 @@
  
@@ -512,9 +512,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2004-08-11 23:42:23
+--- orig/util.c        2004-08-12 18:34:39
 +++ util.c     2004-07-03 20:18:02
-@@ -1231,3 +1231,55 @@ void *_realloc_array(void *ptr, unsigned
+@@ -1219,3 +1219,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);
        return realloc(ptr, size * num);
  }