./configure (optional if already run)
make
-based-on: a59a7b242393699fedeb4f66911e3fc9b4fadd73
+based-on: db5bfe67a5d022f9ad25340db6bc2cca2cbbdb65
diff --git a/errcode.h b/errcode.h
--- 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" },
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -180,8 +180,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;
}
void write_del_stats(int f)
-@@ -1442,6 +1445,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+@@ -1635,6 +1638,14 @@ void remember_children(UNUSED(int val))
break;
}
}
}
#endif
#ifndef HAVE_SIGACTION
-@@ -1500,6 +1511,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[])
{
-@@ -1522,6 +1539,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);
+ 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
-@@ -521,7 +521,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) {}