1 files changed, 10 insertions, 12 deletions

diff --git a/src/conn-tools/s6-tcpserver6.c b/src/conn-tools/s6-tcpserver6.c
index d48efe1..8648e8e 100644
--- a/src/conn-tools/s6-tcpserver6.c
+++ b/src/conn-tools/s6-tcpserver6.c
@@ -2,9 +2,7 @@
 
 #include <sys/types.h>
 #include <limits.h>
-#include <skalibs/uint64.h>
-#include <skalibs/uint.h>
-#include <skalibs/gidstuff.h>
+#include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/djbunix.h>
@@ -20,10 +18,10 @@ int main (int argc, char const *const *argv, char const *const *envp)
   int flag1 = 0 ;
   int flagU = 0 ;
   int flagreuse = 1 ;
-  uint64 uid = 0 ;
+  uid_t uid = 0 ;
   gid_t gid = 0 ;
   gid_t gids[NGROUPS_MAX] ;
-  unsigned int gidn = (unsigned int)-1 ;
+  size_t gidn = (size_t)-1 ;
   unsigned int maxconn = 0 ;
   unsigned int localmaxconn = 0 ;
   unsigned int backlog = (unsigned int)-1 ;
@@ -32,7 +30,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      register int opt = subgetopt_r(argc, argv, "Dd1Uv:c:C:b:u:g:G:", &l) ;
+      int opt = subgetopt_r(argc, argv, "Dd1Uv:c:C:b:u:g:G:", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
@@ -42,11 +40,11 @@ int main (int argc, char const *const *argv, char const *const *envp)
         case 'c' : if (!uint0_scan(l.arg, &maxconn)) dieusage() ; if (!maxconn) maxconn = 1 ; break ;
         case 'C' : if (!uint0_scan(l.arg, &localmaxconn)) dieusage() ; if (!localmaxconn) localmaxconn = 1 ; break ;
         case 'b' : if (!uint0_scan(l.arg, &backlog)) dieusage() ; break ;
-        case 'u' : if (!uint640_scan(l.arg, &uid)) dieusage() ; break ;
+        case 'u' : if (!uid0_scan(l.arg, &uid)) dieusage() ; break ;
         case 'g' : if (!gid0_scan(l.arg, &gid)) dieusage() ; break ;
         case 'G' : if (!gid_scanlist(gids, NGROUPS_MAX, l.arg, &gidn) && *l.arg) dieusage() ; break ;
         case '1' : flag1 = 1 ; break ;
-        case 'U' : flagU = 1 ; uid = 0 ; gid = 0 ; gidn = (unsigned int)-1 ; break ;
+        case 'U' : flagU = 1 ; uid = 0 ; gid = 0 ; gidn = (size_t)-1 ; break ;
         default : dieusage() ;
       }
     }
@@ -57,7 +55,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   {
     size_t pos = 0 ;
     unsigned int m = 0 ;
-    char fmt[UINT_FMT * 4 + UINT64_FMT + GID_FMT * (NGROUPS_MAX + 1)] ;
+    char fmt[UINT_FMT * 4 + UID_FMT + GID_FMT * (NGROUPS_MAX + 1)] ;
     char const *newargv[24 + argc] ;
     newargv[m++] = S6_NETWORKING_BINPREFIX "s6-tcpserver6-socketbinder" ;
     if (!flagreuse) newargv[m++] = "-D" ;
@@ -72,7 +70,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = "--" ;
     newargv[m++] = *argv++ ;
     newargv[m++] = *argv++ ;
-    if (flagU || uid || gid || gidn != (unsigned int)-1)
+    if (flagU || uid || gid || gidn != (size_t)-1)
     {
       newargv[m++] = S6_EXTBINPREFIX "s6-applyuidgid" ;
       if (flagU) newargv[m++] = "-Uz" ;
@@ -80,7 +78,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
       {
         newargv[m++] = "-u" ;
         newargv[m++] = fmt + pos ;
-        pos += uint64_fmt(fmt + pos, uid) ;
+        pos += uid_fmt(fmt + pos, uid) ;
         fmt[pos++] = 0 ;
       }
       if (gid)
@@ -90,7 +88,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
         pos += gid_fmt(fmt + pos, gid) ;
         fmt[pos++] = 0 ;
       }
-      if (gidn != (unsigned int)-1)
+      if (gidn != (size_t)-1)
       {
         newargv[m++] = "-G" ;
         newargv[m++] = fmt + pos ;