X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/4c107044a94d027e9ba894d31577f427c10402ae..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index cceeaa8..02fc67c 100644
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,6 +25,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
@@ -40,7 +41,7 @@ diff --git a/errcode.h b/errcode.h
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -83,6 +83,7 @@ struct {
+@@ -88,6 +88,7 @@ struct {
  	{ RERR_TERMINATED , "sibling process terminated abnormally" },
  	{ RERR_SIGNAL1    , "received SIGUSR1" },
  	{ RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
@@ -51,7 +52,7 @@ diff --git a/log.c b/log.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -163,8 +163,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -169,8 +169,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
  			*exit_code_ptr = RERR_TERMINATED;
  		else
  			*exit_code_ptr = RERR_WAITCHILD;
@@ -63,8 +64,8 @@ diff --git a/main.c b/main.c
 +	}
  }
  
- /* This function gets called from all 3 processes.  We want the client side
-@@ -1315,6 +1318,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+ void write_del_stats(int f)
+@@ -1401,6 +1404,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
  				break;
  			}
  		}
@@ -79,7 +80,7 @@ diff --git a/main.c b/main.c
  	}
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1373,6 +1384,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -1459,6 +1470,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
@@ -92,7 +93,7 @@ diff --git a/main.c b/main.c
  
  int main(int argc,char *argv[])
  {
-@@ -1395,6 +1412,11 @@ int main(int argc,char *argv[])
+@@ -1481,6 +1498,11 @@ int main(int argc,char *argv[])
  	SIGACTMASK(SIGFPE, rsync_panic_handler);
  	SIGACTMASK(SIGABRT, rsync_panic_handler);
  	SIGACTMASK(SIGBUS, rsync_panic_handler);