Fixed failing hunks.

[rsync/rsync-patches.git] / fname-convert.diff

diff --git a/fname-convert.diff b/fname-convert.diff
index eac4927..aed07a7 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -87,15 +87,15 @@ 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-02-26 19:27:54
-+++ flist.c    2005-02-26 19:32:53
-@@ -59,6 +59,7 @@ extern int copy_unsafe_links;
+--- orig/flist.c       2005-03-04 08:27:33
++++ flist.c    2005-03-05 00:29:08
+@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
  extern int sanitize_paths;
  extern int orig_umask;
 +extern char *fname_convert_cmd;
- 
- extern char curr_dir[MAXPATHLEN];
+ extern struct stats stats;
+ extern struct file_list *the_file_list;
  
 @@ -338,7 +339,10 @@ void send_file_entry(struct file_struct 
  
@@ -147,9 +147,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +              init_fname_convert();
 +
        flist = flist_new(WITH_HLINK, "recv_file_list");
-       received_flist = flist;
  
-@@ -1327,6 +1343,9 @@ struct file_list *recv_file_list(int f)
+       flist->count = 0;
+@@ -1326,6 +1342,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-02-27 18:24:42
-+++ generator.c        2005-02-03 02:07:33
-@@ -554,7 +554,13 @@ static int find_fuzzy(struct file_struct
+--- orig/generator.c   2005-03-05 00:25:24
++++ generator.c        2005-03-05 00:29:37
+@@ -572,7 +572,13 @@ void check_for_finished_hlinks(int itemi
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
@@ -396,10 +396,10 @@ Note that you'll need to run 'make proto' after applying this patch.
 + * files are printf()ed here but regular files are rprintf()ed on the
 + * sender (unconverted). To solve the above, move all progress
 + * reporting to the sender. */
- static void recv_generator(char *fname, struct file_list *flist,
-                          struct file_struct *file, int ndx,
+ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
---- orig/log.c 2005-02-26 05:22:50
+                          enum logcode code, int f_out, int f_out_name)
+--- orig/log.c 2005-03-05 00:25:25
 +++ log.c      2004-07-03 20:18:02
 @@ -63,6 +63,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
@@ -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-01 03:39:47
+--- orig/main.c        2005-03-05 00:25:25
 +++ main.c     2004-07-22 00:31:47
-@@ -362,7 +362,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -363,7 +363,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,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-02 09:52:06
 +++ options.c  2005-02-14 02:50:32
 @@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;