Updated to apply to latest source.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 476e665..846cbc7 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -47,7 +47,7 @@ some utility functions.
 Note that you'll need to run 'make proto' after applying this patch.
 
 
---- orig/Makefile.in   2004-05-15 00:53:53
+--- orig/Makefile.in   2004-07-04 08:59:17
 +++ Makefile.in        2004-07-03 20:18:02
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
@@ -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-06-18 16:23:07
+--- orig/flist.c       2004-07-15 02:21:10
 +++ flist.c    2004-07-03 20:18:02
 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
@@ -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;
  
-@@ -360,7 +361,10 @@ void send_file_entry(struct file_struct 
+@@ -357,7 +358,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;
  
-@@ -573,6 +577,9 @@ void receive_file_entry(struct file_stru
+@@ -570,6 +574,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);
  
        if (sanitize_paths)
-@@ -1061,6 +1068,9 @@ struct file_list *send_file_list(int f, 
+@@ -1055,6 +1062,9 @@ struct file_list *send_file_list(int f, 
  
        start_write = stats.total_written;
  
@@ -129,8 +129,8 @@ 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");
  
-@@ -1235,6 +1245,9 @@ struct file_list *send_file_list(int f, 
-                       write_batch_flist_info(flist->count, flist->files);
+@@ -1227,6 +1237,9 @@ struct file_list *send_file_list(int f, 
+               stats.num_files = flist->count;
        }
  
 +      if (fname_convert_cmd && !am_server)
@@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (verbose > 3)
                output_flist(flist);
  
-@@ -1256,6 +1269,9 @@ struct file_list *recv_file_list(int f)
+@@ -1248,6 +1261,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -149,8 +149,8 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;
-@@ -1310,6 +1326,9 @@ struct file_list *recv_file_list(int f)
-               }
+@@ -1300,6 +1316,9 @@ struct file_list *recv_file_list(int f)
+                       io_error |= read_int(f);
        }
  
 +      if (fname_convert_cmd && !am_server)
@@ -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-06-30 07:24:45
+--- orig/generator.c   2004-07-15 02:21:10
 +++ generator.c        2004-07-03 20:18:02
-@@ -265,6 +265,12 @@ static void generate_and_send_sums(struc
+@@ -246,6 +246,12 @@ static void generate_and_send_sums(struc
   *
   * @note This comment was added later by mbp who was trying to work it
   * out.  It might be wrong.
@@ -407,10 +407,10 @@ 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-06-30 07:24:30
+--- orig/main.c        2004-07-15 17:02:03
 +++ main.c     2004-07-03 20:18:02
-@@ -304,7 +304,7 @@ static pid_t do_cmd(char *cmd, char *mac
-                       create_flist_from_batch(); /* sets batch_flist */
+@@ -318,7 +318,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 {
 -              ret = piped_child(args,f_in,f_out);
@@ -418,7 +418,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        }
  
        if (dir)
---- orig/options.c     2004-06-20 19:30:00
+--- orig/options.c     2004-07-15 16:51:50
 +++ options.c  2004-07-03 20:18:02
 @@ -127,6 +127,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
@@ -428,7 +428,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  int verbose = 0;
  int quiet = 0;
-@@ -271,6 +272,7 @@ void usage(enum logcode F)
+@@ -270,6 +271,7 @@ void usage(enum logcode F)
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --link-dest=DIR         create hardlinks to DIR for unchanged files\n");
    rprintf(F," -P                          equivalent to --partial --progress\n");
@@ -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");
-@@ -368,6 +370,7 @@ static struct poptOption long_options[] 
+@@ -367,6 +369,7 @@ static struct poptOption long_options[] 
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
@@ -444,7 +444,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
---- orig/pipe.c        2004-06-18 16:00:09
+--- orig/pipe.c        2004-07-15 02:21:11
 +++ pipe.c     2004-07-03 20:18:02
 @@ -23,7 +23,6 @@
  
@@ -453,8 +453,8 @@ Note that you'll need to run 'make proto' after applying this patch.
 -extern int blocking_io;
  extern int orig_umask;
  extern int read_batch;
- extern int filesfrom_fd;
-@@ -40,8 +39,10 @@ extern int filesfrom_fd;
+ extern int write_batch;
+@@ -41,8 +40,10 @@ extern int filesfrom_fd;
   * If blocking_io is set then use blocking io on both fds. That can be
   * used to cope with badly broken rsh implementations like the one on
   * Solaris.
@@ -466,7 +466,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  {
        pid_t pid;
        int to_child_pipe[2];
-@@ -56,7 +57,7 @@ pid_t piped_child(char **command, int *f
+@@ -57,7 +58,7 @@ pid_t piped_child(char **command, int *f
                exit_cleanup(RERR_IPC);
        }