From 88bdac87d8a571a3a1ccffa2c1d8c4549a5bb0e9 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 30 Jun 2025 23:21:29 +0000
Subject:  Adapt to mkdirp

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 src/libs6f/deps-lib/s6f       |  1 -
 src/libs6f/s6f_confdir_open.c |  4 +++-
 src/libs6f/s6f_mkdirp.c       | 17 -----------------
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 src/libs6f/s6f_mkdirp.c

(limited to 'src/libs6f')

diff --git a/src/libs6f/deps-lib/s6f b/src/libs6f/deps-lib/s6f
index ab20410..464cc81 100644
--- a/src/libs6f/deps-lib/s6f
+++ b/src/libs6f/deps-lib/s6f
@@ -1,6 +1,5 @@
 s6f_confdir_open.o
 s6f_lock.o
-s6f_mkdirp.o
 s6f_report_state_change.o
 s6f_user_get_confdirs.o
 ${LIBNSSS}
diff --git a/src/libs6f/s6f_confdir_open.c b/src/libs6f/s6f_confdir_open.c
index 8e0838f..5958e46 100644
--- a/src/libs6f/s6f_confdir_open.c
+++ b/src/libs6f/s6f_confdir_open.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 
 #include <skalibs/stat.h>
+#include <skalibs/posixplz.h>
 #include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
@@ -22,7 +23,8 @@ int s6f_confdir_open (char const *s, int flagcreate)
       strerr_diefu3sys(111, "open ", s, " for reading") ;
     if (flagcreate)
     {
-      s6f_mkdirp(s, 02755) ;
+      if (mkdirp(s, 02755) == -1)
+        strerr_diefu2sys(111, "mkdirp ", s) ;
       fd = open_read(s) ;
       if (fd == -1)
         strerr_diefu3sys(111, "open ", s, " for reading") ;
diff --git a/src/libs6f/s6f_mkdirp.c b/src/libs6f/s6f_mkdirp.c
deleted file mode 100644
index e8b6be8..0000000
--- a/src/libs6f/s6f_mkdirp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ISC license. */
-
-#include <string.h>
-
-#include <skalibs/posixplz.h>
-#include <skalibs/strerr.h>
-
-#include "s6f.h"
-
-void s6f_mkdirp (char const *s, mode_t mode)
-{
-  size_t len = strlen(s) ;
-  char tmp[len + 1] ;
-  memcpy(tmp, s, len + 1) ;
-  if (mkdirp(tmp, mode) == -1)
-    strerr_diefu2sys(111, "mkdir ", tmp) ;
-}
-- 
cgit v1.3.1