Fixed a failing hunk.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 9ec8754..3c91a03 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -382,7 +382,7 @@ 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   2005-01-10 00:22:48
+--- orig/generator.c   2005-01-15 21:18:09
 +++ generator.c        2004-07-03 20:18:02
 @@ -247,6 +247,12 @@ static void generate_and_send_sums(int f
   *
@@ -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        2005-01-10 00:22:54
+--- orig/main.c        2005-01-14 18:30:18
 +++ main.c     2004-07-22 00:31:47
-@@ -333,7 +333,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -334,7 +334,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,16 +418,16 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-01-01 21:11:00
-+++ options.c  2004-11-27 18:09:09
-@@ -132,6 +132,7 @@ char backup_dir_buf[MAXPATHLEN];
- int rsync_port = 0;
- int copy_dest = 0;
- int link_dest = 0;
+--- orig/options.c     2005-01-15 21:23:15
++++ options.c  2005-01-15 21:28:07
+@@ -125,6 +125,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+ char *config_file = NULL;
+ char *shell_cmd = NULL;
+ char *log_format = NULL;
 +char *fname_convert_cmd = NULL;
- 
- int verbose = 0;
- int quiet = 0;
+ char *password_file = NULL;
+ char *rsync_path = RSYNC_PATH;
+ char *backup_dir = NULL;
 @@ -289,6 +290,7 @@ void usage(enum logcode F)
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");