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

Don't use an arbitrary hardcoded value for nfds in select() calls.

Browse Source 
PR:		bin/9986
This commit is contained in:
des 1999-02-10 18:08:51 +00:00
parent 889621dc3f
commit 58c2137614
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/rsh/rsh.c
View File

@ -42,10 +42,10 @@ static const char copyright[] =
static char sccsid[] = "From: @(#)rsh.c 8.3 (Berkeley) 4/6/94";
#endif
static const char rcsid[] =
"$Id: rsh.c,v 1.15 1998/03/23 07:46:23 charnier Exp $";
"$Id: rsh.c,v 1.16 1998/10/09 06:47:57 markm Exp $";
#endif /* not lint */
#include <sys/types.h>
#include <sys/param.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
@ -332,7 +332,7 @@ talk(nflag, omask, pid, rem, timeout)
fd_set readfrom, ready, rembits;
char *bp, buf[BUFSIZ];
struct timeval tvtimeout;
int srval;
int nfds, srval;
if (!nflag && pid == 0) {
(void)close(rfd2);
@ -345,7 +345,8 @@ reread: errno = 0;
rewrite:
FD_ZERO(&rembits);
FD_SET(rem, &rembits);
if (select(16, 0, &rembits, 0, 0) < 0) {
nfds = rem + 1;
if (select(nfds, 0, &rembits, 0, 0) < 0) {
if (errno != EINTR)
err(1, "select");
goto rewrite;
@ -382,12 +383,13 @@ reread: errno = 0;
FD_ZERO(&readfrom);
FD_SET(rfd2, &readfrom);
FD_SET(rem, &readfrom);
nfds = MAX(rfd2+1, rem+1);
do {
ready = readfrom;
if (timeout) {
srval = select(16, &ready, 0, 0, &tvtimeout);
srval = select(nfds, &ready, 0, 0, &tvtimeout);
} else {
srval = select(16, &ready, 0, 0, 0);
srval = select(nfds, &ready, 0, 0, 0);
}
if (srval < 0) {