Fixed failing hunks.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 1fe511c..cc9dccb 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-01-25 00:53:58
+--- orig/flist.c       2005-01-28 19:08:20
 +++ flist.c    2005-01-21 19:10:03
 @@ -69,6 +69,7 @@ extern int delete_excluded;
  extern int max_delete;
@@ -97,7 +97,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  extern struct filter_list_struct filter_list;
  extern struct filter_list_struct server_filter_list;
-@@ -358,7 +359,10 @@ void send_file_entry(struct file_struct 
+@@ -356,7 +357,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;
  
-@@ -574,6 +578,9 @@ void receive_file_entry(struct file_stru
+@@ -572,6 +576,9 @@ void receive_file_entry(struct file_stru
  
        strlcpy(lastname, thisname, MAXPATHLEN);
  
@@ -120,8 +120,8 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (sanitize_paths)
 @@ -1088,6 +1095,9 @@ struct file_list *send_file_list(int f, 
- 
        start_write = stats.total_written;
+       gettimeofday(&start_tv, NULL);
  
 +      if (!am_server)
 +              init_fname_convert();
@@ -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");
  
-@@ -1278,6 +1288,9 @@ struct file_list *send_file_list(int f, 
+@@ -1291,6 +1301,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());
  
-@@ -1299,6 +1312,9 @@ struct file_list *recv_file_list(int f)
+@@ -1312,6 +1325,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;
  
-@@ -1352,6 +1368,9 @@ struct file_list *recv_file_list(int f)
+@@ -1365,6 +1381,9 @@ struct file_list *recv_file_list(int f)
                        io_error |= read_int(f);
        }
  
@@ -382,7 +382,7 @@ 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 06:20:37
+--- orig/generator.c   2005-01-25 12:14:14
 +++ generator.c        2004-07-03 20:18:02
 @@ -235,6 +235,12 @@ static void generate_and_send_sums(int f
   *
@@ -397,7 +397,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 i,
---- orig/log.c 2004-09-07 19:54:51
+--- orig/log.c 2005-01-28 19:08:20
 +++ log.c      2004-07-03 20:18:02
 @@ -57,6 +57,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
@@ -407,9 +407,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-01-24 01:43:10
+--- orig/main.c        2005-01-28 19:08:20
 +++ main.c     2004-07-22 00:31:47
-@@ -335,7 +335,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -355,7 +355,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
@@ -418,8 +418,8 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-01-25 03:26:51
-+++ options.c  2005-01-15 21:28:07
+--- orig/options.c     2005-01-28 19:08:20
++++ options.c  2005-01-28 19:29:38
 @@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
  char *shell_cmd = 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;
-@@ -298,6 +299,7 @@ void usage(enum logcode F)
+@@ -303,6 +304,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," -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," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -401,6 +403,7 @@ static struct poptOption long_options[] 
+@@ -408,6 +410,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 },
@@ -475,9 +475,9 @@ 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-01-19 20:11:10
+--- orig/syscall.c     2005-01-28 17:12:14
 +++ syscall.c  2004-07-02 21:39:00
-@@ -270,3 +270,34 @@ char *d_name(struct dirent *di)
+@@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif
  }
@@ -512,7 +512,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2005-01-20 23:05:34
+--- orig/util.c        2005-01-28 19:08:20
 +++ util.c     2004-07-03 20:18:02
 @@ -1213,3 +1213,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);