X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ae5c78644c55a0b88e7530c4b40f2a29c94760b9..60a0edfe51f742c5689b8d19d52c8bad795e77c2:/catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 70c6ed4..cf6f4a5 100644
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -19,6 +19,12 @@ Igor Yu. Zhbanov wrote:
 I'm not sure I like this, but if you run into the cygwin problem, this might
 prove helpful.
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/catch_crash_signals.diff
+    ./configure                                  (optional if already run)
+    make
+
 --- old/errcode.h
 +++ new/errcode.h
 @@ -47,6 +47,8 @@
@@ -32,7 +38,7 @@ prove helpful.
   *
 --- old/log.c
 +++ new/log.c
-@@ -77,6 +77,7 @@ struct {
+@@ -79,6 +79,7 @@ struct {
  	{ RERR_TERMINATED , "sibling process terminated abnormally" },
  	{ RERR_SIGNAL1    , "received SIGUSR1" },
  	{ RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
@@ -42,7 +48,7 @@ prove helpful.
  	{ RERR_PARTIAL    , "some files could not be transferred" },
 --- old/main.c
 +++ new/main.c
-@@ -137,8 +137,11 @@ static void wait_process_with_flush(pid_
+@@ -155,8 +155,11 @@ static void wait_process_with_flush(pid_
  			*exit_code_ptr = RERR_TERMINATED;
  		else
  			*exit_code_ptr = RERR_WAITCHILD;
@@ -55,7 +61,7 @@ prove helpful.
  }
  
  /* This function gets called from all 3 processes.  We want the client side
-@@ -1112,6 +1115,14 @@ static RETSIGTYPE sigchld_handler(UNUSED
+@@ -1234,6 +1237,14 @@ RETSIGTYPE remember_children(UNUSED(int 
  				break;
  			}
  		}
@@ -70,7 +76,7 @@ prove helpful.
  	}
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1170,6 +1181,12 @@ static RETSIGTYPE rsync_panic_handler(UN
+@@ -1292,6 +1303,12 @@ static RETSIGTYPE rsync_panic_handler(UN
  }
  #endif
  
@@ -83,7 +89,7 @@ prove helpful.
  
  int main(int argc,char *argv[])
  {
-@@ -1192,6 +1209,11 @@ int main(int argc,char *argv[])
+@@ -1314,6 +1331,11 @@ int main(int argc,char *argv[])
  	SIGACTMASK(SIGFPE, rsync_panic_handler);
  	SIGACTMASK(SIGABRT, rsync_panic_handler);
  	SIGACTMASK(SIGBUS, rsync_panic_handler);
@@ -97,7 +103,7 @@ prove helpful.
  	starttime = time(NULL);
 --- old/socket.c
 +++ new/socket.c
-@@ -435,7 +435,17 @@ int is_a_socket(int fd)
+@@ -454,7 +454,17 @@ int is_a_socket(int fd)
  static RETSIGTYPE sigchld_handler(UNUSED(int val))
  {
  #ifdef WNOHANG