Updated to apply cleanly.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 052bbeb..51c6cb0 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-07-04 08:59:17
+--- orig/Makefile.in   2004-08-09 21:07:09
 +++ 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
@@ -58,7 +58,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
---- orig/cleanup.c     2004-07-20 21:36:07
+--- orig/cleanup.c     2004-07-29 16:08:03
 +++ cleanup.c  2004-07-03 20:18:02
 @@ -24,6 +24,7 @@
  extern int io_error;
@@ -68,7 +68,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  /**
   * Close all open sockets and files, allowing a (somewhat) graceful
-@@ -121,6 +122,8 @@ void _exit_cleanup(int code, const char 
+@@ -122,6 +123,8 @@ void _exit_cleanup(int code, const char 
                finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
        }
        io_flush(FULL_FLUSH);
@@ -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-07-17 15:20:05
+--- orig/flist.c       2004-08-11 23:42:23
 +++ flist.c    2004-07-03 20:18:02
 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname);
  
        if (sanitize_paths)
-@@ -1055,6 +1062,9 @@ struct file_list *send_file_list(int f, 
+@@ -1057,6 +1064,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");
  
-@@ -1227,6 +1237,9 @@ struct file_list *send_file_list(int f, 
+@@ -1229,6 +1239,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);
  
-@@ -1248,6 +1261,9 @@ struct file_list *recv_file_list(int f)
+@@ -1250,6 +1263,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;
-@@ -1300,6 +1316,9 @@ struct file_list *recv_file_list(int f)
+@@ -1302,6 +1318,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-07-21 23:59:35
+--- orig/generator.c   2004-08-05 18:24:21
 +++ generator.c        2004-07-03 20:18:02
-@@ -256,6 +256,12 @@ static void generate_and_send_sums(int f
+@@ -247,6 +247,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.
@@ -407,9 +407,9 @@ 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-07-21 23:59:35
+--- orig/main.c        2004-08-05 18:24:21
 +++ main.c     2004-07-22 00:31:47
-@@ -329,7 +329,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -332,7 +332,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
@@ -418,9 +418,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2004-07-21 23:59:35
+--- orig/options.c     2004-08-11 23:42:23
 +++ options.c  2004-07-03 20:18:02
-@@ -128,6 +128,7 @@ char *backup_dir = NULL;
+@@ -129,6 +129,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
  int link_dest = 0;
@@ -428,7 +428,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  int verbose = 0;
  int quiet = 0;
-@@ -277,6 +278,7 @@ void usage(enum logcode F)
+@@ -280,6 +281,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");
-@@ -375,6 +377,7 @@ static struct poptOption long_options[] 
+@@ -378,6 +380,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 },
@@ -475,7 +475,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (pid == -1) {
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
---- orig/syscall.c     2004-02-18 22:33:21
+--- orig/syscall.c     2004-08-02 21:56:59
 +++ syscall.c  2004-07-02 21:39:00
 @@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
@@ -512,9 +512,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2004-06-09 21:54:47
+--- orig/util.c        2004-08-11 23:42:23
 +++ util.c     2004-07-03 20:18:02
-@@ -1153,3 +1153,55 @@ void *_realloc_array(void *ptr, unsigned
+@@ -1231,3 +1231,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);
        return realloc(ptr, size * num);
  }