Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index a5949b5..110fb8d 100644 (file)
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -24,8 +24,8 @@ After applying this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
---- orig/Makefile.in   2006-02-06 05:03:50
-+++ Makefile.in        2005-12-10 18:35:39
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@
  bindir=@bindir@
  mandir=@mandir@
@@ -35,8 +35,8 @@ After applying this patch, run these commands for a successful build:
  CC=@CC@
  CFLAGS=@CFLAGS@
  CPPFLAGS=@CPPFLAGS@
---- orig/cleanup.c     2006-02-03 20:00:35
-+++ cleanup.c  2006-02-03 20:07:44
+--- old/cleanup.c
++++ new/cleanup.c
 @@ -26,10 +26,6 @@ extern int keep_partial;
  extern int log_got_error;
  extern char *partial_dir;
@@ -67,8 +67,8 @@ After applying this patch, run these commands for a successful build:
        if (cleanup_pid && cleanup_pid == getpid()) {
                char *pidf = lp_pid_file();
                if (pidf && *pidf)
---- orig/errcode.h     2005-12-16 23:48:43
-+++ errcode.h  2005-12-16 23:50:02
+--- old/errcode.h
++++ new/errcode.h
 @@ -37,7 +37,6 @@
  #define RERR_CRASHED    15      /* sibling crashed */
  #define RERR_TERMINATED 16      /* sibling terminated abnormally */
@@ -77,8 +77,8 @@ After applying this patch, run these commands for a successful build:
  #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-02-05 06:40:40
-+++ generator.c        2005-12-08 23:17:08
+--- old/generator.c
++++ new/generator.c
 @@ -67,7 +67,6 @@ extern OFF_T min_size;
  extern int io_error;
  extern int allowed_lull;
@@ -281,8 +281,8 @@ After applying this patch, run these commands for a successful build:
        }
  
        do_progress = save_do_progress;
---- orig/io.c  2006-02-04 21:53:39
-+++ io.c       2006-02-01 19:50:09
+--- old/io.c
++++ new/io.c
 @@ -47,7 +47,6 @@ extern int allowed_lull;
  extern int am_server;
  extern int am_daemon;
@@ -730,8 +730,8 @@ After applying this patch, run these commands for a successful build:
 -      write_batch_monitor_out = -1;
 -      write_batch_monitor_in = -1;
 -}
---- orig/log.c 2006-02-05 04:53:34
-+++ log.c      2005-12-16 23:49:57
+--- old/log.c
++++ new/log.c
 @@ -38,7 +38,6 @@ extern int am_sender;
  extern int local_server;
  extern int quiet;
@@ -759,8 +759,8 @@ After applying this patch, run these commands for a successful build:
                send_msg((enum msgcode)code, buf, len);
                return;
        }
---- orig/main.c        2006-02-05 04:53:34
-+++ main.c     2006-02-02 02:43:44
+--- old/main.c
++++ new/main.c
 @@ -30,7 +30,6 @@ extern int list_only;
  extern int am_root;
  extern int am_server;
@@ -959,8 +959,8 @@ After applying this patch, run these commands for a successful build:
        SIGACTMASK(SIGCHLD, sigchld_handler);
  #ifdef MAINTAINER_MODE
        SIGACTMASK(SIGSEGV, rsync_panic_handler);
---- orig/match.c       2005-11-10 16:58:36
-+++ match.c    2005-12-08 23:17:09
+--- old/match.c
++++ new/match.c
 @@ -21,7 +21,7 @@
  
  extern int verbose;
@@ -997,8 +997,8 @@ After applying this patch, run these commands for a successful build:
                                show_progress(last_match, buf->file_size);
                        sum_update(map_ptr(buf, last_match, len), len);
                        last_match = s->flength;
---- orig/options.c     2006-02-03 23:51:57
-+++ options.c  2005-12-08 23:17:09
+--- old/options.c
++++ new/options.c
 @@ -73,7 +73,6 @@ int def_compress_level = Z_DEFAULT_COMPR
  int am_root = 0;
  int am_server = 0;
@@ -1023,8 +1023,8 @@ After applying this patch, run these commands for a successful build:
  
        if (dry_run)
                do_xfers = 0;
---- orig/pipe.c        2006-01-21 08:03:40
-+++ pipe.c     2005-12-08 23:17:09
+--- old/pipe.c
++++ new/pipe.c
 @@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f
                exit_cleanup(RERR_IPC);
        }
@@ -1043,8 +1043,8 @@ After applying this patch, run these commands for a successful build:
        if (pid == -1) {
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
---- orig/receiver.c    2006-01-31 02:30:18
-+++ receiver.c 2006-01-14 08:30:29
+--- old/receiver.c
++++ new/receiver.c
 @@ -24,7 +24,7 @@ extern int verbose;
  extern int do_xfers;
  extern int am_daemon;
@@ -1164,8 +1164,8 @@ After applying this patch, run these commands for a successful build:
                }
        }
        make_backups = save_make_backups;
---- orig/rsync.c       2006-02-05 15:31:49
-+++ rsync.c    2005-12-08 23:17:10
+--- old/rsync.c
++++ new/rsync.c
 @@ -41,7 +41,6 @@ extern int orig_umask;
  extern int am_root;
  extern int am_server;
@@ -1181,8 +1181,8 @@ After applying this patch, run these commands for a successful build:
 -      return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 +      return am_sender ? "sender" : am_generator() ? "generator" : "receiver";
  }
---- orig/rsync.h       2006-02-03 20:00:36
-+++ rsync.h    2006-01-17 02:46:03
+--- old/rsync.h
++++ new/rsync.h
 @@ -166,10 +166,8 @@ enum msgcode {
        MSG_DATA=0,     /* raw data on the multiplexed stream */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
@@ -1202,8 +1202,8 @@ After applying this patch, run these commands for a successful build:
  
  #include "lib/pool_alloc.h"
  
---- orig/util.c        2006-02-03 20:00:36
-+++ util.c     2005-12-08 23:17:10
+--- old/util.c
++++ new/util.c
 @@ -413,51 +413,6 @@ int robust_rename(char *from, char *to, 
        return -1;
  }