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 9a239d2a8d9de3d9fd96c8e3bf803694f7e057ff..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: 1c82a1e1e54eb585cd37c875604193f5b977d24e
+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
-@@ -93,6 +93,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
-@@ -206,8 +206,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)
-@@ -1589,6 +1592,14 @@ void remember_children(UNUSED(int val))
+@@ -1637,6 +1640,14 @@ void remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -80,7 +80,7 @@ diff --git a/main.c b/main.c
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1644,6 +1655,12 @@ static void rsync_panic_handler(UNUSED(int whatsig))
+@@ -1690,6 +1701,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
@@ -90,10 +90,19 @@ diff --git a/main.c b/main.c
 +      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[])
  {
-@@ -1666,6 +1683,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);
@@ -108,7 +117,7 @@ diff --git a/main.c b/main.c
 diff --git a/socket.c b/socket.c
 --- a/socket.c
 +++ b/socket.c
-@@ -532,7 +532,17 @@ int is_a_socket(int fd)
+@@ -522,7 +522,17 @@ int is_a_socket(int fd)
  static void sigchld_handler(UNUSED(int val))
  {
  #ifdef WNOHANG