From 04b699857c141a93fc981b83ba02b452ce3a2ddc Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 28 Aug 2017 13:59:16 +0000 Subject: Switch to xpathexec_* --- src/daemontools-extras/s6-setlock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/daemontools-extras/s6-setlock.c') diff --git a/src/daemontools-extras/s6-setlock.c b/src/daemontools-extras/s6-setlock.c index a90bb13..086c2f6 100644 --- a/src/daemontools-extras/s6-setlock.c +++ b/src/daemontools-extras/s6-setlock.c @@ -35,8 +35,7 @@ int main (int argc, char const *const *argv, char const *const *envp) case 'N' : nb = 0 ; break ; case 'r' : ex = 0 ; break ; case 'w' : ex = 1 ; break ; - case 't' : if (!uint0_scan(subgetopt_here.arg, &timeout)) dieusage() ; - nb = 2 ; break ; + case 't' : if (!uint0_scan(subgetopt_here.arg, &timeout)) dieusage() ; nb = 2 ; break ; default : dieusage() ; } } @@ -83,6 +82,5 @@ int main (int argc, char const *const *argv, char const *const *envp) fd_close(p[0]) ; if (uncoe(p[1]) < 0) strerr_diefu1sys(111, "uncoe fd to helper") ; } - pathexec_run(argv[1], argv+1, envp) ; - strerr_dieexec(111, argv[1]) ; + xpathexec_run(argv[1], argv+1, envp) ; } -- cgit v1.2.3