1 files changed, 20 insertions, 21 deletions

diff --git a/src/conn-tools/s6-tlsc.c b/src/conn-tools/s6-tlsc.c
index 5a15315..5b2e7dc 100644
--- a/src/conn-tools/s6-tlsc.c
+++ b/src/conn-tools/s6-tlsc.c
@@ -13,32 +13,31 @@
 
 #include "s6tls-internal.h"
 
-#define USAGE "s6-tlsc [ -S | -s ]  [ -Y | -y ] [ -v verbosity ] [ -K timeout ] [ -k servername ] [ -Z | -z ] [ -6 rfd ] [ -7 wfd ] prog..."
+#define USAGE "s6-tlsc [ -S | -s ]  [ -Y | -y ] [ -v verbosity ] [ -K timeout ] [ -k servername ] [ -Z | -z ] [ -6 fdr ] [ -7 fdw ] prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
-static void child (int const [3][2], int, int, uint32_t, unsigned int, unsigned int, char const *) gccattr_noreturn ;
-static void child (int const p[3][2], int fdr, int fdw, uint32_t options, unsigned int verbosity, unsigned int kimeout, char const *servername)
+static void child (int const [4][2], uint32_t, unsigned int, unsigned int, char const *) gccattr_noreturn ;
+static void child (int const p[4][2], uint32_t options, unsigned int verbosity, unsigned int kimeout, char const *servername)
 {
   int fds[3] = { p[0][0], p[1][1], p[2][1] } ;
   PROG = "s6-tlsc (child)" ;
   close(p[2][0]) ;
   close(p[0][1]) ;
   close(p[1][0]) ;
-  if (fd_move(0, fdr) < 0 || fd_move(1, fdw) < 0)
+  if (fd_move(0, p[3][0]) < 0 || fd_move(1, p[3][1]) < 0)
     strerr_diefu1sys(111, "move network fds to stdin/stdout") ;
   s6tls_exec_tlscio(fds, options, verbosity, kimeout, servername) ;
 }
 
 int main (int argc, char const *const *argv)
 {
-  int fds[2] = { 6, 7 } ;
-  char const *servername = 0 ;
   unsigned int verbosity = 1 ;
   unsigned int kimeout = 0 ;
-  int p[3][2] ;
-  uint32_t options = 0 ;
-  int cleanenv = 1 ;
+  int p[4][2] ;
+  uint32_t coptions = 0 ;
+  uint32_t poptions = 1 ;
   pid_t pid ;
+  char const *servername = 0 ;
 
   PROG = "s6-tlsc" ;
   {
@@ -49,27 +48,27 @@ int main (int argc, char const *const *argv)
       if (opt == -1) break ;
       switch (opt)
       {
-        case 'S' : options &= ~4 ; break ;
-        case 's' : options |= 4 ; break ;
-        case 'Y' : options &= ~1 ; break ;
-        case 'y' : options |= 1 ; break ;
+        case 'S' : coptions &= ~4 ; break ;
+        case 's' : coptions |= 4 ; break ;
+        case 'Y' : coptions &= ~1 ; break ;
+        case 'y' : coptions |= 1 ; break ;
         case 'v' : if (!uint0_scan(l.arg, &verbosity)) dieusage() ; break ;
         case 'K' : if (!uint0_scan(l.arg, &kimeout)) dieusage() ; break ;
         case 'k' : servername = l.arg ; break ;
-        case 'Z' : cleanenv = 0 ; break ;
-        case 'z' : cleanenv = 1 ; break ;
+        case 'Z' : poptions &= ~1 ; break ;
+        case 'z' : poptions |= 1 ; break ;
         case '6' :
         {
           unsigned int fd ;
           if (!uint0_scan(l.arg, &fd)) dieusage() ;
-          fds[0] = fd ;
+          p[3][0] = fd ;
           break ;
         }
         case '7' :
         {
           unsigned int fd ;
           if (!uint0_scan(l.arg, &fd)) dieusage() ;
-          fds[1] = fd ;
+          p[3][1] = fd ;
           break ;
         }
         default : dieusage() ;
@@ -79,17 +78,17 @@ int main (int argc, char const *const *argv)
   }
   if (!argc) dieusage() ;
   fd_sanitize() ;
-  if (fcntl(fds[0], F_GETFD) < 0 || fcntl(fds[1], F_GETFD) < 0)
+  if (fcntl(p[3][0], F_GETFD) < 0 || fcntl(p[3][1], F_GETFD) < 0)
     strerr_diefu1sys(111, "check network fds") ;
+
   if (pipe(p[0]) < 0 || pipe(p[1]) < 0 || pipe(p[2]) < 0)
     strerr_diefu1sys(111, "pipe") ;
   pid = fork() ;
   switch (pid)
   {
     case -1 : strerr_diefu1sys(111, "fork") ;
-    case 0 : child(p, fds[0], fds[1], options, verbosity, kimeout, servername) ;
+    case 0 : child(p, coptions, verbosity, kimeout, servername) ;
     default : break ;
   }
-
-  s6tls_wait_and_exec_app(argv, p, pid, fds[0], fds[1], cleanenv ? 1 : 0) ;
+  s6tls_sync_and_exec_app(argv, p, pid, poptions) ;
 }