Fixed a failing hunk.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index a35ea00..9ec8754 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -58,18 +58,18 @@ Note that you'll need to run 'make proto' after applying this patch.
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
---- orig/cleanup.c     2004-10-14 17:11:40
-+++ cleanup.c  2004-07-03 20:18:02
-@@ -24,6 +24,7 @@
- extern int io_error;
+--- orig/cleanup.c     2005-01-10 09:46:11
++++ cleanup.c  2005-01-10 10:40:51
+@@ -25,6 +25,7 @@ extern int io_error;
  extern int keep_partial;
  extern int log_got_error;
+ extern char *partial_dir;
 +extern char *fname_convert_cmd;
  
  /**
   * Close all open sockets and files, allowing a (somewhat) graceful
-@@ -124,6 +125,8 @@ void _exit_cleanup(int code, const char 
-               finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
+@@ -126,6 +127,8 @@ void _exit_cleanup(int code, const char 
+                               !partial_dir);
        }
        io_flush(FULL_FLUSH);
 +      if (fname_convert_cmd)
@@ -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       2004-09-21 09:40:27
+--- orig/flist.c       2005-01-01 21:11:00
 +++ flist.c    2004-08-12 18:35:53
 @@ -44,6 +44,7 @@ extern int cvs_exclude;
  
@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname, 0);
  
        if (sanitize_paths)
-@@ -1079,6 +1086,9 @@ struct file_list *send_file_list(int f, 
+@@ -1084,6 +1091,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");
  
-@@ -1251,6 +1261,9 @@ struct file_list *send_file_list(int f, 
+@@ -1256,6 +1266,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);
  
-@@ -1272,6 +1285,9 @@ struct file_list *recv_file_list(int f)
+@@ -1277,6 +1290,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;
  
-@@ -1325,6 +1341,9 @@ struct file_list *recv_file_list(int f)
+@@ -1330,6 +1346,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   2004-11-27 17:53:24
+--- orig/generator.c   2005-01-10 00:22:48
 +++ generator.c        2004-07-03 20:18:02
-@@ -255,6 +255,12 @@ static void generate_and_send_sums(int f
+@@ -247,6 +247,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.
@@ -407,7 +407,7 @@ 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        2004-11-27 17:53:24
+--- orig/main.c        2005-01-10 00:22:54
 +++ main.c     2004-07-22 00:31:47
 @@ -333,7 +333,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
@@ -418,7 +418,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2004-11-27 18:27:35
+--- orig/options.c     2005-01-01 21:11:00
 +++ options.c  2004-11-27 18:09:09
 @@ -132,6 +132,7 @@ char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
@@ -436,7 +436,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    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");
-@@ -383,6 +385,7 @@ static struct poptOption long_options[] 
+@@ -384,6 +386,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     2004-10-06 00:12:16
+--- orig/syscall.c     2005-01-10 00:21:12
 +++ syscall.c  2004-07-02 21:39:00
-@@ -265,3 +265,34 @@ char *d_name(struct dirent *di)
+@@ -268,3 +268,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif
  }