Updated to apply cleanly.

[rsync/rsync-patches.git] / catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 472b71e..cf6f4a5 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -38,7 +38,7 @@ To use this patch, run these commands for a successful build:
   *
 --- 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" },
@@ -48,7 +48,7 @@ To use this patch, run these commands for a successful build:
        { RERR_PARTIAL    , "some files could not be transferred" },
 --- old/main.c
 +++ new/main.c
-@@ -149,8 +149,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;
@@ -61,7 +61,7 @@ To use this patch, run these commands for a successful build:
  }
  
  /* This function gets called from all 3 processes.  We want the client side
-@@ -1211,6 +1214,14 @@ RETSIGTYPE remember_children(UNUSED(int 
+@@ -1234,6 +1237,14 @@ RETSIGTYPE remember_children(UNUSED(int 
                                break;
                        }
                }
@@ -76,7 +76,7 @@ To use this patch, run these commands for a successful build:
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1269,6 +1280,12 @@ static RETSIGTYPE rsync_panic_handler(UN
+@@ -1292,6 +1303,12 @@ static RETSIGTYPE rsync_panic_handler(UN
  }
  #endif
  
@@ -89,7 +89,7 @@ To use this patch, run these commands for a successful build:
  
  int main(int argc,char *argv[])
  {
-@@ -1291,6 +1308,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);