Fixed some failing hunks.

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

diff --git a/fname-convert.diff b/fname-convert.diff
index 4c4fd3f..13075cc 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -77,7 +77,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (cleanup_fname)
                do_unlink(cleanup_fname);
        if (code)
---- orig/errcode.h     2005-09-26 17:09:27
+--- orig/errcode.h     2005-12-16 23:48:43
 +++ errcode.h  2005-09-29 17:23:35
 @@ -36,6 +36,7 @@
  #define RERR_IPC        14      /* error in IPC code */
@@ -85,8 +85,8 @@ Note that you'll need to run 'make proto' after applying this patch.
  #define RERR_TERMINATED 16      /* sibling terminated abnormally */
 +#define RERR_FNAMECONV  17      /* error in filename conversion */
  
- #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
- #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
+ #define RERR_SIGNAL1    19      /* status returned when sent SIGUSR1 */
+ #define RERR_SIGNAL     20      /* status returned when sent SIGINT, SIGTERM, SIGHUP */
 --- orig/flist.c       2005-11-10 16:58:36
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
@@ -399,17 +399,17 @@ Note that you'll need to run 'make proto' after applying this patch.
  static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)
---- orig/log.c 2005-12-16 04:03:06
-+++ log.c      2005-12-16 04:03:49
+--- orig/log.c 2005-12-16 23:48:44
++++ log.c      2005-12-16 23:49:07
 @@ -68,6 +68,7 @@ struct {
        { RERR_IPC        , "error in IPC code" },
        { RERR_CRASHED    , "sibling process crashed" },
        { RERR_TERMINATED , "sibling process terminated abnormally" },
 +      { RERR_FNAMECONV  , "error in filename conversion" },
-       { RERR_SIGNAL     , "received SIGINT, SIGTERM, SIGHUP, or SIGUSR1" },
+       { RERR_SIGNAL1    , "received SIGUSR1" },
+       { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
        { RERR_WAITCHILD  , "waitpid() failed" },
-       { RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c        2005-12-15 07:55:39
+--- orig/main.c        2005-12-16 23:48:44
 +++ main.c     2004-07-22 00:31:47
 @@ -414,7 +414,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
@@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-11-15 18:21:22
+--- orig/options.c     2005-12-16 23:48:44
 +++ options.c  2005-10-26 16:49:33
 @@ -142,6 +142,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;