Removed patch fuzz.

diff --git a/fname-convert.diff b/fname-convert.diff
index fb07e3f07ccf6297179b2d4eedc4d1e9d7b1a084..dcfe1ac0a68e75e71f14425958011db8b4cfda78 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -77,9 +77,9 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (cleanup_fname)
                do_unlink(cleanup_fname);
        if (code)
---- orig/errcode.h     2005-03-16 02:19:29
+--- orig/errcode.h     2005-04-13 02:59:47
 +++ errcode.h  2004-07-02 21:38:59
-@@ -35,6 +35,7 @@
+@@ -34,6 +34,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
  #define RERR_IPC        14      /* error in IPC code */
@@ -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-03-30 16:35:08
+--- orig/generator.c   2005-04-13 02:59:47
 +++ generator.c        2005-03-05 00:29:37
-@@ -580,7 +580,13 @@ static int phase = 0;
+@@ -583,7 +583,13 @@ static int phase = 0;
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
@@ -399,9 +399,9 @@ 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-03-31 03:03:27
+--- orig/log.c 2005-04-13 02:59:47
 +++ log.c      2004-07-03 20:18:02
-@@ -65,6 +65,7 @@ struct {
+@@ -64,6 +64,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
        { RERR_IPC        , "error in IPC code" },
@@ -409,9 +409,9 @@ 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        2005-03-30 16:57:27
+--- orig/main.c        2005-04-09 18:00:28
 +++ main.c     2004-07-22 00:31:47
-@@ -371,7 +371,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -374,7 +374,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-03-31 00:24:21
+--- orig/options.c     2005-04-09 18:00:28
 +++ options.c  2005-02-14 02:50:32
-@@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -138,6 +138,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *log_format = NULL;
@@ -430,7 +430,7 @@ 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;
-@@ -320,6 +321,7 @@ void usage(enum logcode F)
+@@ -321,6 +322,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");
@@ -438,7 +438,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    rprintf(F," -z, --compress              compress file data during the transfer\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");
-@@ -430,6 +432,7 @@ static struct poptOption long_options[] 
+@@ -434,6 +436,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 },
@@ -446,7 +446,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 },
    {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
---- orig/pipe.c        2005-02-07 20:36:43
+--- orig/pipe.c        2005-04-09 18:00:29
 +++ pipe.c     2004-07-03 20:18:02
 @@ -23,7 +23,6 @@
  
@@ -454,9 +454,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 write_batch;
  extern int filesfrom_fd;
-@@ -40,8 +39,10 @@ extern int filesfrom_fd;
+ 
+@@ -39,8 +38,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.
@@ -468,7 +468,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  {
        pid_t pid;
        int to_child_pipe[2];
-@@ -56,7 +57,7 @@ pid_t piped_child(char **command, int *f
+@@ -55,7 +56,7 @@ pid_t piped_child(char **command, int *f
                exit_cleanup(RERR_IPC);
        }
  
@@ -477,7 +477,7 @@ 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     2005-02-14 00:58:10
+--- orig/syscall.c     2005-04-07 17:04:26
 +++ syscall.c  2004-07-02 21:39:00
 @@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
@@ -514,9 +514,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2005-03-30 20:45:02
+--- orig/util.c        2005-04-04 16:28:37
 +++ util.c     2004-07-03 20:18:02
-@@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -1337,3 +1337,55 @@ uint32 fuzzy_distance(const char *s1, in
  
        return a[len2-1];
  }