summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko2010-03-02 15:02:45 +0100
committerDenys Vlasenko2010-03-02 15:02:45 +0100
commit88aa558e5cf31d1b390d68fc40f55b47beac246e (patch)
treee852c4b98e2f849fea60507363c22b39549d7601 /networking
parentd2f77796711f55240d4a88c92ea8c6545baeee98 (diff)
downloadbusybox-88aa558e5cf31d1b390d68fc40f55b47beac246e.zip
busybox-88aa558e5cf31d1b390d68fc40f55b47beac246e.tar.gz
*: do not check for POLLIN/POLLOUT only, just in case it's POLHUP/POLERR
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c6
-rw-r--r--networking/telnet.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 5bbc7ee..8834c1c 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 & POLLOUT) {
+ if (pfd[TO_CGI].revents) {
/* 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 & POLLIN) {
+ if (pfd[0].revents) {
/* 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 & POLLIN) {
+ if (pfd[FROM_CGI].revents) {
/* There is something to read from CGI */
char *rbuf = iobuf;
diff --git a/networking/telnet.c b/networking/telnet.c
index 344bb0d..09f75cc 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
default:
#ifdef USE_POLL
- if (ufds[0].revents & POLLIN)
+ if (ufds[0].revents)
#else
if (FD_ISSET(STDIN_FILENO, &rfds))
#endif
@@ -631,7 +631,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
}
#ifdef USE_POLL
- if (ufds[1].revents & POLLIN)
+ if (ufds[1].revents)
#else
if (FD_ISSET(netfd, &rfds))
#endif