From e623c66155e34c74796bc01c111027d00d2fc77c Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 4 Aug 2025 17:17:09 +0000 Subject: Refactor to add listalldeps Signed-off-by: Laurent Bercot --- src/include/s6-rc/repo.h | 5 +- src/libs6rc/deps-lib/s6rc | 2 + src/libs6rc/s6rc_repo_set_listalldeps.c | 8 +++ src/libs6rc/s6rc_repo_set_listdeps.c | 73 +------------------------ src/libs6rc/s6rc_repo_set_listdeps_internal.c | 77 +++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 72 deletions(-) create mode 100644 src/libs6rc/s6rc_repo_set_listalldeps.c create mode 100644 src/libs6rc/s6rc_repo_set_listdeps_internal.c (limited to 'src') diff --git a/src/include/s6-rc/repo.h b/src/include/s6-rc/repo.h index 1a47146..a260a91 100644 --- a/src/include/s6-rc/repo.h +++ b/src/include/s6-rc/repo.h @@ -15,6 +15,9 @@ extern int s6rc_repo_lock (char const *, int) ; #define S6RC_REPO_SET_COMPILE_BUFLEN(repolen, setlen) ((repolen) + (setlen) + 45) extern int s6rc_repo_set_compile (char const *, char const *, char const *const *, size_t, char *, unsigned int, char const *) ; -extern int s6rc_repo_set_listdeps (char const *, char const *, uint32_t, stralloc *, genalloc *) ; + +extern int s6rc_repo_set_listdeps (char const *, char const *, stralloc *, genalloc *, int) ; +extern int s6rc_repo_set_listalldeps (char const *, char const *const *, size_t, stralloc *, genalloc *, int) ; +extern int s6rc_repo_set_listdeps_internal (char const *, char const *const *, size_t, stralloc *, genalloc *, uint32_t) ; #endif diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc index f56fd56..1d88c4c 100644 --- a/src/libs6rc/deps-lib/s6rc +++ b/src/libs6rc/deps-lib/s6rc @@ -17,7 +17,9 @@ s6rc_read_uint.o s6rc_repo_cleanup.o s6rc_repo_lock.o s6rc_repo_set_compile.o +s6rc_repo_set_listalldeps.o s6rc_repo_set_listdeps.o +s6rc_repo_set_listdeps_internal.o s6rc_repo_sync.o s6rc_sanitize_dir.o s6rc_servicedir_internal.o diff --git a/src/libs6rc/s6rc_repo_set_listalldeps.c b/src/libs6rc/s6rc_repo_set_listalldeps.c new file mode 100644 index 0000000..c5b14cc --- /dev/null +++ b/src/libs6rc/s6rc_repo_set_listalldeps.c @@ -0,0 +1,8 @@ +/* ISC license. */ + +#include + +int s6rc_repo_set_listalldeps (char const *repo, char const *const *services, size_t n, stralloc *storage, genalloc *indices, int up) +{ + return s6rc_repo_set_listdeps_internal(repo, services, n, storage, indices, 2 | !!up) ; +} diff --git a/src/libs6rc/s6rc_repo_set_listdeps.c b/src/libs6rc/s6rc_repo_set_listdeps.c index 9a98d5f..8442291 100644 --- a/src/libs6rc/s6rc_repo_set_listdeps.c +++ b/src/libs6rc/s6rc_repo_set_listdeps.c @@ -1,77 +1,8 @@ /* ISC license. */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include #include -int s6rc_repo_set_listdeps (char const *repo, char const *service, uint32_t options, stralloc *storage, genalloc *indices) +int s6rc_repo_set_listdeps (char const *repo, char const *service, stralloc *storage, genalloc *indices, int up) { - int swasnull = !storage->s ; - int gwasnull = !indices->s ; - size_t sstart = storage->len ; - - { - size_t m = 0 ; - size_t repolen = strlen(repo) ; - char const *argv[9] ; - pid_t pid ; - int fd ; - int wstat ; - char refdb[repolen + 22] ; - memcpy(refdb, repo, repolen) ; - memcpy(refdb + repolen, "/compiled/.everything", 22) ; - argv[m++] = S6RC_BINPREFIX "s6-rc-db" ; - argv[m++] = "-c"; - argv[m++] = refdb ; - argv[m++] = "-b" ; - argv[m++] = options & 1 ? "-u" : "-d" ; - argv[m++] = "--" ; - argv[m++] = "dependencies" ; - argv[m++] = service ; - argv[m++] = 0 ; - pid = child_spawn1_pipe(argv[0], argv, (char const *const *)environ, &fd, 1) ; - if (!pid) { strerr_warnfu2sys("spawn ", argv[0]) ; return -1 ; } - if (!slurpn(fd, storage, 0)) { strerr_warnfu2sys("read output from ", argv[0]) ; return -1 ; } - fd_close(fd) ; - if (wait_pid(pid, &wstat) == -1) - { - strerr_warnfu2sys("wait for ", argv[0]) ; - return -1 ; - } - if (WIFSIGNALED(wstat)) - { - char fmt[UINT_FMT] ; - fmt[uint_fmt(fmt, WTERMSIG(wstat))] = 0 ; - strerr_warnf3x(argv[0], " crashed with signal ", fmt) ; - return -1 ; - } - if (WEXITSTATUS(wstat)) - { - char fmt[UINT_FMT] ; - fmt[uint_fmt(fmt, WEXITSTATUS(wstat))] = 0 ; - strerr_warnf3x(argv[0], " exited with code ", fmt) ; - return (WEXITSTATUS(wstat) < 99) - 1 ; - } - } - - if (!s6rc_nlto0(storage->s + sstart, sstart, storage->len, indices)) goto err ; - return 1 ; - - err: - if (gwasnull) genalloc_free(size_t, indices) ; - if (swasnull) stralloc_free(storage) ; - return -1 ; + return s6rc_repo_set_listdeps_internal(repo, &service, 1, storage, indices, !!up) ; } diff --git a/src/libs6rc/s6rc_repo_set_listdeps_internal.c b/src/libs6rc/s6rc_repo_set_listdeps_internal.c new file mode 100644 index 0000000..9ca38e1 --- /dev/null +++ b/src/libs6rc/s6rc_repo_set_listdeps_internal.c @@ -0,0 +1,77 @@ +/* ISC license. */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +int s6rc_repo_set_listdeps_internal (char const *repo, char const *const *services, size_t n, stralloc *storage, genalloc *indices, uint32_t options) +{ + int swasnull = !storage->s ; + int gwasnull = !indices->s ; + size_t sstart = storage->len ; + + { + size_t m = 0 ; + size_t repolen = strlen(repo) ; + pid_t pid ; + int fd ; + int wstat ; + char const *argv[8 + n] ; + char refdb[repolen + 22] ; + memcpy(refdb, repo, repolen) ; + memcpy(refdb + repolen, "/compiled/.everything", 22) ; + argv[m++] = S6RC_BINPREFIX "s6-rc-db" ; + argv[m++] = "-c"; + argv[m++] = refdb ; + argv[m++] = "-b" ; + argv[m++] = options & 1 ? "-u" : "-d" ; + argv[m++] = "--" ; + argv[m++] = options & 2 ? "all-dependencies" : "dependencies" ; + for (size_t i = 0 ; i < n ; i++) argv[m++] = services[i] ; + argv[m++] = 0 ; + pid = child_spawn1_pipe(argv[0], argv, (char const *const *)environ, &fd, 1) ; + if (!pid) { strerr_warnfu2sys("spawn ", argv[0]) ; return -1 ; } + if (!slurpn(fd, storage, 0)) { strerr_warnfu2sys("read output from ", argv[0]) ; return -1 ; } + fd_close(fd) ; + if (wait_pid(pid, &wstat) == -1) + { + strerr_warnfu2sys("wait for ", argv[0]) ; + return -1 ; + } + if (WIFSIGNALED(wstat)) + { + char fmt[UINT_FMT] ; + fmt[uint_fmt(fmt, WTERMSIG(wstat))] = 0 ; + strerr_warnf3x(argv[0], " crashed with signal ", fmt) ; + return -1 ; + } + if (WEXITSTATUS(wstat)) + { + char fmt[UINT_FMT] ; + fmt[uint_fmt(fmt, WEXITSTATUS(wstat))] = 0 ; + strerr_warnf3x(argv[0], " exited with code ", fmt) ; + return (WEXITSTATUS(wstat) < 99) - 1 ; + } + } + + if (!s6rc_nlto0(storage->s + sstart, sstart, storage->len, indices)) goto err ; + return 1 ; + + err: + if (gwasnull) genalloc_free(size_t, indices) ; + if (swasnull) stralloc_free(storage) ; + return -1 ; +} -- cgit v1.3.1