oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix a few warnings.

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2012-02-15 12:01:12 +00:00
parent 0e92c9abd2
commit db484e73a2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appl/ftp/ftp/ftp.c
View File

@@ -1708,9 +1708,11 @@ reset (int argc, char **argv)
FD_ZERO (&mask); FD_ZERO (&mask);
while (nfnd > 0) { while (nfnd > 0) {
if (fileno (cin) >= FD_SETSIZE) int fd = fileno(cin);
if (fd >= FD_SETSIZE)
errx (1, "fd too large"); errx (1, "fd too large");
FD_SET (fileno (cin), &mask); FD_SET (fd, &mask);
if ((nfnd = empty (&mask, 0)) < 0) { if ((nfnd = empty (&mask, 0)) < 0) {
warn ("reset"); warn ("reset");
code = -1; code = -1;
@@ -1772,6 +1774,7 @@ abort_remote (FILE * din)
char buf[BUFSIZ]; char buf[BUFSIZ];
int nfnd; int nfnd;
fd_set mask; fd_set mask;
int din_fd = -1;
/* /*
* send IAC in urgent mode instead of DM because 4.3BSD places oob mark * send IAC in urgent mode instead of DM because 4.3BSD places oob mark
@@ -1790,9 +1793,10 @@ abort_remote (FILE * din)
errx (1, "fd too large"); errx (1, "fd too large");
FD_SET (fileno (cin), &mask); FD_SET (fileno (cin), &mask);
if (din) { if (din) {
if (fileno (din) >= FD_SETSIZE) din_fd = fileno (din);
if (din_fd >= FD_SETSIZE)
errx (1, "fd too large"); errx (1, "fd too large");
FD_SET (fileno (din), &mask); FD_SET (din_fd, &mask);
} }
if ((nfnd = empty (&mask, 10)) <= 0) { if ((nfnd = empty (&mask, 10)) <= 0) {
if (nfnd < 0) { if (nfnd < 0) {
@@ -1802,8 +1806,8 @@ abort_remote (FILE * din)
code = -1; code = -1;
lostpeer (0); lostpeer (0);
} }
if (din && FD_ISSET (fileno (din), &mask)) { if (din && FD_ISSET (din_fd, &mask)) {
while (read (fileno (din), buf, BUFSIZ) > 0) while (read (din_fd, buf, BUFSIZ) > 0)
/* LOOP */ ; /* LOOP */ ;
} }
if (getreply (0) == ERROR && code == 552) { if (getreply (0) == ERROR && code == 552) {