148114425f
- Add non-default SMB (samba) option PR: 194155 Submitted by: syepes@gmail.com Reviewed by: lukas.slebodnik@intrak.sk (maintainer), riggs Approved by: lukas.slebodnik@intrak.sk (maintainer)
72 lines
1.8 KiB
C
72 lines
1.8 KiB
C
diff --git src/util/signal.c src/util/signal.c
|
|
index 053457b..bb8f8be 100644
|
|
--- src/util/signal.c
|
|
+++ src/util/signal.c
|
|
@@ -28,45 +28,6 @@
|
|
* @brief Signal handling
|
|
*/
|
|
|
|
-/****************************************************************************
|
|
- Catch child exits and reap the child zombie status.
|
|
-****************************************************************************/
|
|
-
|
|
-static void sig_cld(int signum)
|
|
-{
|
|
- while (waitpid((pid_t)-1,(int *)NULL, WNOHANG) > 0)
|
|
- ;
|
|
-
|
|
- /*
|
|
- * Turns out it's *really* important not to
|
|
- * restore the signal handler here if we have real POSIX
|
|
- * signal handling. If we do, then we get the signal re-delivered
|
|
- * immediately - hey presto - instant loop ! JRA.
|
|
- */
|
|
-
|
|
-#if !defined(HAVE_SIGACTION)
|
|
- CatchSignal(SIGCLD, sig_cld);
|
|
-#endif
|
|
-}
|
|
-
|
|
-/****************************************************************************
|
|
-catch child exits - leave status;
|
|
-****************************************************************************/
|
|
-
|
|
-static void sig_cld_leave_status(int signum)
|
|
-{
|
|
- /*
|
|
- * Turns out it's *really* important not to
|
|
- * restore the signal handler here if we have real POSIX
|
|
- * signal handling. If we do, then we get the signal re-delivered
|
|
- * immediately - hey presto - instant loop ! JRA.
|
|
- */
|
|
-
|
|
-#if !defined(HAVE_SIGACTION)
|
|
- CatchSignal(SIGCLD, sig_cld_leave_status);
|
|
-#endif
|
|
-}
|
|
-
|
|
/**
|
|
Block sigs.
|
|
**/
|
|
@@ -126,21 +87,3 @@ void (*CatchSignal(int signum,void (*handler)(int )))(int)
|
|
return signal(signum, handler);
|
|
#endif
|
|
}
|
|
-
|
|
-/**
|
|
- Ignore SIGCLD via whatever means is necessary for this OS.
|
|
-**/
|
|
-
|
|
-void CatchChild(void)
|
|
-{
|
|
- CatchSignal(SIGCLD, sig_cld);
|
|
-}
|
|
-
|
|
-/**
|
|
- Catch SIGCLD but leave the child around so it's status can be reaped.
|
|
-**/
|
|
-
|
|
-void CatchChildLeaveStatus(void)
|
|
-{
|
|
- CatchSignal(SIGCLD, sig_cld_leave_status);
|
|
-}
|