Updated to apply cleanly.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 7980cbf..9c6d589 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -77,9 +77,9 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (cleanup_fname)
                do_unlink(cleanup_fname);
        if (code)
---- orig/errcode.h     2005-03-05 18:58:32
+--- orig/errcode.h     2005-03-16 02:19:29.823770469
 +++ errcode.h  2004-07-02 21:38:59
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
  #define RERR_IPC        14      /* error in IPC code */
@@ -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-03-03 18:44:42
+--- orig/flist.c       2005-03-16 02:19:29.897764030
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname, 0);
  
        if (sanitize_paths)
-@@ -1071,6 +1078,9 @@ struct file_list *send_file_list(int f, 
+@@ -1081,6 +1088,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();
-@@ -1253,6 +1263,9 @@ struct file_list *send_file_list(int f, 
+@@ -1265,6 +1275,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);
  
-@@ -1274,6 +1287,9 @@ struct file_list *recv_file_list(int f)
+@@ -1286,6 +1299,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");
  
        flist->count = 0;
-@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
+@@ -1338,6 +1354,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-03-11 17:36:35.384170106
+--- orig/generator.c   2005-03-16 02:19:29.980756807
 +++ generator.c        2005-03-05 00:29:37
-@@ -579,7 +579,13 @@ static int phase = 0;
+@@ -581,7 +581,13 @@ static int phase = 0;
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
@@ -399,9 +399,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)
---- orig/log.c 2005-03-09 18:53:58
+--- orig/log.c 2005-03-16 02:19:30.009754284
 +++ log.c      2004-07-03 20:18:02
-@@ -63,6 +63,7 @@ struct {
+@@ -64,6 +64,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
        { RERR_IPC        , "error in IPC code" },
@@ -409,7 +409,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        2005-03-09 18:54:09
+--- orig/main.c        2005-03-16 02:19:30.077748367
 +++ main.c     2004-07-22 00:31:47
 @@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
@@ -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-11 17:36:35.507159655
+--- orig/options.c     2005-03-16 02:19:30.152741841
 +++ options.c  2005-02-14 02:50:32
 @@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
@@ -514,7 +514,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2005-03-11 17:36:35.798134929
+--- orig/util.c        2005-03-11 17:36:35
 +++ util.c     2004-07-03 20:18:02
 @@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in