X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/c0c7984e7f6009b6ab18ad3da998a56a9c0f083d..7f0bf1cb30e4c9cb751903ae1e7b235760bcfd00:/catch_crash_signals.diff diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff index d7c0e12..751eeaa 100644 --- a/catch_crash_signals.diff +++ b/catch_crash_signals.diff @@ -40,7 +40,7 @@ diff --git a/errcode.h b/errcode.h diff --git a/log.c b/log.c --- a/log.c +++ b/log.c -@@ -82,6 +82,7 @@ struct { +@@ -83,6 +83,7 @@ struct { { RERR_TERMINATED , "sibling process terminated abnormally" }, { RERR_SIGNAL1 , "received SIGUSR1" }, { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, @@ -64,7 +64,7 @@ diff --git a/main.c b/main.c } /* This function gets called from all 3 processes. We want the client side -@@ -1306,6 +1309,14 @@ RETSIGTYPE remember_children(UNUSED(int val)) +@@ -1315,6 +1318,14 @@ RETSIGTYPE remember_children(UNUSED(int val)) break; } } @@ -79,7 +79,7 @@ diff --git a/main.c b/main.c } #endif #ifndef HAVE_SIGACTION -@@ -1364,6 +1375,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig)) +@@ -1373,6 +1384,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig)) } #endif @@ -92,7 +92,7 @@ diff --git a/main.c b/main.c int main(int argc,char *argv[]) { -@@ -1386,6 +1403,11 @@ int main(int argc,char *argv[]) +@@ -1395,6 +1412,11 @@ int main(int argc,char *argv[]) SIGACTMASK(SIGFPE, rsync_panic_handler); SIGACTMASK(SIGABRT, rsync_panic_handler); SIGACTMASK(SIGBUS, rsync_panic_handler); @@ -107,7 +107,7 @@ diff --git a/main.c b/main.c diff --git a/socket.c b/socket.c --- a/socket.c +++ b/socket.c -@@ -512,7 +512,17 @@ int is_a_socket(int fd) +@@ -518,7 +518,17 @@ int is_a_socket(int fd) static RETSIGTYPE sigchld_handler(UNUSED(int val)) { #ifdef WNOHANG