emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use STD*_FILENO some more. No object-code changes

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer
2008-05-19 09:48:17 +00:00
parent 636a1f85e8
commit 5e25ddb7d3
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
networking/nc_bloaty.c
View File

@@ -562,7 +562,7 @@ static int readwrite(void)
/* if we have a timeout AND stdin is closed AND we haven't heard anything
from the net during that time, assume it's dead and close it too. */
if (rr == 0) {
if (!FD_ISSET(0, &ding1))
if (!FD_ISSET(STDIN_FILENO, &ding1))
netretry--; /* we actually try a coupla times. */
if (!netretry) {
if (o_verbose > 1) /* normally we don't care */
@@ -597,12 +597,12 @@ Debug("got %d from the net, errno %d", rr, errno);
goto shovel;
/* okay, suck more stdin */
if (FD_ISSET(0, &ding2)) { /* stdin: ding! */
rr = read(0, bigbuf_in, BIGSIZ);
if (FD_ISSET(STDIN_FILENO, &ding2)) { /* stdin: ding! */
rr = read(STDIN_FILENO, bigbuf_in, BIGSIZ);
/* Considered making reads here smaller for UDP mode, but 8192-byte
mobygrams are kinda fun and exercise the reassembler. */
if (rr <= 0) { /* at end, or fukt, or ... */
FD_CLR(0, &ding1); /* disable and close stdin */
FD_CLR(STDIN_FILENO, &ding1); /* disable and close stdin */
close(0);
} else {
rzleft = rr;
@@ -625,7 +625,7 @@ Debug("got %d from the net, errno %d", rr, errno);
return 1;
}
if (rnleft) {
rr = write(1, np, rnleft);
rr = write(STDOUT_FILENO, np, rnleft);
if (rr > 0) {
if (o_ofile) /* log the stdout */
oprint('<', (unsigned char *)np, rr);
@@ -783,7 +783,7 @@ int nc_main(int argc, char **argv)
}
#endif
FD_SET(0, &ding1); /* stdin *is* initially open */
FD_SET(STDIN_FILENO, &ding1); /* stdin *is* initially open */
if (proggie) {
close(0); /* won't need stdin */
option_mask32 &= ~OPT_o; /* -o with -e is meaningless! */