Author: pfg
Date: Fri Feb 26 18:52:06 2016
New Revision: 296104
URL: https://svnweb.freebsd.org/changeset/base/296104
Log:
getty(8): Use poll(2) and nanosleep(2) instead of select(2).
Sort headers while here.
Obtained from: NetBSD (CVS Rev. 1.25 - 1.26)
Modified:
head/libexec/getty/subr.c
Modified: head/libexec/getty/subr.c
==============================================================================
--- head/libexec/getty/subr.c Fri Feb 26 16:18:47 2016 (r296103)
+++ head/libexec/getty/subr.c Fri Feb 26 18:52:06 2016 (r296104)
@@ -38,14 +38,16 @@ static const char rcsid[] =
/*
* Melbourne getty.
*/
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/time.h>
+
+#include <poll.h>
+#include <stdlib.h>
+#include <string.h>
#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
#include "gettytab.h"
#include "pathnames.h"
@@ -633,24 +635,21 @@ portselector(void)
const char *
autobaud(void)
{
- int rfds;
- struct timeval timeout;
+struct pollfd set[1];
+ struct timespec timeout;
char c;
const char *type = "9600-baud";
(void)tcflush(0, TCIOFLUSH);
- rfds = 1 << 0;
- timeout.tv_sec = 5;
- timeout.tv_usec = 0;
- if (select(32, (fd_set *)&rfds, (fd_set *)NULL,
- (fd_set *)NULL, &timeout) <= 0)
+ set[0].fd = STDIN_FILENO;
+ set[0].events = POLLIN;
+ if (poll(set, 1, 5000) <= 0)
return (type);
if (read(STDIN_FILENO, &c, sizeof(char)) != sizeof(char))
return (type);
timeout.tv_sec = 0;
- timeout.tv_usec = 20;
- (void) select(32, (fd_set *)NULL, (fd_set *)NULL,
- (fd_set *)NULL, &timeout);
+ timeout.tv_nsec = 20000;
+ (void)nanosleep(&timeout, NULL);
(void)tcflush(0, TCIOFLUSH);
switch (c & 0377) {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
