diff options
| author | Denys Vlasenko | 2010-01-12 12:29:55 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-01-12 12:29:55 +0100 |
| commit | cb23d93c6845df3f2733a32caa4194e60ef871a7 (patch) | |
| tree | 3df3fae13c62eea184d61ceaed25a4fdf85c809c /networking | |
| parent | 385cc59117f2788d24d2cd75fd58f7ff044d501c (diff) | |
| download | busybox-cb23d93c6845df3f2733a32caa4194e60ef871a7.zip busybox-cb23d93c6845df3f2733a32caa4194e60ef871a7.tar.gz | |
*: add/remove safe_, it seems we had a few incorrect uses
function old new delta
chat_main 1359 1361 +2
microcom_main 712 713 +1
ifplugd_main 1109 1110 +1
arpping 465 466 +1
acpid_main 440 441 +1
script_main 1069 1067 -2
cgi_io_loop_and_exit 594 591 -3
telnet_main 1475 1469 -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/3 up/down: 6/-11) Total: -5 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/httpd.c | 6 | ||||
| -rw-r--r-- | networking/telnet.c | 8 | ||||
| -rw-r--r-- | networking/udhcp/arpping.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 0a8322c..227803a 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -1167,7 +1167,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post break; } - if (pfd[TO_CGI].revents) { + if (pfd[TO_CGI].revents & POLLOUT) { /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ /* Have data from peer and can write to CGI */ count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt); @@ -1184,7 +1184,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post } } - if (pfd[0].revents) { + if (pfd[0].revents & POLLIN) { /* post_len > 0 && hdr_cnt == 0 here */ /* We expect data, prev data portion is eaten by CGI * and there *is* data to read from the peer @@ -1202,7 +1202,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post } } - if (pfd[FROM_CGI].revents) { + if (pfd[FROM_CGI].revents & POLLIN) { /* There is something to read from CGI */ char *rbuf = iobuf; diff --git a/networking/telnet.c b/networking/telnet.c index 77e1747..013d959 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -618,12 +618,12 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) default: #ifdef USE_POLL - if (ufds[0].revents) /* well, should check POLLIN, but ... */ + if (ufds[0].revents & POLLIN) #else if (FD_ISSET(STDIN_FILENO, &rfds)) #endif { - len = read(STDIN_FILENO, G.buf, DATABUFSIZE); + len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE); if (len <= 0) doexit(EXIT_SUCCESS); TRACE(0, ("Read con: %d\n", len)); @@ -631,12 +631,12 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) } #ifdef USE_POLL - if (ufds[1].revents) /* well, should check POLLIN, but ... */ + if (ufds[1].revents & POLLIN) #else if (FD_ISSET(netfd, &rfds)) #endif { - len = read(netfd, G.buf, DATABUFSIZE); + len = safe_read(netfd, G.buf, DATABUFSIZE); if (len <= 0) { write_str(1, "Connection closed by foreign host\r\n"); doexit(EXIT_FAILURE); diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index 3df0f39..4af8534 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c @@ -95,7 +95,7 @@ int FAST_FUNC arpping(uint32_t test_nip, if (r < 0) break; if (r) { - r = read(s, &arp, sizeof(arp)); + r = safe_read(s, &arp, sizeof(arp)); if (r < 0) break; |