Fixed failing hunk.

diff --git a/fname-convert.diff b/fname-convert.diff
index 3eb4b7f..173bf94 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -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       2005-09-29 07:43:17
+--- orig/flist.c       2005-10-19 08:24:28
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -97,7 +97,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  extern struct stats stats;
  extern struct file_list *the_file_list;
  
-@@ -339,7 +340,10 @@ void send_file_entry(struct file_struct 
+@@ -332,7 +333,10 @@ void send_file_entry(struct file_struct 
  
        io_write_phase = "send_file_entry";
  
@@ -109,7 +109,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        flags = base_flags;
  
-@@ -550,6 +554,9 @@ static struct file_struct *receive_file_
+@@ -541,6 +545,9 @@ static struct file_struct *receive_file_
  
        strlcpy(lastname, thisname, MAXPATHLEN);
  
@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname, 0);
  
        if (sanitize_paths)
-@@ -1077,6 +1084,9 @@ struct file_list *send_file_list(int f, 
+@@ -1064,6 +1071,9 @@ struct file_list *send_file_list(int f, 
        start_write = stats.total_written;
        gettimeofday(&start_tv, NULL);
  
@@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "send_file_list");
  
        io_start_buffering_out();
-@@ -1281,6 +1291,9 @@ struct file_list *send_file_list(int f, 
+@@ -1268,6 +1278,9 @@ struct file_list *send_file_list(int f, 
        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->count;
  
@@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (verbose > 3)
                output_flist(flist);
  
-@@ -1302,6 +1315,9 @@ struct file_list *recv_file_list(int f)
+@@ -1288,6 +1301,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -149,7 +149,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;
-@@ -1354,6 +1370,9 @@ struct file_list *recv_file_list(int f)
+@@ -1340,6 +1356,9 @@ struct file_list *recv_file_list(int f)
                        io_error |= read_int(f);
        }
  
@@ -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   2005-09-29 17:02:40
+--- orig/generator.c   2005-10-14 20:03:01
 +++ generator.c        2005-03-05 00:29:37
-@@ -593,7 +593,13 @@ static int phase = 0;
+@@ -594,7 +594,13 @@ static int phase = 0;
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
@@ -399,7 +399,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 ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)
---- orig/log.c 2005-09-26 17:09:36
+--- orig/log.c 2005-10-26 16:49:08
 +++ log.c      2005-09-29 17:23:54
 @@ -67,6 +67,7 @@ struct {
        { RERR_IPC        , "error in IPC code" },
@@ -407,11 +407,11 @@ Note that you'll need to run 'make proto' after applying this patch.
        { RERR_TERMINATED , "sibling process terminated abnormally" },
 +      { RERR_FNAMECONV  , "error in filename conversion" },
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
-       { RERR_WAITCHILD  , "some error returned by waitpid()" },
+       { RERR_WAITCHILD  , "waitpid() failed" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c        2005-09-29 07:30:01
+--- orig/main.c        2005-10-26 16:49:08
 +++ main.c     2004-07-22 00:31:47
-@@ -384,7 +384,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -391,7 +391,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
@@ -420,9 +420,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-09-29 07:42:04
-+++ options.c  2005-08-27 21:20:59
-@@ -138,6 +138,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+--- orig/options.c     2005-10-26 16:49:08
++++ options.c  2005-10-26 16:49:33
+@@ -141,6 +141,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *log_format = NULL;
@@ -430,23 +430,23 @@ Note that you'll need to run 'make proto' after applying this patch.
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
-@@ -321,6 +322,7 @@ void usage(enum logcode F)
+@@ -325,6 +326,7 @@ void usage(enum logcode F)
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
 +  rprintf(F,"     --fname-convert=CMD     invoke CMD for filename conversion\n");
    rprintf(F," -z, --compress              compress file data during the transfer\n");
+   rprintf(F,"     --compress-level=NUM    explicitly set compression level\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
-   rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -447,6 +449,7 @@ static struct poptOption long_options[] 
+@@ -454,6 +456,7 @@ static struct poptOption long_options[] 
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
 +  {"fname-convert",    0,  POPT_ARG_STRING, &fname_convert_cmd, 0, 0, 0 },
-   {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
+   {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
+   {"compress-level",   0,  POPT_ARG_INT,    &def_compress_level, 'z', 0, 0 },
    {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
-   {"progress",         0,  POPT_ARG_VAL,    &do_progress, 1, 0, 0 },
---- orig/pipe.c        2005-04-09 18:00:29
+--- orig/pipe.c        2005-10-24 21:04:45
 +++ pipe.c     2004-07-03 20:18:02
 @@ -23,7 +23,6 @@
  
@@ -514,9 +514,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2005-08-17 06:45:08
+--- orig/util.c        2005-10-16 22:38:40
 +++ util.c     2004-07-03 20:18:02
-@@ -1348,3 +1348,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -1353,3 +1353,55 @@ uint32 fuzzy_distance(const char *s1, in
  
        return a[len2-1];
  }