From a53c8b393b8181808ed8a84a50c4b521d7aaf436 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 9 Mar 2017 13:16:48 +0000
Subject:  Adapt to skalibs-2.5.0.0

---
 src/init/s6-linux-init-maker.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 9c00d0c..802d924 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -5,8 +5,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <skalibs/uint64.h>
-#include <skalibs/uint.h>
-#include <skalibs/gidstuff.h>
+#include <skalibs/types.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
@@ -80,7 +79,7 @@ static int s6_svscan_log_script (buffer *b)
     "redirfd -w 1 /dev/null\n"
     "redirfd -rnb 0 fifo\n"
     "s6-applyuidgid -u ") < 0
-   || buffer_put(b, fmt, uint64_fmt(fmt, uncaught_logs_uid)) < 0
+   || buffer_put(b, fmt, uid_fmt(fmt, uncaught_logs_uid)) < 0
    || buffer_puts(b, " -g ") < 0
    || buffer_put(b, fmt, gid_fmt(fmt, uncaught_logs_gid)) < 0
    || buffer_puts(b, " --\ns6-log -bp -- ") < 0
@@ -302,7 +301,7 @@ static void auto_script (char const *base, char const *file, writetobuf_func_t_r
     cleanup(base) ;
     strerr_diefu3sys(111, "open ", fn, " for script writing") ;
   }
-  buffer_init(&b, &fd_writesv, fd, buf, 4096) ;
+  buffer_init(&b, &fd_writev, fd, buf, 4096) ;
   if (!(*scriptf)(&b) || !buffer_flush(&b))
   {
     cleanup(base) ;
-- 
cgit v1.2.3