Fixed a failing hunk.

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index d12948d..d72f2c4 100644 (file)
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -99,7 +99,7 @@ After applying this patch, run these commands for a successful build:
  /* For calling delete_file() */
  #define DEL_FORCE_RECURSE     (1<<1) /* recurse even w/o --force */
  #define DEL_TERSE             (1<<3)
-@@ -443,8 +447,8 @@ static void sum_sizes_sqroot(struct sum_
+@@ -445,8 +449,8 @@ static void sum_sizes_sqroot(struct sum_
        }
  
        if (protocol_version < 27) {
@@ -110,7 +110,7 @@ After applying this patch, run these commands for a successful build:
                s2length = SUM_LENGTH;
        } else {
                int32 c;
-@@ -454,7 +458,7 @@ static void sum_sizes_sqroot(struct sum_
+@@ -456,7 +460,7 @@ static void sum_sizes_sqroot(struct sum_
                for (c = blength; c >>= 1 && b; b--) {}
                /* add a bit, subtract rollsum, round up. */
                s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
@@ -119,7 +119,7 @@ After applying this patch, run these commands for a successful build:
                s2length = MIN(s2length, SUM_LENGTH);
        }
  
-@@ -488,7 +492,7 @@ static void generate_and_send_sums(int f
+@@ -490,7 +494,7 @@ static void generate_and_send_sums(int f
        sum_sizes_sqroot(&sum, len);
        write_sum_head(f_out, &sum);
  
@@ -128,7 +128,7 @@ After applying this patch, run these commands for a successful build:
                return;
  
        if (len > 0)
-@@ -507,7 +511,7 @@ static void generate_and_send_sums(int f
+@@ -509,7 +513,7 @@ static void generate_and_send_sums(int f
  
                if (f_copy >= 0) {
                        full_write(f_copy, map, n1);
@@ -760,7 +760,7 @@ After applying this patch, run these commands for a successful build:
  extern int allow_8bit_chars;
  extern int protocol_version;
  extern int preserve_times;
-@@ -72,7 +71,6 @@ struct {
+@@ -73,7 +72,6 @@ struct {
        { RERR_IPC        , "error in IPC code" },
        { RERR_CRASHED    , "sibling process crashed" },
        { RERR_TERMINATED , "sibling process terminated abnormally" },
@@ -768,7 +768,7 @@ After applying this patch, run these commands for a successful build:
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
        { RERR_WAITCHILD  , "waitpid() failed" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
-@@ -224,8 +222,8 @@ void rwrite(enum logcode code, char *buf
+@@ -225,8 +223,8 @@ void rwrite(enum logcode code, char *buf
        if (len < 0)
                exit_cleanup(RERR_MESSAGEIO);
  
@@ -819,7 +819,7 @@ After applying this patch, run these commands for a successful build:
                return;
  
        if (am_daemon) {
-@@ -647,12 +657,30 @@ static void do_server_sender(int f_in, i
+@@ -650,12 +660,30 @@ static void do_server_sender(int f_in, i
        exit_cleanup(0);
  }
  
@@ -853,7 +853,7 @@ After applying this patch, run these commands for a successful build:
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
-@@ -661,70 +689,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -664,70 +692,16 @@ static int do_recv(int f_in,int f_out,st
        if (preserve_hard_links)
                init_hard_links();
  
@@ -929,7 +929,7 @@ After applying this patch, run these commands for a successful build:
        generate_files(f_out, flist, local_name);
  
        handle_stats(-1);
-@@ -735,10 +709,13 @@ static int do_recv(int f_in,int f_out,st
+@@ -738,10 +712,13 @@ static int do_recv(int f_in,int f_out,st
        }
        io_flush(FULL_FLUSH);
  
@@ -947,7 +947,7 @@ After applying this patch, run these commands for a successful build:
  }
  
  
-@@ -1140,22 +1117,6 @@ static int start_client(int argc, char *
+@@ -1143,22 +1120,6 @@ static int start_client(int argc, char *
        return ret;
  }
  
@@ -970,7 +970,7 @@ After applying this patch, run these commands for a successful build:
  RETSIGTYPE remember_children(UNUSED(int val))
  {
  #ifdef WNOHANG
-@@ -1247,8 +1208,6 @@ int main(int argc,char *argv[])
+@@ -1250,8 +1211,6 @@ int main(int argc,char *argv[])
  # endif
        sigact.sa_flags = SA_NOCLDSTOP;
  #endif
@@ -1150,7 +1150,7 @@ After applying this patch, run these commands for a successful build:
 @@ -597,7 +592,7 @@ int recv_files(int f_in, struct file_lis
                /* log the transfer */
                if (log_before_transfer)
-                       log_item(FNAME, file, &initial_stats, iflags, NULL);
+                       log_item(FCLIENT, file, &initial_stats, iflags, NULL);
 -              else if (!am_server && verbose && do_progress)
 +              else if (!am_server && verbose && recv_progress)
                        rprintf(FINFO, "%s\n", fname);
@@ -1193,7 +1193,7 @@ After applying this patch, run these commands for a successful build:
  extern int am_starting_up;
  extern int allow_8bit_chars;
  extern int preserve_uid;
-@@ -302,5 +301,5 @@ const char *who_am_i(void)
+@@ -301,5 +300,5 @@ const char *who_am_i(void)
  {
        if (am_starting_up)
                return am_server ? "server" : "client";
@@ -1202,7 +1202,7 @@ After applying this patch, run these commands for a successful build:
  }
 --- old/rsync.h
 +++ new/rsync.h
-@@ -169,10 +169,8 @@ enum msgcode {
+@@ -168,10 +168,8 @@ enum msgcode {
        MSG_DATA=0,     /* raw data on the multiplexed stream */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
        MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
@@ -1213,7 +1213,7 @@ After applying this patch, run these commands for a successful build:
  };
  
  #include "errcode.h"
-@@ -323,6 +321,7 @@ enum msgcode {
+@@ -322,6 +320,7 @@ enum msgcode {
  #endif
  
  #include <assert.h>