From 26cd94b2a8f6da396058b6c5d6446e237ec9d78f Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 26 Nov 2020 09:47:02 +0000
Subject:  Convert to new exec.h syntax

---
 src/tls/s6-tlsclient.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/tls/s6-tlsclient.c')

diff --git a/src/tls/s6-tlsclient.c b/src/tls/s6-tlsclient.c
index 267f457..06ef4da 100644
--- a/src/tls/s6-tlsclient.c
+++ b/src/tls/s6-tlsclient.c
@@ -1,12 +1,14 @@
 /* ISC license. */
 
-#include <string.h>
 #include <stdint.h>
+#include <string.h>
+
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
 #include <skalibs/ip46.h>
+#include <skalibs/exec.h>
+
 #include <s6-networking/config.h>
 
 #define USAGE "s6-tlsclient [ options ] host port prog...\n" \
@@ -24,8 +26,8 @@ struct options_s
   unsigned int ximeout ;
   unsigned int yimeout ;
   unsigned int kimeout ;
-  uint16_t localport ;
   ip46full_t localip ;
+  uint16_t localport ;
   unsigned int verbosity : 2 ;
   unsigned int flag4 : 1 ;
   unsigned int flag6 : 1 ;
@@ -62,7 +64,7 @@ struct options_s
   .doxy = 0 \
 }
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
   options_t o = OPTIONS_ZERO ;
   PROG = "s6-tlsclient" ;
@@ -197,6 +199,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = "--" ;
     while (*argv) newargv[m++] = *argv++ ;
     newargv[m++] = 0 ;
-    xpathexec_run(newargv[0], newargv, envp) ;
+    xexec(newargv) ;
   }
 }
-- 
cgit v1.3.1