diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-04-21 04:25:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-04-21 04:25:50 +0000 |
| commit | 7632cd5170988874a19eafc1c736f68d2c8e469c (patch) | |
| tree | 4f65ac3931473830d6087eb1584fad22a611227a /libexec | |
| parent | da8fe8148c7e08997756a8ca51e7e8246e595dcb (diff) | |
use poll + nanosleep instead of select with a fixed size fd_set
ok tedu
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/getty/subr.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index b97c0074a9a..83b57191f22 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.c,v 1.19 2009/10/27 23:59:31 deraadt Exp $ */ +/* $OpenBSD: subr.c,v 1.20 2013/04/21 04:25:49 deraadt Exp $ */ /* * Copyright (c) 1983, 1993 @@ -33,11 +33,12 @@ * Melbourne getty. */ #define COMPAT_43 +#include <sys/ioctl.h> #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <poll.h> #include <termios.h> -#include <sys/ioctl.h> #include "gettytab.h" #include "pathnames.h" @@ -679,23 +680,21 @@ portselector(void) char * autobaud(void) { - fd_set rfds; - struct timeval timeout; + struct pollfd pfd[1]; + struct timespec ts; char c, *type = "9600-baud"; (void)tcflush(0, TCIOFLUSH); - FD_ZERO(&rfds); - FD_SET(0, &rfds); - timeout.tv_sec = 5; - timeout.tv_usec = 0; - if (select(1, &rfds, (fd_set *)NULL, (fd_set *)NULL, &timeout) <= 0) + pfd[0].fd = 0; + pfd[0].events = POLLIN; + if (poll(pfd, 1, 5 * 1000) <= 0) return (type); if (read(STDIN_FILENO, &c, sizeof(char)) != sizeof(char)) return (type); - timeout.tv_sec = 0; - timeout.tv_usec = 20; - (void) select(0, (fd_set *)NULL, (fd_set *)NULL, - (fd_set *)NULL, &timeout); + + ts.tv_sec = 0; + ts.tv_nsec = 20 * 1000; + nanosleep(&ts, NULL); (void)tcflush(0, TCIOFLUSH); switch (c & 0377) { |