From 1b5312d5c01fd5e12b938cfe65cda562e822619d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 11 Mar 2017 12:16:25 +0000
Subject:  Adapt to skalibs-2.5.0.0

---
 src/skaembutils/s6-mkdir.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/skaembutils/s6-mkdir.c')

diff --git a/src/skaembutils/s6-mkdir.c b/src/skaembutils/s6-mkdir.c
index baec9a0..2a8fc74 100644
--- a/src/skaembutils/s6-mkdir.c
+++ b/src/skaembutils/s6-mkdir.c
@@ -1,12 +1,11 @@
 /* ISC license. */
 
-#include <sys/types.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/uint.h>
+#include <skalibs/types.h>
 #include <skalibs/buffer.h>
 #include <skalibs/strerr2.h>
 
@@ -34,13 +33,13 @@ static int doit (char const *s, unsigned int mode, int verbose, int ee)
 
 static int doparents (char const *s, unsigned int mode, int verbose)
 {
-  size_t n = str_len(s), i = 0 ;
+  size_t n = strlen(s), i = 0 ;
   char tmp[n+1] ;
   for (; i < n ; i++)
   {
     if ((s[i] == '/') && i)
     {
-      register int e ;
+      int e ;
       tmp[i] = 0 ;
       e = doit(tmp, mode, verbose, 0) ;
       if (e) return e ;
@@ -60,7 +59,7 @@ int main (int argc, char const *const *argv)
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      register int opt = subgetopt_r(argc, argv, "pvm:", &l) ;
+      int opt = subgetopt_r(argc, argv, "pvm:", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
-- 
cgit v1.3.1