commit f84f150acd91c3c1c74795155d8201f1f9285c74
parent 90b12bd71bb9fc79a4640b9112c13ef529d0196a
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 5 Dec 2014 22:54:14 +0000
Bugfix: WTERMSIG, not WIFSIGNAL for 2nd argument to ./finish in s6-supervise
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c
@@ -247,7 +247,7 @@ static void tryfinish (int wstat, int islast)
char *cargv[4] = { "finish", fmt0, fmt1, 0 } ;
selfpipe_finish() ;
fmt0[uint_fmt(fmt0, WIFSIGNALED(wstat) ? 255 : WEXITSTATUS(wstat))] = 0 ;
- fmt1[uint_fmt(fmt1, WIFSIGNALED(wstat))] = 0 ;
+ fmt1[uint_fmt(fmt1, WTERMSIG(wstat))] = 0 ;
if (flagsetsid) setsid() ;
execve("./finish", cargv, (char *const *)environ) ;
_exit(111) ;