diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/s6/s6.h | 1 | ||||
-rw-r--r-- | src/include/s6/ucspiserver.h | 10 | ||||
-rw-r--r-- | src/libs6/deps-lib/s6 | 1 | ||||
-rw-r--r-- | src/libs6/s6_ucspiserver_spawn.c | 18 |
4 files changed, 0 insertions, 30 deletions
diff --git a/src/include/s6/s6.h b/src/include/s6/s6.h index 31b8e00..ef521bb 100644 --- a/src/include/s6/s6.h +++ b/src/include/s6/s6.h @@ -10,6 +10,5 @@ #include <s6/accessrules.h> #include <s6/lock.h> #include <s6/auto.h> -#include <s6/ucspiserver.h> #endif diff --git a/src/include/s6/ucspiserver.h b/src/include/s6/ucspiserver.h deleted file mode 100644 index 7ae03c2..0000000 --- a/src/include/s6/ucspiserver.h +++ /dev/null @@ -1,10 +0,0 @@ -/* ISC license. */ - -#ifndef S6_SERVER_H -#define S6_SERVER_H - -#include <sys/types.h> - -extern pid_t s6_ucspiserver_spawn (int, char const *const *, char const *const *, size_t, char const *, size_t, size_t) ; - -#endif diff --git a/src/libs6/deps-lib/s6 b/src/libs6/deps-lib/s6 index 59999be..9b1d285 100644 --- a/src/libs6/deps-lib/s6 +++ b/src/libs6/deps-lib/s6 @@ -60,5 +60,4 @@ s6_supervise_link.o s6_supervise_link_names.o s6_supervise_unlink.o s6_supervise_unlink_names.o -s6_ucspiserver_spawn.o -lskarnet diff --git a/src/libs6/s6_ucspiserver_spawn.c b/src/libs6/s6_ucspiserver_spawn.c deleted file mode 100644 index 23f102d..0000000 --- a/src/libs6/s6_ucspiserver_spawn.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ISC license. */ - -#include <skalibs/env.h> -#include <skalibs/cspawn.h> - -#include <s6/ucspiserver.h> - -pid_t s6_ucspiserver_spawn (int fd, char const *const *argv, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen, size_t modifn) -{ - cspawn_fileaction fa[2] = - { - [0] = { .type = CSPAWN_FA_MOVE, .x = { .fd2 = { [0] = 0, [1] = fd } } }, - [1] = { .type = CSPAWN_FA_COPY, .x = { .fd2 = { [0] = 1, [1] = 0 } } } - } ; - char const *newenvp[envlen + modifn + 1] ; - env_mergen(newenvp, envlen + modifn + 1, envp, envlen, modifs, modiflen, modifn) ; - return cspawn(argv[0], argv, newenvp, CSPAWN_FLAGS_SELFPIPE_FINISH, fa, 2) ; -} |