The patches for 3.3.0.

[rsync-patches.git] / catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 48fe5d84b0f4f26eb22481d502880660cf268b15..e1aed5fa4f3e35feeafbe64976ba56d057c4c7e6 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
@@ -41,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
-@@ -91,6 +91,7 @@ struct {
+@@ -92,6 +92,7 @@ struct {
        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
@@ -52,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
-@@ -181,8 +181,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -218,8 +218,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;
@@ -65,7 +65,7 @@ diff --git a/main.c b/main.c
  }
  
  void write_del_stats(int f)
-@@ -1445,6 +1448,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+@@ -1637,6 +1640,14 @@ void remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -80,20 +80,29 @@ diff --git a/main.c b/main.c
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1502,6 +1513,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -1690,6 +1701,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
+@@ -1706,7 +1724,6 @@ static void unset_env_var(const char *var)
+ #endif
+ }
  
+-
  int main(int argc,char *argv[])
  {
-@@ -1524,6 +1541,11 @@ int main(int argc,char *argv[])
+       int ret;
+@@ -1730,6 +1747,11 @@ int main(int argc,char *argv[])
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);
@@ -103,13 +112,13 @@ diff --git a/main.c b/main.c
 +      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
 --- a/socket.c
 +++ b/socket.c
-@@ -532,7 +532,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) {}