diff options
Diffstat (limited to 'src/repo')
| -rw-r--r-- | src/repo/deps-exe/s6-rc-set-status (renamed from src/repo/deps-exe/s6-rc-set-list) | 0 | ||||
| -rw-r--r-- | src/repo/s6-rc-set-change.c | 9 | ||||
| -rw-r--r-- | src/repo/s6-rc-set-list.c | 86 | ||||
| -rw-r--r-- | src/repo/s6-rc-set-status.c | 118 |
4 files changed, 126 insertions, 87 deletions
diff --git a/src/repo/deps-exe/s6-rc-set-list b/src/repo/deps-exe/s6-rc-set-status index 9fe69bb..9fe69bb 100644 --- a/src/repo/deps-exe/s6-rc-set-list +++ b/src/repo/deps-exe/s6-rc-set-status diff --git a/src/repo/s6-rc-set-change.c b/src/repo/s6-rc-set-change.c index 1ab92f6..c678357 100644 --- a/src/repo/s6-rc-set-change.c +++ b/src/repo/s6-rc-set-change.c @@ -129,9 +129,16 @@ int main (int argc, char const *const *argv) if (newsub->sub == 3 && !(wgolb & GOLB_FORCE_ESSENTIAL)) strerr_diefu1x(10, " artificially mark a service as essential without --force-essential") ; + for (unsigned int i = 2 ; i < argc ; i++) + { + if (argv[i][0] == '.') + strerr_dief2x(100, "service names cannot ", "start with a dot") ; + if (strchr(argv[i], '/') || strchr(argv[i], '\n')) + strerr_dief2x(100, "service names cannot ", "contain / or newlines") ; + } + fdlock = s6rc_repo_lock(wgola[GOLA_REPODIR], 1) ; if (fdlock == -1) strerr_diefu2sys(111, "lock ", wgola[GOLA_REPODIR]) ; - if (!s6rc_repo_makesvlist_byname(wgola[GOLA_REPODIR], argv[0], &storage, &svlist)) _exit(111) ; list = genalloc_s(s6rc_repo_sv, &svlist) ; listn = genalloc_len(s6rc_repo_sv, &svlist) ; diff --git a/src/repo/s6-rc-set-list.c b/src/repo/s6-rc-set-list.c deleted file mode 100644 index 84ef3bb..0000000 --- a/src/repo/s6-rc-set-list.c +++ /dev/null @@ -1,86 +0,0 @@ -/* ISC license. */ - -#include <skalibs/nonposix.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> - -#include <skalibs/envexec.h> -#include <skalibs/direntry.h> -#include <skalibs/buffer.h> - -#include <s6-rc/config.h> -#include <s6-rc/repo.h> - -#define USAGE "s6-rc-set-list [ -v verbosity ] [ -r repo ] set" -#define dieusage() strerr_dieusage(100, USAGE) - -enum gola_e -{ - GOLA_VERBOSITY, - GOLA_REPODIR, - GOLA_N -} ; - -int main (int argc, char const *const *argv) -{ - static gol_arg const rgola[] = - { - { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY }, - { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR } - } ; - int fdlock ; - unsigned int verbosity = 1 ; - char const *wgola[GOLA_N] = { 0 } ; - unsigned int golc ; - int e ; - uint8_t sub = 4 ; - - PROG = "s6-rc-set-list" ; - wgola[GOLA_REPODIR] = S6RC_REPODIR ; - - golc = gol_main(argc, argv, 0, 0, rgola, GOLA_N, 0, wgola) ; - argc -= golc ; argv += golc ; - if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity)) - strerr_dief1x(100, "verbosity needs to be an unsigned integer") ; - if (!argc) dieusage() ; - if (strchr(argv[0], '/') || strchr(argv[0], '\n')) - strerr_dief1x(100, "set names cannot contain / or newlines") ; - - fdlock = s6rc_repo_lock(wgola[GOLA_REPODIR], 1) ; - if (fdlock == -1) strerr_diefu2sys(111, "lock ", wgola[GOLA_REPODIR]) ; - - e = s6rc_repo_checkset(wgola[GOLA_REPODIR], argv[0]) ; - if (e) _exit(e) ; - - size_t repolen = strlen(wgola[GOLA_REPODIR]) ; - size_t setlen = strlen(argv[0]) ; - char fn[repolen + setlen + 17] ; - memcpy(fn, wgola[GOLA_REPODIR], repolen) ; - memcpy(fn + repolen, "/sources/", 9) ; - memcpy(fn + repolen + 9, argv[0], setlen) ; - fn[repolen + 9 + setlen] = '/' ; - while (sub--) - { - memcpy(fn + repolen + 10 + setlen, s6rc_repo_subnames[sub], 7) ; - DIR *dir = opendir(fn) ; - if (!dir) strerr_diefu2sys(111, "opendir ", fn) ; - for (;;) - { - direntry *d ; - errno = 0 ; - d = readdir(dir) ; - if (!d) break ; - if (d->d_name[0] == '.') continue ; - if (buffer_puts(buffer_1, d->d_name) < 0 - || buffer_put(buffer_1, "/", 1) < 0 - || buffer_put(buffer_1, s6rc_repo_subnames[sub], 6) < 0 - || buffer_put(buffer_1, "\n", 1) < 0) - strerr_diefu1sys(111, "write to stdout") ; - } - if (errno) strerr_diefu2sys(111, "readdir ", fn) ; - dir_close(dir) ; - } - if (!buffer_flush(buffer_1)) strerr_diefu1sys(111, "write to stdout") ; - _exit(0) ; -} diff --git a/src/repo/s6-rc-set-status.c b/src/repo/s6-rc-set-status.c new file mode 100644 index 0000000..b58811b --- /dev/null +++ b/src/repo/s6-rc-set-status.c @@ -0,0 +1,118 @@ +/* ISC license. */ + +#include <skalibs/nonposix.h> +#include <string.h> +#include <unistd.h> +#include <stdlib.h> +#include <errno.h> + +#include <skalibs/uint64.h> +#include <skalibs/envexec.h> +#include <skalibs/bytestr.h> +#include <skalibs/direntry.h> +#include <skalibs/buffer.h> + +#include <s6-rc/config.h> +#include <s6-rc/repo.h> + +#define USAGE "s6-rc-set-status [ -v verbosity ] [ -r repo ] [ -E | -e ] set services..." +#define dieusage() strerr_dieusage(100, USAGE) +#define dieout() strerr_diefu1sys(111, "write to stdout") + +enum golb_e +{ + GOLB_IGNORE_ESSENTIALS = 0x01, + GOLB_NOSUB = 0x02, +} ; + +enum gola_e +{ + GOLA_VERBOSITY, + GOLA_REPODIR, + GOLA_N +} ; + +int main (int argc, char const **argv) +{ + static gol_bool const rgolb[] = + { + { .so = 'E', .lo = "with-essentials", .clear = GOLB_IGNORE_ESSENTIALS, .set = 0 }, + { .so = 'e', .lo = "without-essentials", .clear = 0, .set = GOLB_IGNORE_ESSENTIALS }, + { .so = 'L', .lo = "list", .clear = 0, .set = GOLB_NOSUB }, + } ; + static gol_arg const rgola[] = + { + { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY }, + { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR } + } ; + int fdlock ; + unsigned int verbosity = 1 ; + uint64_t wgolb = 0 ; + char const *setname ; + char const *wgola[GOLA_N] = { 0 } ; + unsigned int golc ; + uint8_t sub ; + + PROG = "s6-rc-set-status" ; + wgola[GOLA_REPODIR] = S6RC_REPODIR ; + + golc = GOL_main(argc, argv, rgolb, rgola, &wgolb, wgola) ; + argc -= golc ; argv += golc ; + if (argc < 2) dieusage() ; + setname = *argv++ ; argc-- ; + if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity)) + strerr_dief1x(100, "verbosity needs to be an unsigned integer") ; + if (strchr(setname, '/') || strchr(setname, '\n')) + strerr_dief2x(100, "set", " names cannot contain / or newlines") ; + for (unsigned int i = 0 ; i < argc ; i++) + { + if (argv[i][0] == '.') + strerr_dief2x(100, "service", " names cannot start with a dot") ; + if (strchr(argv[i], '/') || strchr(argv[i], '\n')) + strerr_dief2x(100, "service", " names cannot contain / or newlines") ; + } + + fdlock = s6rc_repo_lock(wgola[GOLA_REPODIR], 1) ; + if (fdlock == -1) strerr_diefu2sys(111, "lock ", wgola[GOLA_REPODIR]) ; + + { + int e = s6rc_repo_checkset(wgola[GOLA_REPODIR], setname) ; + if (e) _exit(e) ; + } + + qsort(argv, argc, sizeof(char const *), &str_cmp) ; + + size_t repolen = strlen(wgola[GOLA_REPODIR]) ; + size_t setlen = strlen(setname) ; + char fn[repolen + setlen + 17] ; + memcpy(fn, wgola[GOLA_REPODIR], repolen) ; + memcpy(fn + repolen, "/sources/", 9) ; + memcpy(fn + repolen + 9, setname, setlen) ; + fn[repolen + 9 + setlen] = '/' ; + + sub = wgolb & GOLB_IGNORE_ESSENTIALS ? 3 : 4 ; + while (sub--) + { + memcpy(fn + repolen + 10 + setlen, s6rc_repo_subnames[sub], 7) ; + DIR *dir = opendir(fn) ; + if (!dir) strerr_diefu2sys(111, "opendir ", fn) ; + for (;;) + { + direntry *d ; + errno = 0 ; + d = readdir(dir) ; + if (!d) break ; + if (d->d_name[0] == '.') continue ; + if (argc && !bsearch(d->d_name, argv, argc, sizeof(char const *), &str_bcmp)) continue ; + if (buffer_puts(buffer_1, d->d_name) < 0) dieout() ; + if (!(wgolb & GOLB_NOSUB)) + if (buffer_put(buffer_1, "/", 1) < 0 + || buffer_put(buffer_1, s6rc_repo_subnames[sub], 6) < 0) dieout() ; + if (buffer_put(buffer_1, "\n", 1) < 0) dieout() ; + } + if (errno) strerr_diefu2sys(111, "readdir ", fn) ; + dir_close(dir) ; + } + if (!buffer_flush(buffer_1)) strerr_diefu1sys(111, "write to stdout") ; + _exit(0) ; +} |