Much nicer json code.

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

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 01a867b52e4940e4d89e24aceadf7623467ae9be..213c1118217e025570c5503ccdac781209a5dce8 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,8 +25,8 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
+based-on: db5bfe67a5d022f9ad25340db6bc2cca2cbbdb65
 diff --git a/errcode.h b/errcode.h
-index 41c5543..e9c5a28 100644
 --- a/errcode.h
 +++ b/errcode.h
 @@ -47,6 +47,8 @@
@@ -39,10 +39,9 @@ index 41c5543..e9c5a28 100644
   * ssh and the shell seem to return these values:
   *
 diff --git a/log.c b/log.c
-index a687375..8e46712 100644
 --- a/log.c
 +++ b/log.c
-@@ -88,6 +88,7 @@ struct {
+@@ -92,6 +92,7 @@ struct {
        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
@@ -51,10 +50,9 @@ index a687375..8e46712 100644
        { RERR_MALLOC     , "error allocating core memory buffers" },
        { RERR_PARTIAL    , "some files/attrs were not transferred (see previous errors)" },
 diff --git a/main.c b/main.c
-index 2ef2f47..45159d3 100644
 --- a/main.c
 +++ b/main.c
-@@ -167,8 +167,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -216,8 +216,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;
@@ -67,7 +65,7 @@ index 2ef2f47..45159d3 100644
  }
  
  void write_del_stats(int f)
-@@ -1389,6 +1392,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+@@ -1635,6 +1638,14 @@ void remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -82,20 +80,29 @@ index 2ef2f47..45159d3 100644
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1447,6 +1458,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -1688,6 +1699,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
-+static RETSIGTYPE rsync_crash_handler(UNUSED(int whatsig))
++static void rsync_crash_handler(UNUSED(int whatsig))
 +{
 +      log_exit(RERR_WECRASHED, __FILE__, __LINE__);
 +      logfile_close();
 +      _exit(RERR_WECRASHED);
 +}
++
+ static void unset_env_var(const char *var)
+ {
+ #ifdef HAVE_UNSETENV
+@@ -1704,7 +1722,6 @@ static void unset_env_var(const char *var)
+ #endif
+ }
  
+-
  int main(int argc,char *argv[])
  {
-@@ -1469,6 +1486,11 @@ int main(int argc,char *argv[])
+       int ret;
+@@ -1728,6 +1745,11 @@ int main(int argc,char *argv[])
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);
@@ -105,14 +112,13 @@ index 2ef2f47..45159d3 100644
 +      SIGACTMASK(SIGABRT, rsync_crash_handler);
 +      SIGACTMASK(SIGBUS, rsync_crash_handler);
  #endif
- 
-       starttime = time(NULL);
+ #ifdef SIGINFO
+       SIGACTMASK(SIGINFO, siginfo_handler);
 diff --git a/socket.c b/socket.c
-index 5df3a50..3423e18 100644
 --- a/socket.c
 +++ b/socket.c
-@@ -518,7 +518,17 @@ int is_a_socket(int fd)
- static RETSIGTYPE sigchld_handler(UNUSED(int val))
+@@ -522,7 +522,17 @@ int is_a_socket(int fd)
+ static void sigchld_handler(UNUSED(int val))
  {
  #ifdef WNOHANG
 -      while (waitpid(-1, NULL, WNOHANG) > 0) {}