summaryrefslogtreecommitdiff
path: root/src/conn-tools/s6-tcpserver.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-11-26 09:47:02 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-11-26 09:47:02 +0000
commit26cd94b2a8f6da396058b6c5d6446e237ec9d78f (patch)
tree13706df3bc9657d911a26133625044ae1e1acb30 /src/conn-tools/s6-tcpserver.c
parent51a612c34446e10a086947c410aa206fa978d169 (diff)
downloads6-networking-26cd94b2a8f6da396058b6c5d6446e237ec9d78f.tar.xz
Convert to new exec.h syntax
Diffstat (limited to 'src/conn-tools/s6-tcpserver.c')
-rw-r--r--src/conn-tools/s6-tcpserver.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/conn-tools/s6-tcpserver.c b/src/conn-tools/s6-tcpserver.c
index 1143af7..ed874b6 100644
--- a/src/conn-tools/s6-tcpserver.c
+++ b/src/conn-tools/s6-tcpserver.c
@@ -2,18 +2,21 @@
#include <sys/types.h>
#include <limits.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/config.h>
+
#include <s6-networking/config.h>
#define USAGE "s6-tcpserver [ -q | -Q | -v ] [ -4 | -6 ] [ -d | -D ] [ -1 ] [ -c maxconn ] [ -C localmaxconn ] [ -b backlog ] [ -G gid,gid,... ] [ -g gid ] [ -u uid ] [ -U ] ip port prog..."
#define dieusage() strerr_dieusage(100, USAGE)
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
{
unsigned int verbosity = 1 ;
int flag1 = 0 ;
@@ -130,6 +133,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) ;
}
}