Updated to apply cleanly.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 4860345..f28a250 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -48,7 +48,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
-+++ Makefile.in        28 Jun 2004 21:08:38 -0000
++++ Makefile.in        30 Jun 2004 00:08:18 -0000
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
@@ -59,7 +59,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22
-+++ cleanup.c  28 Jun 2004 21:08:38 -0000
++++ cleanup.c  30 Jun 2004 00:08:18 -0000
 @@ -24,6 +24,7 @@
  extern int io_error;
  extern int keep_partial;
@@ -78,7 +78,7 @@ Note that you'll need to run 'make proto' after applying this patch.
                do_unlink(cleanup_fname);
        if (code) {
 --- errcode.h  15 Dec 2003 08:04:14 -0000      1.8
-+++ errcode.h  28 Jun 2004 21:08:38 -0000
++++ errcode.h  30 Jun 2004 00:08:18 -0000
 @@ -34,6 +34,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
@@ -88,7 +88,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() */
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
-+++ flist.c    28 Jun 2004 21:08:38 -0000
++++ flist.c    30 Jun 2004 00:08:18 -0000
 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
  extern int recurse;
@@ -160,7 +160,7 @@ Note that you'll need to run 'make proto' after applying this patch.
                output_flist(flist);
  
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ fnameconv.c        28 Jun 2004 21:08:38 -0000
++++ fnameconv.c        30 Jun 2004 00:08:18 -0000
 @@ -0,0 +1,220 @@
 +/*  -*- c-file-style: "linux" -*-
 + *
@@ -382,8 +382,8 @@ 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);
 +}
---- generator.c        23 Jun 2004 21:21:19 -0000      1.90
-+++ generator.c        28 Jun 2004 21:08:39 -0000
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:08:18 -0000
 @@ -265,6 +265,12 @@ static void generate_and_send_sums(struc
   *
   * @note This comment was added later by mbp who was trying to work it
@@ -394,11 +394,11 @@ Note that you'll need to run 'make proto' after applying this patch.
 + * files are printf()ed here but regular files are rprintf()ed on the
 + * sender (unconverted). To solve the above, move all progress
 + * reporting to the sender.
-  **/
- void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
- {
+  */
+ static void recv_generator(char *fname, struct file_struct *file, int i,
+                          int f_out)
 --- log.c      7 Jun 2004 22:51:14 -0000       1.74
-+++ log.c      28 Jun 2004 21:08:39 -0000
++++ log.c      30 Jun 2004 00:08:19 -0000
 @@ -57,6 +57,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
@@ -408,7 +408,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
 --- main.c     28 Jun 2004 17:45:40 -0000      1.201
-+++ main.c     28 Jun 2004 21:08:39 -0000
++++ main.c     30 Jun 2004 00:08:19 -0000
 @@ -304,7 +304,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        create_flist_from_batch(); /* sets batch_flist */
                ret = local_child(argc, args, f_in, f_out, child_main);
@@ -419,7 +419,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157
-+++ options.c  28 Jun 2004 21:08:39 -0000
++++ options.c  30 Jun 2004 00:08:19 -0000
 @@ -127,6 +127,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
@@ -445,7 +445,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
 --- pipe.c     18 Jun 2004 16:00:33 -0000      1.8
-+++ pipe.c     28 Jun 2004 21:08:39 -0000
++++ pipe.c     30 Jun 2004 00:08:19 -0000
 @@ -23,7 +23,6 @@
  
  extern int am_sender;
@@ -476,7 +476,7 @@ Note that you'll need to run 'make proto' after applying this patch.
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
 --- syscall.c  18 Feb 2004 22:33:21 -0000      1.30
-+++ syscall.c  28 Jun 2004 21:08:39 -0000
++++ syscall.c  30 Jun 2004 00:08:19 -0000
 @@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif
@@ -513,7 +513,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      return result;
 +}
 --- util.c     9 Jun 2004 21:51:07 -0000       1.149
-+++ util.c     28 Jun 2004 21:08:40 -0000
++++ util.c     30 Jun 2004 00:08:20 -0000
 @@ -1153,3 +1153,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);
        return realloc(ptr, size * num);