diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-10-22 20:39:32 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2025-10-22 20:39:32 +0000 |
| commit | 333aff84b2ca4c5cf062fcaf5b5097d2acdc8929 (patch) | |
| tree | 57dea67df60096b4db89c2fdc99af4f0b96dceb3 | |
| parent | 01eee6010e2e6a5a7918ab62b4e8dcb1d82e3fff (diff) | |
| download | s6-333aff84b2ca4c5cf062fcaf5b5097d2acdc8929.tar.gz | |
More keventbridge fixes
| -rw-r--r-- | src/supervision/s6-background-watch.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/supervision/s6-background-watch.c b/src/supervision/s6-background-watch.c index 7f0c923..8a69699 100644 --- a/src/supervision/s6-background-watch.c +++ b/src/supervision/s6-background-watch.c @@ -208,14 +208,12 @@ int main (int argc, char const *const *argv) #if NEEDS_KEVENT keventbridge kb = KEVENTBRIDGE_ZERO ; + struct kevent ke ; x[1].events = IOPAUSE_READ ; x[1].fd = keventbridge_start(&kb) ; if (x[1].fd == -1) strerr_diefu1sys(111, "keventbridge_start") ; - { - struct kevent ke ; - EV_SET(&ke, pid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, 0, 0) ; - if (keventbridge_write(&kb, &ke, 1) == -1) strerr_diefu1sys(111, "keventbridge_write") ; - } + EV_SET(&ke, pid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, 0, 0) ; + if (keventbridge_write(&kb, &ke, 1) == -1) strerr_diefu1sys(111, "keventbridge_write") ; #endif if (notif) @@ -236,7 +234,6 @@ int main (int argc, char const *const *argv) #if NEEDS_KEVENT else if (x[1].revents & IOPAUSE_READ) { - struct kevent ke ; int r = keventbridge_read(&kb, &ke) ; if (r == -1) strerr_diefu1sys(111, "keventbridge_read") ; else if (r && (pid_t)ke.ident == pid && ke.filter == EVFILT_PROC && ke.fflags & NOTE_EXIT) |