Got rid of patch fuzz.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 88d8043..9747b1f 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -87,9 +87,9 @@ 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-01-24 01:43:09
+--- orig/flist.c       2005-01-25 00:53:58
 +++ flist.c    2005-01-21 19:10:03
-@@ -70,6 +70,7 @@ extern int delete_excluded;
+@@ -69,6 +69,7 @@ extern int delete_excluded;
  extern int max_delete;
  extern int orig_umask;
  extern int list_only;
@@ -97,7 +97,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
-@@ -365,7 +366,10 @@ void send_file_entry(struct file_struct 
+@@ -358,7 +359,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;
  
-@@ -581,6 +585,9 @@ void receive_file_entry(struct file_stru
+@@ -574,6 +578,9 @@ void receive_file_entry(struct file_stru
  
        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)
-@@ -1110,6 +1117,9 @@ struct file_list *send_file_list(int f, 
+@@ -1088,6 +1095,9 @@ struct file_list *send_file_list(int f, 
  
        start_write = stats.total_written;
  
@@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
                          "send_file_list");
  
-@@ -1287,6 +1297,9 @@ struct file_list *send_file_list(int f, 
+@@ -1278,6 +1288,9 @@ struct file_list *send_file_list(int f, 
                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, f < 0 ? "delete" : who_am_i());
  
-@@ -1308,6 +1321,9 @@ struct file_list *recv_file_list(int f)
+@@ -1299,6 +1312,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");
        received_flist = flist;
  
-@@ -1361,6 +1377,9 @@ struct file_list *recv_file_list(int f)
+@@ -1352,6 +1368,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-01-24 01:43:09
+--- orig/generator.c   2005-01-24 06:20:37
 +++ generator.c        2004-07-03 20:18:02
-@@ -233,6 +233,12 @@ static void generate_and_send_sums(int f
+@@ -235,6 +235,12 @@ static void generate_and_send_sums(int f
   *
   * @note This comment was added later by mbp who was trying to work it
   * out.  It might be wrong.
@@ -418,7 +418,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-01-24 01:43:10
+--- orig/options.c     2005-01-25 03:26:51
 +++ options.c  2005-01-15 21:28:07
 @@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
@@ -428,15 +428,15 @@ 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;
-@@ -296,6 +297,7 @@ void usage(enum logcode F)
+@@ -298,6 +299,7 @@ void usage(enum logcode F)
    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," -P                          equivalent to --partial --progress\n");
 +  rprintf(F,"     --fname-convert=CMD     invoke CMD for filename conversion\n");
    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");
-@@ -395,6 +397,7 @@ static struct poptOption long_options[] 
+   rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
+@@ -401,6 +403,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },