s6

commit f0c0a6da2d4d9162d09c0662598e18e82d9bd917
parent d7242bda59ec2ec056508b39cb532b5e7318dd13
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Wed,  3 Jan 2018 14:11:10 +0000

 Use child_spawn2 instead of child_spawn in s6-setlock

Diffstat:
M
COPYING
 | 
2
+-
M
src/daemontools-extras/s6-setlock.c
 | 
4
++--
M
src/fdholder/s6-fdholderd.c
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/COPYING b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2011-2018 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/src/daemontools-extras/s6-setlock.c b/src/daemontools-extras/s6-setlock.c
@@ -54,13 +54,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
     char const *cenvp[2] = { ex ? "S6LOCK_EX=1" : 0, 0 } ;
     iopause_fd x = { .events = IOPAUSE_READ } ;
     tain_t deadline ;
-    int p[2] ;
+    int p[2] = { 0, 1 } ;
     pid_t pid ;
     char c ;
     tain_now_g() ;
     tain_from_millisecs(&deadline, timeout) ;
     tain_add_g(&deadline, &deadline) ;
-    pid = child_spawn(S6_LIBEXECPREFIX "s6lockd-helper", cargv, cenvp, p, 2) ;
+    pid = child_spawn2(S6_LIBEXECPREFIX "s6lockd-helper", cargv, cenvp, p) ;
     if (!pid) strerr_diefu2sys(111, "spawn ", S6_LIBEXECPREFIX "s6lockd-helper") ;
     x.fd = p[0] ;
     for (;;)
diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c
@@ -641,8 +641,8 @@ static inline int new_connection (int fd, regex_t *rre, regex_t *wre, unsigned i
       s6_accessrules_params_free(&params) ;
       return 0 ;
     }
-    s6_accessrules_params_free(&params) ;
   }
+  s6_accessrules_params_free(&params) ;
   if (!(done & 1)) defaultre(rre) ;
   if (!(done & 2)) defaultre(wre) ;
   return 1 ;