Fixed failing hunks.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index c36b33b..58ed8f8 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -87,17 +87,17 @@ 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-20 00:16:35
-+++ flist.c    2005-02-19 09:31:41
-@@ -62,6 +62,7 @@ extern int orig_umask;
- extern int list_only;
+--- orig/flist.c       2005-02-21 10:51:51
++++ flist.c    2005-02-21 11:04:00
+@@ -63,6 +63,7 @@ extern int force_delete;
+ extern int orig_umask;
+ extern int make_backups;
  extern unsigned int curr_dir_len;
- extern char *log_format;
 +extern char *fname_convert_cmd;
- 
- extern char curr_dir[MAXPATHLEN];
- 
-@@ -341,7 +342,10 @@ void send_file_entry(struct file_struct 
+ extern char *log_format;
+ extern char *backup_dir;
+ extern char *backup_suffix;
+@@ -346,7 +347,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;
  
-@@ -557,6 +561,9 @@ static struct file_struct *receive_file_
+@@ -562,6 +566,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)
-@@ -1070,6 +1077,9 @@ struct file_list *send_file_list(int f, 
+@@ -1075,6 +1082,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();
-@@ -1252,6 +1262,9 @@ struct file_list *send_file_list(int f, 
+@@ -1257,6 +1267,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, who_am_i());
  
-@@ -1273,6 +1286,9 @@ struct file_list *recv_file_list(int f)
+@@ -1278,6 +1291,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;
  
-@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
+@@ -1331,6 +1347,9 @@ struct file_list *recv_file_list(int f)
                        io_error |= read_int(f);
        }
  
@@ -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_list *flist,
                           struct file_struct *file, int ndx,
                           int f_out, int f_out_name)
---- orig/log.c 2005-02-20 00:02:23
+--- orig/log.c 2005-02-21 07:28:59
 +++ log.c      2004-07-03 20:18:02
 @@ -62,6 +62,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
@@ -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-02-20 01:12:42
+--- orig/options.c     2005-02-21 10:51:52
 +++ options.c  2005-02-14 02:50:32
-@@ -131,6 +131,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -136,6 +136,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;
-@@ -314,6 +315,7 @@ void usage(enum logcode F)
+@@ -319,6 +320,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");
-@@ -423,6 +425,7 @@ static struct poptOption long_options[] 
+@@ -428,6 +430,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 },