Need to make sure that the destination file doesn't exist before we

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 50aec1e..838c671 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       2004-08-12 18:34:38
+--- orig/flist.c       2004-09-21 09:40:27
 +++ flist.c    2004-08-12 18:35:53
-@@ -43,6 +43,7 @@ extern int cvs_exclude;
+@@ -44,6 +44,7 @@ extern int cvs_exclude;
  
  extern int recurse;
  extern char curr_dir[MAXPATHLEN];
@@ -97,7 +97,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  extern char *files_from;
  extern int filesfrom_fd;
  
-@@ -357,7 +358,10 @@ void send_file_entry(struct file_struct 
+@@ -359,7 +360,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;
  
-@@ -570,6 +574,9 @@ void receive_file_entry(struct file_stru
+@@ -572,6 +576,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)
-@@ -1057,6 +1064,9 @@ struct file_list *send_file_list(int f, 
+@@ -1079,6 +1086,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");
  
-@@ -1229,6 +1239,9 @@ struct file_list *send_file_list(int f, 
+@@ -1251,6 +1261,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);
  
-@@ -1250,6 +1263,9 @@ struct file_list *recv_file_list(int f)
+@@ -1272,6 +1285,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -147,9 +147,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +              init_fname_convert();
 +
        flist = flist_new(WITH_HLINK, "recv_file_list");
+       received_flist = flist;
  
-       flist->count = 0;
-@@ -1302,6 +1318,9 @@ struct file_list *recv_file_list(int f)
+@@ -1325,6 +1341,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-08-05 18:24:21
+--- orig/generator.c   2004-09-20 19:50:13
 +++ generator.c        2004-07-03 20:18:02
-@@ -247,6 +247,12 @@ static void generate_and_send_sums(int f
+@@ -252,6 +252,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.
@@ -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_struct *file, int i,
                           int f_out)
---- orig/log.c 2004-08-12 18:34:38
+--- orig/log.c 2004-09-07 19:54:51
 +++ log.c      2004-07-03 20:18:02
 @@ -57,6 +57,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
@@ -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-08-05 18:24:21
+--- orig/main.c        2004-09-18 01:49:33
 +++ main.c     2004-07-22 00:31:47
 @@ -332,7 +332,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-08-12 18:34:38
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-07-03 20:18:02
 @@ -129,6 +129,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
@@ -512,7 +512,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2004-08-13 07:18:59
+--- orig/util.c        2004-09-07 21:45:30
 +++ util.c     2004-07-03 20:18:02
 @@ -1217,3 +1217,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);