diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-30 23:21:29 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-30 23:21:29 +0000 |
| commit | 88bdac87d8a571a3a1ccffa2c1d8c4549a5bb0e9 (patch) | |
| tree | 3d8ea90eebbbb23c792b042d9a71392a31f521da /src/libs6f | |
| parent | b4124b4fd1b7800ef8da2bdee062d6756a3c14bb (diff) | |
| download | s6-frontend-88bdac87d8a571a3a1ccffa2c1d8c4549a5bb0e9.tar.gz | |
Adapt to mkdirp
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libs6f')
| -rw-r--r-- | src/libs6f/deps-lib/s6f | 1 | ||||
| -rw-r--r-- | src/libs6f/s6f_confdir_open.c | 4 | ||||
| -rw-r--r-- | src/libs6f/s6f_mkdirp.c | 17 |
3 files changed, 3 insertions, 19 deletions
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) ; -} |