diff options
| -rw-r--r-- | package/deps.mak | 5 | ||||
| -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 |
4 files changed, 5 insertions, 22 deletions
diff --git a/package/deps.mak b/package/deps.mak index 3b7c33c..3987345 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -9,7 +9,6 @@ src/alias/s6-frontend-alias.o src/alias/s6-frontend-alias.lo: src/alias/s6-front src/config/s6-frontend-config-preprocess.o src/config/s6-frontend-config-preprocess.lo: src/config/s6-frontend-config-preprocess.c src/libs6f/s6f_confdir_open.o src/libs6f/s6f_confdir_open.lo: src/libs6f/s6f_confdir_open.c src/include-local/s6f.h src/libs6f/s6f_lock.o src/libs6f/s6f_lock.lo: src/libs6f/s6f_lock.c src/include-local/s6f.h -src/libs6f/s6f_mkdirp.o src/libs6f/s6f_mkdirp.lo: src/libs6f/s6f_mkdirp.c src/include-local/s6f.h src/libs6f/s6f_report_state_change.o src/libs6f/s6f_report_state_change.lo: src/libs6f/s6f_report_state_change.c src/include-local/s6f.h src/libs6f/s6f_user_get_confdirs.o src/libs6f/s6f_user_get_confdirs.lo: src/libs6f/s6f_user_get_confdirs.c src/include-local/s6f.h src/s6/help.o src/s6/help.lo: src/s6/help.c src/s6/s6-internal.h @@ -33,9 +32,9 @@ s6-frontend-alias-sv: src/alias/s6-frontend-alias-sv.o -ls6 -lskarnet s6-frontend-config-preprocess: EXTRA_LIBS := s6-frontend-config-preprocess: src/config/s6-frontend-config-preprocess.o -lskarnet ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) -libs6f.a.xyzzy: src/libs6f/s6f_confdir_open.o src/libs6f/s6f_lock.o src/libs6f/s6f_mkdirp.o src/libs6f/s6f_report_state_change.o src/libs6f/s6f_user_get_confdirs.o ${LIBNSSS} +libs6f.a.xyzzy: src/libs6f/s6f_confdir_open.o src/libs6f/s6f_lock.o src/libs6f/s6f_report_state_change.o src/libs6f/s6f_user_get_confdirs.o ${LIBNSSS} else -libs6f.a.xyzzy:src/libs6f/s6f_confdir_open.lo src/libs6f/s6f_lock.lo src/libs6f/s6f_mkdirp.lo src/libs6f/s6f_report_state_change.lo src/libs6f/s6f_user_get_confdirs.lo ${LIBNSSS} +libs6f.a.xyzzy:src/libs6f/s6f_confdir_open.lo src/libs6f/s6f_lock.lo src/libs6f/s6f_report_state_change.lo src/libs6f/s6f_user_get_confdirs.lo ${LIBNSSS} endif s6: EXTRA_LIBS := s6: src/s6/s6.o src/s6/help.o src/s6/util.o src/s6/process.o src/s6/process_kill.o src/s6/process_restart.o src/s6/process_startstop.o src/s6/process_status.o src/s6/service.o src/s6/service_startstop.o src/s6/service_status.o libs6f.a.xyzzy -ls6rc -ls6 -lskarnet 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) ; -} |