Modernize s6-tcpserver-socketbinder, fix error message bug

1 files changed, 42 insertions, 28 deletions

diff --git a/src/conn-tools/s6-tcpserver-socketbinder.c b/src/conn-tools/s6-tcpserver-socketbinder.c
index bc40ef4..03c658e 100644
--- a/src/conn-tools/s6-tcpserver-socketbinder.c
+++ b/src/conn-tools/s6-tcpserver-socketbinder.c
@@ -7,53 +7,67 @@
 #include <sys/socket.h>
 
 #include <skalibs/types.h>
-#include <skalibs/sgetopt.h>
+#include <skalibs/envexec.h>
 #include <skalibs/fmtscan.h>
-#include <skalibs/strerr.h>
 #include <skalibs/socket.h>
 #include <skalibs/ip46.h>
-#include <skalibs/exec.h>
 
 #define USAGE "s6-tcpserver-socketbinder [ -d | -D ] [ -b backlog ] [ -M | -m ] [ -B ] ip port prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
+enum golb_e
+{
+  GOLB_NOREUSE = 0x01,
+  GOLB_UDP = 0x02,
+  GOLB_BLOCK = 0x04,
+} ;
+
+enum gola_e
+{
+  GOLA_BACKLOG,
+  GOLA_N
+} ;
+
 int main (int argc, char const *const *argv)
 {
+  static gol_bool const rgolb[] =
+  {
+    { .so = 'd', .lo = "reuse-address", .clear = GOLB_NOREUSE, .set = 0 },
+    { .so = 'D', .lo = "no-reuse-address", .clear = 0, .set = GOLB_NOREUSE },
+    { .so = 'M', .lo = "tcp", .clear = GOLB_UDP, .set = 0 },
+    { .so = 'm', .lo = "udp", .clear = 0, .set = GOLB_UDP },
+    { .so = 'B', .lo = "block", .clear = 0, .set = GOLB_BLOCK },
+  } ;
+  static gol_arg const rgola[] =
+  {
+    { .so = 'b', .lo = "backlog", .i = GOLA_BACKLOG },
+  } ;
+  uint64_t wgolb = 0 ;
+  char const *wgola[GOLA_N] = { 0 } ;
   unsigned int backlog = SOMAXCONN ;
-  int flagreuse = 1 ;
-  int flagudp = 0 ;
-  unsigned int flags = O_NONBLOCK ;
+  unsigned int golc ;
   ip46 ip ;
   uint16_t port ;
   PROG = "s6-tcpserver-socketbinder" ;
+
+  golc = GOL_main(argc, argv, rgolb, rgola, &wgolb, wgola) ;
+  argc -= golc ; argv += golc ;
+  if (argc < 3) dieusage() ;
+  if (wgola[GOLA_BACKLOG])
   {
-    subgetopt l = SUBGETOPT_ZERO ;
-    for (;;)
-    {
-      int opt = subgetopt_r(argc, argv, "DdMmBb:", &l) ;
-      if (opt == -1) break ;
-      switch (opt)
-      {
-        case 'D' : flagreuse = 0 ; break ;
-        case 'd' : flagreuse = 1 ; break ;
-        case 'M' : flagudp = 0 ; break ;
-        case 'm' : flagudp = 1 ; break ;
-        case 'B' : flags = 0 ; break ;
-        case 'b' : if (!uint0_scan(l.arg, &backlog)) dieusage() ; break ;
-        default : dieusage() ;
-      }
-    }
-    argc -= l.ind ; argv += l.ind ;
+    if (!uint0_scan(wgola[GOLA_BACKLOG], &backlog))
+      strerr_dief1x(100, "backlog must be an unsigned integer") ;
   }
-  if (argc < 3) dieusage() ;
   if (!ip46_scan(argv[0], &ip) || !uint160_scan(argv[1], &port)) dieusage() ;
   close(0) ;
-  if (flagudp ? socket_udp46_internal(ip46_is6(&ip), flags) : socket_tcp46_internal(ip46_is6(&ip), flags))
+  if (wgolb & GOLB_UDP ?
+      socket_udp46_internal(ip46_is6(&ip), wgolb & GOLB_BLOCK ? 0 : O_NONBLOCK) :
+      socket_tcp46_internal(ip46_is6(&ip), wgolb & GOLB_BLOCK ? 0 : O_NONBLOCK))
     strerr_diefu1sys(111, "create socket") ;
-  if ((flagreuse ? socket_bind46_reuse(0, &ip, port) : socket_bind46(0, &ip, port)) == -1)
-    strerr_diefu5sys(111, "bind to ", argv[0], ":", argv[1], " ") ;
+  if ((wgolb & GOLB_NOREUSE ? socket_bind46(0, &ip, port) : socket_bind46_reuse(0, &ip, port)) == -1)
+    strerr_diefu5sys(111, "bind to ", argv[0], " port ", argv[1], " ") ;
   if (backlog && socket_listen(0, backlog) == -1)
-    strerr_diefu5sys(111, "listen to ", argv[0], ":", argv[1], " ") ;
+    strerr_diefu5sys(111, "listen to ", argv[0], " port ", argv[1], " ") ;
 
   xexec(argv+2) ;
 }