One minor tweak.

diff --git a/fname-convert.diff b/fname-convert.diff
index 6efc8f4..6622906 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -97,7 +97,7 @@ autoconf and 'make proto'.
  extern char *files_from;
  extern int filesfrom_fd;
  
-@@ -346,7 +347,11 @@ void send_file_entry(struct file_struct 
+@@ -346,7 +347,10 @@ void send_file_entry(struct file_struct 
  
        io_write_phase = "send_file_entry";
  
@@ -106,11 +106,10 @@ autoconf and 'make proto'.
 +              convert_fname(fname, f_name(file), MAXPATHLEN);
 +      else
 +              f_name_to(file, fname);
-+
  
        flags = base_flags;
  
-@@ -559,6 +564,9 @@ void receive_file_entry(struct file_stru
+@@ -559,6 +563,9 @@ void receive_file_entry(struct file_stru
  
        strlcpy(lastname, thisname, MAXPATHLEN);
  
@@ -120,7 +119,7 @@ autoconf and 'make proto'.
        clean_fname(thisname);
  
        if (sanitize_paths)
-@@ -1041,6 +1049,9 @@ struct file_list *send_file_list(int f, 
+@@ -1041,6 +1048,9 @@ struct file_list *send_file_list(int f, 
  
        start_write = stats.total_written;
  
@@ -130,7 +129,7 @@ autoconf and 'make proto'.
        flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
            "send_file_list");
  
-@@ -1215,6 +1226,9 @@ struct file_list *send_file_list(int f, 
+@@ -1215,6 +1225,9 @@ struct file_list *send_file_list(int f, 
                        write_batch_flist_info(flist->count, flist->files);
        }
  
@@ -140,7 +139,7 @@ autoconf and 'make proto'.
        if (verbose > 3)
                output_flist(flist);
  
-@@ -1237,6 +1251,9 @@ struct file_list *recv_file_list(int f)
+@@ -1237,6 +1250,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -150,7 +149,7 @@ autoconf and 'make proto'.
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;
-@@ -1291,6 +1308,9 @@ struct file_list *recv_file_list(int f)
+@@ -1291,6 +1307,9 @@ struct file_list *recv_file_list(int f)
                }
        }