diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2008-10-01 20:32:45 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2008-10-01 20:32:45 +0000 |
| commit | 8c85c558ca4943b0654bce019b4aec72cd391d73 (patch) | |
| tree | 33cf9fa3f74a832a88acdb7f590fa8aa6f4bd628 /libexec/lockspool | |
| parent | 099d6bc2beef00972d73a5bdc4e02cc14317ab61 (diff) | |
Use poll() to determine when stdin is readable and throw away input
until we hit EOF. OK deraadt@
Diffstat (limited to 'libexec/lockspool')
| -rw-r--r-- | libexec/lockspool/lockspool.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/libexec/lockspool/lockspool.c b/libexec/lockspool/lockspool.c index 7430420e793..496a9e443f2 100644 --- a/libexec/lockspool/lockspool.c +++ b/libexec/lockspool/lockspool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lockspool.c,v 1.14 2008/10/01 20:26:28 millert Exp $ */ +/* $OpenBSD: lockspool.c,v 1.15 2008/10/01 20:32:44 millert Exp $ */ /* * Copyright (c) 1998 Theo de Raadt <deraadt@theos.com> @@ -27,7 +27,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.14 2008/10/01 20:26:28 millert Exp $"; +static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.15 2008/10/01 20:32:44 millert Exp $"; #endif /* not lint */ #include <signal.h> @@ -37,6 +37,7 @@ static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.14 2008/10/01 20:26:28 mi #include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <poll.h> #include "mail.local.h" void unhold(int); @@ -48,6 +49,8 @@ int main(int argc, char *argv[]) { struct passwd *pw; + struct pollfd pfd; + ssize_t nread; char *from, c; int holdfd; @@ -78,8 +81,18 @@ main(int argc, char *argv[]) } write(STDOUT_FILENO, "1\n", 2); - while (read(STDIN_FILENO, &c, 1) == -1 && errno == EINTR) - ; + /* wait for the other end of the pipe to close, then release the lock */ + pfd.fd = STDIN_FILENO; + pfd.events = POLLIN; + do { + if (poll(&pfd, 1, INFTIM) == -1) { + if (errno != EINTR) + break; + } + do { + nread = read(STDIN_FILENO, &c, 1); + } while (nread == 1 || (nread == -1 && errno == EINTR)); + } while (nread == -1 && errno == EAGAIN); rellock(); exit (0); } |