From 40125363cc4a49866289feb1e1f33dc3523b3451 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 4 Nov 2026 10:17:11 +0000 Subject: Don't check for IOPAUSE_EXCEPT explicitly wherever possible --- src/conn-tools/s6-ioconnect.c | 6 +++--- src/conn-tools/s6-ipcserverd.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/conn-tools') diff --git a/src/conn-tools/s6-ioconnect.c b/src/conn-tools/s6-ioconnect.c index 0b78277..cb57e74 100644 --- a/src/conn-tools/s6-ioconnect.c +++ b/src/conn-tools/s6-ioconnect.c @@ -62,8 +62,8 @@ static void handle_signals (void) case 0 : return ; case SIGTERM : { - if (a[0][0].xindex < 5) x[a[0][0].xindex].revents |= IOPAUSE_EXCEPT ; - if (a[1][0].xindex < 5) x[a[1][0].xindex].revents |= IOPAUSE_EXCEPT ; + if (a[0][0].xindex < 5) x[a[0][0].xindex].revents |= POLLHUP ; + if (a[1][0].xindex < 5) x[a[1][0].xindex].revents |= POLLHUP ; break ; } default : @@ -203,7 +203,7 @@ int main (int argc, char const *const *argv) for (i = 0 ; i < 2 ; i++) if (a[i][0].xindex < 5) { - if (x[a[i][0].xindex].revents & (IOPAUSE_READ | IOPAUSE_EXCEPT)) + if (x[a[i][0].xindex].revents & IOPAUSE_READ) { if (!fillit(i)) { diff --git a/src/conn-tools/s6-ipcserverd.c b/src/conn-tools/s6-ipcserverd.c index 3190985..66d1fcd 100644 --- a/src/conn-tools/s6-ipcserverd.c +++ b/src/conn-tools/s6-ipcserverd.c @@ -287,7 +287,7 @@ static void new_connection (int s, char const *remotepath, char const *const *ar int main (int argc, char const *const *argv) { - iopause_fd x[2] = { { .events = IOPAUSE_READ }, { .fd = 0, .events = IOPAUSE_READ | IOPAUSE_EXCEPT } } ; + iopause_fd x[2] = { { .events = IOPAUSE_READ }, { .fd = 0, .events = IOPAUSE_READ } } ; PROG = "s6-ipcserverd" ; { subgetopt l = SUBGETOPT_ZERO ; @@ -365,17 +365,15 @@ int main (int argc, char const *const *argv) if (iopause_g(x, 1 + (numconn < maxconn), 0) < 0) strerr_diefu1sys(111, "iopause") ; - if (x[0].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with selfpipe") ; if (x[0].revents & IOPAUSE_READ) { handle_signals() ; continue ; } if (numconn < maxconn) { - if (x[1].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with socket") ; if (x[1].revents & IOPAUSE_READ) { int dummy ; char remotepath[IPCPATH_MAX+1] ; int sock = ipc_accept(x[1].fd, remotepath, IPCPATH_MAX+1, &dummy) ; - if (sock < 0) + if (sock == -1) { if (verbosity) strerr_warnwu1sys("accept") ; } -- cgit v1.3.1