Simplified the build instructions now that we have "prepare-source".

[rsync/rsync-patches.git] / threaded-receiver.diff

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index a2ededd..a5949b5 100644 (file)
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -18,9 +18,13 @@ NOTE: we still need to duplicate the partial_fname static in util.c!
 If you try this out, please send some email to wayned@samba.org or the rsync
 mailing list with your results, build changes, bug reports, etc.  Thanks!
 
-Be sure to run "make proto" before running "make".
+After applying this patch, run these commands for a successful build:
 
---- orig/Makefile.in   2006-01-14 08:14:29
+    ./prepare-source
+    ./configure                      (optional if already run)
+    make
+
+--- orig/Makefile.in   2006-02-06 05:03:50
 +++ Makefile.in        2005-12-10 18:35:39
 @@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@
  bindir=@bindir@
@@ -73,9 +77,9 @@ Be sure to run "make proto" before running "make".
  #define RERR_SIGNAL     20      /* status returned when sent SIGINT, SIGTERM, SIGHUP */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
  #define RERR_MALLOC     22      /* error allocating core memory buffers */
---- orig/generator.c   2006-01-31 18:59:39
+--- orig/generator.c   2006-02-05 06:40:40
 +++ generator.c        2005-12-08 23:17:08
-@@ -68,7 +68,6 @@ extern OFF_T min_size;
+@@ -67,7 +67,6 @@ extern OFF_T min_size;
  extern int io_error;
  extern int allowed_lull;
  extern int sock_f_out;
@@ -83,7 +87,7 @@ Be sure to run "make proto" before running "make".
  extern int protocol_version;
  extern int fuzzy_basis;
  extern int always_checksum;
-@@ -99,6 +98,11 @@ static int deletion_count = 0; /* used t
+@@ -98,6 +97,11 @@ static int deletion_count = 0; /* used t
  static int can_link_symlinks = 1; /* start out optimistic */
  static int can_link_devices = 1;
  
@@ -95,7 +99,7 @@ Be sure to run "make proto" before running "make".
  /* For calling delete_file() */
  #define DEL_FORCE_RECURSE     (1<<1) /* recurse even w/o --force */
  #define DEL_TERSE             (1<<3)
-@@ -448,8 +452,8 @@ static void sum_sizes_sqroot(struct sum_
+@@ -446,8 +450,8 @@ static void sum_sizes_sqroot(struct sum_
        }
  
        if (protocol_version < 27) {
@@ -106,7 +110,7 @@ Be sure to run "make proto" before running "make".
                s2length = SUM_LENGTH;
        } else {
                int32 c;
-@@ -459,7 +463,7 @@ static void sum_sizes_sqroot(struct sum_
+@@ -457,7 +461,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-- */
@@ -115,7 +119,7 @@ Be sure to run "make proto" before running "make".
                s2length = MIN(s2length, SUM_LENGTH);
        }
  
-@@ -493,7 +497,7 @@ static void generate_and_send_sums(int f
+@@ -491,7 +495,7 @@ static void generate_and_send_sums(int f
        sum_sizes_sqroot(&sum, len);
        write_sum_head(f_out, &sum);
  
@@ -124,7 +128,7 @@ Be sure to run "make proto" before running "make".
                return;
  
        if (len > 0)
-@@ -512,7 +516,7 @@ static void generate_and_send_sums(int f
+@@ -510,7 +514,7 @@ static void generate_and_send_sums(int f
  
                if (f_copy >= 0) {
                        full_write(f_copy, map, n1);
@@ -133,7 +137,7 @@ Be sure to run "make proto" before running "make".
                                continue;
                }
  
-@@ -1142,7 +1146,7 @@ static void recv_generator(char *fname, 
+@@ -1140,7 +1144,7 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -142,7 +146,7 @@ Be sure to run "make proto" before running "make".
                return;
  
        if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -1197,7 +1201,7 @@ static void recv_generator(char *fname, 
+@@ -1195,7 +1199,7 @@ static void recv_generator(char *fname, 
                goto notify_others;
        }
  
@@ -151,7 +155,7 @@ Be sure to run "make proto" before running "make".
                if (!(backupptr = get_backup_name(fname))) {
                        close(fd);
                        return;
-@@ -1286,7 +1290,10 @@ void generate_files(int f_out, struct fi
+@@ -1284,7 +1288,10 @@ void generate_files(int f_out, struct fi
        int save_ignore_existing = ignore_existing;
        int save_ignore_non_existing = ignore_non_existing;
        int save_do_progress = do_progress;
@@ -163,7 +167,7 @@ Be sure to run "make proto" before running "make".
  
        if (protocol_version >= 29) {
                itemizing = 1;
-@@ -1315,7 +1322,7 @@ void generate_files(int f_out, struct fi
+@@ -1313,7 +1320,7 @@ void generate_files(int f_out, struct fi
                do_delete_pass(flist);
        do_progress = 0;
  
@@ -172,7 +176,7 @@ Be sure to run "make proto" before running "make".
                whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",
-@@ -1324,12 +1331,6 @@ void generate_files(int f_out, struct fi
+@@ -1322,12 +1329,6 @@ void generate_files(int f_out, struct fi
                        : "enabled");
        }
  
@@ -185,7 +189,7 @@ Be sure to run "make proto" before running "make".
        for (i = 0; i < flist->count; i++) {
                struct file_struct *file = flist->files[i];
  
-@@ -1373,23 +1374,34 @@ void generate_files(int f_out, struct fi
+@@ -1371,23 +1372,34 @@ void generate_files(int f_out, struct fi
                delete_in_dir(NULL, NULL, NULL, NULL);
  
        phase++;
@@ -226,7 +230,7 @@ Be sure to run "make proto" before running "make".
                if (local_name)
                        strlcpy(fbuf, local_name, sizeof fbuf);
                else
-@@ -1401,27 +1413,43 @@ void generate_files(int f_out, struct fi
+@@ -1399,27 +1411,43 @@ void generate_files(int f_out, struct fi
        phase++;
        ignore_non_existing = save_ignore_non_existing;
        ignore_existing = save_ignore_existing;
@@ -1160,7 +1164,7 @@ Be sure to run "make proto" before running "make".
                }
        }
        make_backups = save_make_backups;
---- orig/rsync.c       2006-02-05 04:53:34
+--- orig/rsync.c       2006-02-05 15:31:49
 +++ rsync.c    2005-12-08 23:17:10
 @@ -41,7 +41,6 @@ extern int orig_umask;
  extern int am_root;
@@ -1170,7 +1174,7 @@ Be sure to run "make proto" before running "make".
  extern int am_starting_up;
  extern int preserve_uid;
  extern int preserve_gid;
-@@ -288,5 +287,5 @@ const char *who_am_i(void)
+@@ -291,5 +290,5 @@ const char *who_am_i(void)
  {
        if (am_starting_up)
                return am_server ? "server" : "client";