From f703916c3702d8f32dc535161571874cb007ca6d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 14 Aug 2018 20:22:43 +0000 Subject: Remove s6-devd, s6-uevent-listener, s6-uevent-spawner, prepare for 2.5.0.0 --- NEWS | 5 +- doc/index.html | 5 +- doc/s6-devd.html | 80 ---------- doc/s6-uevent-listener.html | 117 --------------- doc/s6-uevent-spawner.html | 87 ----------- doc/upgrade.html | 5 +- package/deps.mak | 9 -- package/info | 2 +- package/modes | 3 - package/targets.mak | 3 - src/minutils/deps-exe/s6-devd | 1 - src/minutils/deps-exe/s6-uevent-listener | 2 - src/minutils/deps-exe/s6-uevent-spawner | 2 - src/minutils/s6-devd.c | 103 ------------- src/minutils/s6-uevent-listener.c | 168 --------------------- src/minutils/s6-uevent-spawner.c | 243 ------------------------------- 16 files changed, 9 insertions(+), 826 deletions(-) delete mode 100644 doc/s6-devd.html delete mode 100644 doc/s6-uevent-listener.html delete mode 100644 doc/s6-uevent-spawner.html delete mode 100644 src/minutils/deps-exe/s6-devd delete mode 100644 src/minutils/deps-exe/s6-uevent-listener delete mode 100644 src/minutils/deps-exe/s6-uevent-spawner delete mode 100644 src/minutils/s6-devd.c delete mode 100644 src/minutils/s6-uevent-listener.c delete mode 100644 src/minutils/s6-uevent-spawner.c diff --git a/NEWS b/NEWS index 8ba2725..6581540 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,10 @@ Changelog for s6-linux-utils. -In 2.4.0.3 +In 2.5.0.0 ---------- - - nsss support. + - Optional nsss support. + - s6-devd, s6-uevent-listener, s6-uevent-spawner removed. In 2.4.0.2 diff --git a/doc/index.html b/doc/index.html index 638b55e..98e43a5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -50,7 +50,7 @@ library.

The current released version of s6-linux-utils is -2.4.0.3.

Alternatively, you can checkout a copy of the s6-linux-utils git repository: @@ -88,9 +88,6 @@ the previous versions of s6-linux-utils and the current one.

The s6-chroot program
The s6-devd program
The s6-uevent-listener program (deprecated)
The s6-uevent-spawner program (deprecated)
The s6-fillurandompool program
The s6-freeramdisk program
The s6-hostname program

s6-linux-utils: the s6-devd program

-s6-linux-utils
-Software
-skarnet.org -

The `s6-devd` program

-s6-devd listens to the netlink interface for udev events, and -launches a helper program for every event, similarly to what the hotplug -interface does. -

Interface

-     s6-devd [ -q | -v ] [ -b kbufsz ] [ -l linevar ] [ -t l:t:k ] prog...
-

s6-devd rewrites its command line into -s6-uevent-listener | -s6-uevent-spawner prog..., -dispatching its options to the appropriate programs; then it execs into -this new command line. It does nothing else: it's just a wrapper.
The first executed program, -s6-uevent-listener, -will listen to the netlink and pass the events sequentially to -s6-uevent-spawner, which will -spawn a prog... helper for every event.

Options

-q : be more quiet.
-v : be more verbose.
-b kbufsz : try and reserve a kernel buffer of -kbufsz bytes for the netlink queue. Too large a buffer wastes kernel memory; -too small a buffer risks losing events. The default is 65536.
-l linevar : the short description of the -event, given by the kernel as the first string in the netlink message, -will be made available to prog under the environment variable -named linevar.
-t l:t:k : If l, t or k is -specified, they specify timeouts; by default, they are infinite. -If prog... is still alive after l milliseconds, s6-devd sends -it a SIGTERM. Then, if prog... is still alive after t more -milliseconds, s6-devd sends it a SIGKILL. Then, if prog... is still -alive after k more milliseconds, s6-devd yells and exits 99.

Notes

s6-devd is a daemon; it should be run under a proper supervision system such -as s6. The real long-lived -process is named s6-uevent-listener; -ir runs with the same pid as s6-devd.
The prog... helper, on the other hand, should be very short-lived, -even if you are not using the -t option to s6-devd. Since helpers are -spawned sequentially, slow helpers can make events queue up and fill buffers -along the way.

s6-linux-utils: the s6-uevent-listener program

-s6-linux-utils
-Software
-skarnet.org -

The `s6-uevent-listener` program

-s6-uevent-listener listens to the netlink interface for uevents -(also called "hotplug" or "udev" events), and writes those uevents to -its standard output, using a simple format. -

-This program is deprecated, and will disappear in a -near future version of s6-linux-utils. It has been replaced with the -mdevd-netlink -program, from the mdevd -package. -

Interface

-     s6-uevent-listener [ -v verbosity ] [ -b kbufsz ]
-

s6-uevent-listener binds to the netlink interface and listens for -hotplug events, as the udev program does.
It writes event information to its stdout. The output contains -null characters, so a terminal will not display them correctly. To -properly use s6-uevent-listener, it should be piped into a handler -program such as -s6-uevent-spawner. -or mdevd.
s6-uevent-listener is a long-lived program. -When it receives a SIGTERM, it stops listening; it will -exit as soon as it has flushed its event queue to stdout.

Options

-v verbosity : be more or less verbose. -Default verbosity is 1. 0 will only print fatal error messages, 3 will -print warnings every time the netlink interface sends something -unexpected.
-b kbufsz : try and reserve a kernel buffer of -kbufsz bytes for the netlink queue. Too large a buffer wastes kernel memory; -too small a buffer risks losing events. The default is 65536 (which is on -the large side).

Protocol

An event is a series of null-terminated strings as they are sent by -the kernel to the netlink; s6-uevent-listener adds a final empty string -(i.e. an additional null character) to mark the end of the series.
The first string is a short description of the event; it normally -contains the string "@/". Other strings after the first are of the form -"VARIABLE=value", and describe the environment which a hotplug helper -for the event (registered in /proc/sys/kernel/hotplug) would be -spawned with.

Example (newlines added for clarity):

-add@/class/input/input9/mouse2\0
-ACTION=add\0
-DEVPATH=/class/input/input9/mouse2\0
-SUBSYSTEM=input\0
-SEQNUM=106\0
-PHYSDEVPATH=/devices/pci0000:00/0000:00:1d.1/usb2/22/22:1.0
-PHYSDEVBUS=usb\0
-PHYSDEVDRIVER=usbhid\0
-MAJOR=13\0
-MINOR=34\0
-\0

Notes

s6-uevent-listener is a daemon; it should be run under a proper supervision system such -as s6.
If you are running s6-uevent-listener, prog... should be the -only program handling uevents, which means that -/proc/sys/kernel/hotplug should be empty.
Examples of valid uses of s6-uevent-listener: -
- s6-uevent-listener | s6-uevent-spawner mdev
- s6-uevent-listener | mdevd
- Those examples can be made safer by using a supervision system: -under s6 or -s6-rc, write a service -pipeline where s6-uevent-listener is a producer and -s6-uevent-spawner mdev or mdevd is a consumer. This -setup has the advantage, among others, that you can restart the netlink -listener and the event handler separately.
-

s6-linux-utils: the s6-uevent-spawner program

-s6-linux-utils
-Software
-skarnet.org -

The `s6-uevent-spawner` program

-s6-uevent-spawner listens to its standard input for -netlink-style events, and launches a helper program for every event, -similarly to what the hotplug interface does. -

- It is meant to be used together with -s6-uevent-listener. -

-This program is deprecated, and will disappear in a -future version of s6-linux-utils. The -mdevd package makes it -obsolete. -

Interface

-     s6-uevent-spawner [ -v verbosity ] [ -l linevar ] [ -t l:t:k ] prog...
-

s6-uevent-spawner listens to its stdin for a series of strings -representing kernel uevents, as formatted by -s6-uevent-listener.
For every event it reads, it spawns prog... with -the event variables added to the environment, just as if prog... -had been registered in /proc/sys/kernel/hotplug. However, -it reads the events sequentially, and waits for a prog instance -to finish before spawning another one.
When s6-uevent-spawner receives EOF: if an instance of -prog is alive, it first waits for it to die. Then it exits -0.

Options

-v verbosity : be more or less verbose. -Default verbosity is 1. 0 only prints fatal error messages. 3 is too much.
-l linevar : make the event description -(i.e. the first string in the netlink message announcing the event) -available in prog under the environment variable linevar. -By default, this first string is ignored - it is not needed, all the -event information is already in the other variables.
-t l:t:k : If l, t or k is -specified, they specify timeouts; by default, they are infinite. -If prog... is still alive after l milliseconds, s6-devd sends -it a SIGTERM. Then, if prog... is still alive after t more -milliseconds, s6-devd sends it a SIGKILL. Then, if prog... is still -alive after k more milliseconds, s6-uevent-spawner yells and exits 99.

Notes

The prog... helper should be very short-lived, -even if you are not using the -t option. Since helpers are -spawned sequentially, slow helpers can make events queue up and fill up -buffers.

What has changed in s6-linux-utils

in 2.4.0.3

in 2.5.0.0

skalibs dependency bumped to 2.7.0.0.
Optional nsss support added.
s6-devd, s6-uevent-listener and s6-uevent-spawner +have been removed: mdevd obsoletes +them.

in 2.4.0.2

-#include -#include -#include -#include -#include - -#define USAGE "s6-devd [ -q | -v ] [ -b kbufsz ] [ -l linevar ] [ -t maxlife:maxterm:maxkill ] helperprogram..." -#define dieusage() strerr_dieusage(100, USAGE) - -static inline int check_targ (char const *s) -{ - size_t pos = 0 ; - unsigned int t = 0 ; - pos += uint_scan(s + pos, &t) ; - if (s[pos] && s[pos++] != ':') return 0 ; - if (!t) return 1 ; - pos += uint_scan(s + pos, &t) ; - if (s[pos] && s[pos++] != ':') return 0 ; - if (!t) return 1 ; - pos += uint_scan(s + pos, &t) ; - if (s[pos]) return 0 ; - return 1 ; -} - -int main (int argc, char const *const *argv, char const *const *envp) -{ - unsigned int kbufsz = 65536, verbosity = 1 ; - char const *linevar = 0 ; - char const *targ = 0 ; - char fmtv[UINT_FMT] ; - PROG = "s6-devd" ; - { - subgetopt_t l = SUBGETOPT_ZERO ; - for (;;) - { - int opt = subgetopt_r(argc, argv, "qvb:l:t:", &l) ; - if (opt == -1) break ; - switch (opt) - { - case 'q' : if (verbosity) verbosity-- ; break ; - case 'v' : verbosity++ ; break ; - case 'b' : if (!uint0_scan(l.arg, &kbufsz)) dieusage() ; break ; - case 'l' : linevar = l.arg ; break ; - case 't' : if (!check_targ(l.arg)) dieusage() ; targ = l.arg ; break ; - default : dieusage() ; - } - } - argc -= l.ind ; argv += l.ind ; - } - if (!argc) strerr_dieusage(100, USAGE) ; - if (verbosity != 1) fmtv[uint_fmt(fmtv, verbosity)] = 0 ; - - { - unsigned int m = 0 ; - int fd ; - char const *cargv[argc + 9] ; - cargv[m++] = S6_LINUX_UTILS_BINPREFIX "s6-uevent-spawner" ; - if (verbosity != 1) - { - cargv[m++] = "-v" ; - cargv[m++] = fmtv ; - } - if (linevar) - { - cargv[m++] = "-l" ; - cargv[m++] = linevar ; - } - if (targ) - { - cargv[m++] = "-t" ; - cargv[m++] = targ ; - } - cargv[m++] = "--" ; - while (*argv) cargv[m++] = *argv++ ; - cargv[m++] = 0 ; - if (!child_spawn1_pipe(cargv[0], cargv, envp, &fd, 0)) - strerr_diefu2sys(111, "spawn ", cargv[0]) ; - if (fd_move(1, fd) < 0) strerr_diefu1sys(111, "fd_move") ; - } - - { - unsigned int m = 0 ; - char const *pargv[6] ; - char fmtk[UINT_FMT] ; - pargv[m++] = S6_LINUX_UTILS_BINPREFIX "s6-uevent-listener" ; - if (verbosity != 1) - { - pargv[m++] = "-v" ; - pargv[m++] = fmtv ; - } - if (kbufsz != 65536) - { - pargv[m++] = "-b" ; - pargv[m++] = fmtk ; - fmtk[uint_fmt(fmtk, kbufsz)] = 0 ; - } - pargv[m++] = 0 ; - xpathexec_run(pargv[0], pargv, envp) ; - } -} diff --git a/src/minutils/s6-uevent-listener.c b/src/minutils/s6-uevent-listener.c deleted file mode 100644 index 4175b54..0000000 --- a/src/minutils/s6-uevent-listener.c +++ /dev/null @@ -1,168 +0,0 @@ -/* ISC license. */ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define USAGE "s6-uevent-listener [ -v verbosity ] [ -b kbufsz ]" -#define dieusage() strerr_dieusage(100, USAGE) -#define dienomem() strerr_diefu1sys(111, "build string") ; - -#define MAXNLSIZE 4096 - -static unsigned int cont = 1, verbosity = 1 ; - -static inline ssize_t fd_recvmsg (int fd, struct msghdr *hdr) -{ - ssize_t r ; - do r = recvmsg(fd, hdr, MSG_DONTWAIT) ; - while ((r == -1) && (errno == EINTR)) ; - return r ; -} - -static inline int netlink_init_stdin (unsigned int kbufsz) -{ - struct sockaddr_nl nl = { .nl_family = AF_NETLINK, .nl_pad = 0, .nl_groups = 1, .nl_pid = 0 } ; - close(0) ; - return socket_internal(AF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT, DJBUNIX_FLAG_NB|DJBUNIX_FLAG_COE) == 0 - && bind(0, (struct sockaddr *)&nl, sizeof(struct sockaddr_nl)) == 0 - && setsockopt(0, SOL_SOCKET, SO_RCVBUFFORCE, &kbufsz, sizeof(unsigned int)) == 0 ; -} - -static inline void handle_signals (void) -{ - for (;;) - { - int c = selfpipe_read() ; - switch (c) - { - case -1 : strerr_diefu1sys(111, "selfpipe_read") ; - case 0 : return ; - case SIGTERM : - cont = 0 ; - fd_close(0) ; - break ; - default : - strerr_dief1x(101, "internal error: inconsistent signal state. Please submit a bug-report.") ; - } - } -} - -static inline void handle_stdout (void) -{ - if (!buffer_flush(buffer_1) && !error_isagain(errno)) - strerr_diefu1sys(111, "flush stdout") ; -} - -static inline void handle_netlink (void) -{ - struct sockaddr_nl nl; - struct iovec v[2] ; - struct msghdr msg = - { - .msg_name = &nl, - .msg_namelen = sizeof(struct sockaddr_nl), - .msg_iov = v, - .msg_iovlen = 2, - .msg_control = 0, - .msg_controllen = 0, - .msg_flags = 0 - } ; - ssize_t r ; - buffer_wpeek(buffer_1, v) ; - siovec_trunc(v, 2, siovec_len(v, 2) - 1) ; - r = sanitize_read(fd_recvmsg(0, &msg)) ; - if (r < 0) - { - if (errno == EPIPE) - { - if (verbosity >= 2) strerr_warnw1x("received EOF on netlink") ; - cont = 0 ; - fd_close(0) ; - return ; - } - else strerr_diefu1sys(111, "receive netlink message") ; - } - if (!r) return ; - if (msg.msg_flags & MSG_TRUNC) - strerr_diefu2x(111, "buffer too small for ", "netlink message") ; - if (nl.nl_pid) - { - if (verbosity >= 3) - { - char fmt[PID_FMT] ; - fmt[pid_fmt(fmt, nl.nl_pid)] = 0 ; - strerr_warnw3x("netlink message", " from userspace process ", fmt) ; - } - return ; - } - buffer_wseek(buffer_1, r) ; - buffer_putnoflush(buffer_1, "", 1) ; -} - - -int main (int argc, char const *const *argv, char const *const *envp) -{ - iopause_fd x[3] = { { .events = IOPAUSE_READ }, { .fd = 1 }, { .fd = 0 } } ; - PROG = "s6-uevent-listener" ; - strerr_warnw1x("this program is deprecated, see https://skarnet.org/software/mdevd/") ; - { - unsigned int kbufsz = 65536 ; - subgetopt_t l = SUBGETOPT_ZERO ; - for (;;) - { - int opt = subgetopt_r(argc, argv, "v:b:", &l) ; - if (opt == -1) break ; - switch (opt) - { - case 'v' : if (!uint0_scan(l.arg, &verbosity)) dieusage() ; break ; - case 'b' : if (!uint0_scan(l.arg, &kbufsz)) dieusage() ; break ; - default : dieusage() ; - } - } - argc -= l.ind ; argv += l.ind ; - if (!netlink_init_stdin(kbufsz)) strerr_diefu1sys(111, "init netlink") ; - } - - x[0].fd = selfpipe_init() ; - if (x[0].fd < 0) strerr_diefu1sys(111, "init selfpipe") ; - if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; - if (selfpipe_trap(SIGTERM) < 0) strerr_diefu1sys(111, "trap SIGTERM") ; - - if (verbosity >= 2) strerr_warni1x("starting") ; - - while (cont || buffer_len(buffer_1)) - { - int r ; - x[1].events = buffer_len(buffer_1) ? IOPAUSE_WRITE : 0 ; - x[2].events = buffer_available(buffer_1) >= MAXNLSIZE + 1 ? IOPAUSE_READ : 0 ; - r = iopause(x, 2 + cont, 0, 0) ; - if (r < 0) strerr_diefu1sys(111, "iopause") ; - if (!r) continue ; - if (x[1].revents & IOPAUSE_EXCEPT) break ; - if (x[1].revents & IOPAUSE_WRITE) handle_stdout() ; - if (x[0].revents & (IOPAUSE_READ | IOPAUSE_EXCEPT)) handle_signals() ; - if (cont && x[2].events & IOPAUSE_READ && x[2].revents & (IOPAUSE_READ | IOPAUSE_EXCEPT)) - handle_netlink() ; - } - if (verbosity >= 2) strerr_warni1x("exiting") ; - return 0 ; -} diff --git a/src/minutils/s6-uevent-spawner.c b/src/minutils/s6-uevent-spawner.c deleted file mode 100644 index 87dea11..0000000 --- a/src/minutils/s6-uevent-spawner.c +++ /dev/null @@ -1,243 +0,0 @@ -/* ISC license. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define USAGE "s6-uevent-spawner [ -v verbosity ] [ -l linevar ] [ -t maxlife:maxterm:maxkill ] helperprogram..." -#define dieusage() strerr_dieusage(100, USAGE) -#define dienomem() strerr_diefu1sys(111, "build string") ; - -static unsigned int cont = 1, state = 0, verbosity = 1 ; -static pid_t pid = 0 ; -static tain_t lifetto = TAIN_INFINITE_RELATIVE, - termtto = TAIN_INFINITE_RELATIVE, - killtto = TAIN_INFINITE_RELATIVE, - deadline ; - -static inline void on_death (void) -{ - pid = 0 ; - state = 0 ; - tain_add_g(&deadline, &tain_infinite_relative) ; -} - -static inline void on_event (char const *const *argv, char const *const *envp, char const *s, unsigned int len) -{ - posix_spawnattr_t attr ; - posix_spawn_file_actions_t actions ; - size_t envlen = env_len(envp) ; - size_t n = envlen + 1 + byte_count(s, len, '\0') ; - pid_t mypid ; - int e ; - char const *v[n] ; - if (!env_merge(v, n, envp, envlen, s, len)) - strerr_diefu1sys(111, "env_merge") ; - - e = posix_spawnattr_init(&attr) ; - if (e) { errno = e ; strerr_diefu1sys(111, "posix_spawnattr_init") ; } - { - sigset_t set ; - sigemptyset(&set) ; - e = posix_spawnattr_setsigmask(&attr, &set) ; - if (e) { errno = e ; strerr_diefu1sys(111, "posix_spawnattr_setsigmask") ; } - sigfillset(&set) ; - e = posix_spawnattr_setsigdefault(&attr, &set) ; - if (e) { errno = e ; strerr_diefu1sys(111, "posix_spawnattr_setsigdefault") ; } - } - e = posix_spawn_file_actions_init(&actions) ; - if (e) { errno = e ; strerr_diefu1sys(111, "posix_spawn_file_actions_init") ; } - e = posix_spawn_file_actions_addopen(&actions, 0, "/dev/null", O_RDONLY, S_IRUSR) ; - if (e) { errno = e ; strerr_diefu1sys(111, "posix_spawn_file_actions_addopen") ; } - e = posix_spawnp(&mypid, argv[0], &actions, &attr, (char *const *)argv, (char * const *)v) ; - if (e) { errno = e ; strerr_diefu2sys(111, "spawn ", argv[0]) ; } - posix_spawn_file_actions_destroy(&actions) ; - posix_spawnattr_destroy(&attr) ; - state = 1 ; - pid = mypid ; - tain_add_g(&deadline, &lifetto) ; -} - -static inline void handle_timeout (void) -{ - switch (state) - { - case 0 : - tain_add_g(&deadline, &tain_infinite_relative) ; - break ; - case 1 : - kill(pid, SIGTERM) ; - tain_add_g(&deadline, &termtto) ; - state++ ; - break ; - case 2 : - kill(pid, SIGKILL) ; - tain_add_g(&deadline, &killtto) ; - state++ ; - break ; - case 3 : - strerr_dief1x(99, "child resisted SIGKILL - check your kernel logs.") ; - default : - strerr_dief1x(101, "internal error: inconsistent state. Please submit a bug-report.") ; - } -} - -static inline void handle_signals (void) -{ - for (;;) - { - int c = selfpipe_read() ; - switch (c) - { - case -1 : strerr_diefu1sys(111, "selfpipe_read") ; - case 0 : return ; - case SIGCHLD : - if (!pid) wait_reap() ; - else - { - int wstat ; - int r = wait_pid_nohang(pid, &wstat) ; - if (r < 0) - if (errno != ECHILD) strerr_diefu1sys(111, "wait_pid_nohang") ; - else break ; - else if (!r) break ; - on_death() ; - } - break ; - default : - strerr_dief1x(101, "internal error: inconsistent signal handling. Please submit a bug-report.") ; - } - } -} - -static inline void handle_stdin (stralloc *sa, char const *linevar, char const *const *argv, char const *const *envp) -{ - while (!pid) - { - size_t start ; - ssize_t r ; - if (!sa->len && linevar) - if (!stralloc_cats(sa, linevar) || !stralloc_catb(sa, "=", 1)) - dienomem() ; - start = sa->len ; - r = sanitize_read(skagetln(buffer_0, sa, 0)) ; - if (r < 0) - { - cont = 0 ; - if (errno != EPIPE && verbosity) strerr_warnwu1sys("read from stdin") ; - } - if (r <= 0) break ; - if (sa->len == start + 1) - { - start = linevar ? 0 : strlen(sa->s) + 1 ; - if (start >= sa->len) - { - if (verbosity) strerr_warnw1x("read an empty event!") ; - } - else on_event(argv, envp, sa->s + start, sa->len - 1 - start) ; - sa->len = 0 ; - } - } -} - -static inline int make_ttos (char const *s) -{ - size_t pos = 0 ; - unsigned int tlife = 0, tterm = 0, tkill = 0 ; - pos += uint_scan(s + pos, &tlife) ; - if (s[pos] && s[pos++] != ':') return 0 ; - if (!tlife) return 1 ; - tain_from_millisecs(&lifetto, tlife) ; - pos += uint_scan(s + pos, &tterm) ; - if (s[pos] && s[pos++] != ':') return 0 ; - if (!tterm) return 1 ; - tain_from_millisecs(&termtto, tterm) ; - tain_add(&termtto, &termtto, &lifetto) ; - pos += uint_scan(s + pos, &tkill) ; - if (s[pos]) return 0 ; - if (!tkill) return 1 ; - tain_from_millisecs(&killtto, tkill) ; - tain_add(&killtto, &killtto, &termtto) ; - return 1 ; -} - -int main (int argc, char const *const *argv, char const *const *envp) -{ - iopause_fd x[2] = { { .events = IOPAUSE_READ }, { .fd = 0, .events = IOPAUSE_READ } } ; - char const *linevar = 0 ; - stralloc sa = STRALLOC_ZERO ; - PROG = "s6-uevent-spawner" ; - strerr_warnw1x("this program is deprecated, see https://skarnet.org/software/mdevd/") ; - { - subgetopt_t l = SUBGETOPT_ZERO ; - for (;;) - { - int opt = subgetopt_r(argc, argv, "l:v:t:", &l) ; - if (opt == -1) break ; - switch (opt) - { - case 'l' : linevar = l.arg ; break ; - case 'v' : if (!uint0_scan(l.arg, &verbosity)) dieusage() ; break ; - case 't' : if (!make_ttos(l.arg)) dieusage() ; break ; - default : dieusage() ; - } - } - argc -= l.ind ; argv += l.ind ; - if (!argc) strerr_dieusage(100, USAGE) ; - } - if (linevar && strchr(linevar, '=')) - strerr_dief2x(100, "invalid variable: ", linevar) ; - - if (ndelay_on(0) < 0) strerr_diefu1sys(111, "set stdin nonblocking") ; - x[0].fd = selfpipe_init() ; - if (x[0].fd == -1) strerr_diefu1sys(111, "init selfpipe") ; - if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; - if (selfpipe_trap(SIGCHLD) < 0) strerr_diefu1sys(111, "trap SIGCHLD") ; - if (setenv("PATH", SKALIBS_DEFAULTPATH, 0) < 0) - strerr_diefu1sys(111, "setenv PATH") ; - - tain_now_g() ; - tain_add_g(&deadline, &tain_infinite_relative) ; - if (verbosity >= 2) strerr_warni1x("starting") ; - - while (cont || pid) - { - int r ; - if (buffer_len(buffer_0)) - handle_stdin(&sa, linevar, argv, envp) ; - r = iopause_g(x, 1 + (!pid && cont), &deadline) ; - if (r < 0) strerr_diefu1sys(111, "iopause") ; - else if (!r) handle_timeout() ; - else - { - if (x[0].revents & IOPAUSE_EXCEPT) - strerr_diefu1x(111, "iopause: trouble with selfpipe") ; - if (x[0].revents & IOPAUSE_READ) - handle_signals() ; - else if (cont && !pid && x[1].revents & IOPAUSE_READ) - handle_stdin(&sa, linevar, argv, envp) ; - } - } - if (verbosity >= 2) strerr_warni1x("exiting") ; - return 0 ; -} -- cgit v1.3.1

The s6-devd program

Interface

Options

Notes

The s6-uevent-listener program

Interface

Options

Protocol

Notes

The s6-uevent-spawner program

Interface

Options

Notes

What has changed in s6-linux-utils

in 2.4.0.3

in 2.5.0.0

in 2.4.0.2

The `s6-devd` program

The `s6-uevent-listener` program

The `s6-uevent-spawner` program