d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getty(8): Use poll(2) and nanosleep(2) instead of select(2).

Browse Source 
Sort headers while here.

Obtained from:	NetBSD (CVS Rev. 1.25 - 1.26)
This commit is contained in:
pfg 2016-02-26 18:52:06 +00:00
parent b1abdb4699
commit 1e58db1a6c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libexec/getty/subr.c
View File

@ -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) {