mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

crank version to 1.6

Browse Source
This commit is contained in:
Todd C. Miller
1999-12-05 02:18:47 +00:00
parent a183816d27
commit c6136f9764
16 changed files with 86 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tgetpass.c
View File

@@ -188,6 +188,9 @@ tgetline(fd, buf, bufsiz, timeout)
if (bufsiz == 0)
return(NULL); /* sanity */
cp = buf;
left = bufsiz;
/*
* Timeout of <= 0 means no timeout.
*/
@@ -196,29 +199,33 @@ tgetline(fd, buf, bufsiz, timeout)
n = howmany(fd + 1, NFDBITS) * sizeof(fd_mask);
readfds = (fd_set *) emalloc(n);
(void) memset((VOID *)readfds, 0, n);
FD_SET(fd, readfds);
/* Set timeout for select */
tv.tv_sec = timeout;
tv.tv_usec = 0;
/*
* Make sure there is something to read or timeout
*/
while ((n = select(fd + 1, readfds, 0, 0, &tv)) == -1 &&
errno == EINTR)
;
if (n == 0)
return(NULL); /* timeout */
}
if (readfds)
free(readfds);
while (--left) {
FD_SET(fd, readfds);
/* Keep reading until out of space, EOF, error, or newline */
cp = buf;
left = bufsiz;
while (--left && (n = read(fd, &c, 1)) == 1 && c != '\n')
*cp++ = c;
/* Make sure there is something to read (or timeout) */
while ((n = select(fd + 1, readfds, 0, 0, &tv)) == -1 &&
errno == EINTR)
;
if (n == 0)
return(NULL); /* timeout */
/* Read a character, exit loop on error, EOF or EOL */
n = read(fd, &c, 1);
if (n != 1 || c == '\n')
break;
*cp++ = c;
}
free(readfds);
} else {
/* Keep reading until out of space, EOF, error, or newline */
while (--left && (n = read(fd, &c, 1)) == 1 && c != '\n')
*cp++ = c;
}
*cp = '\0';
return(cp == buf ? NULL : buf);