diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-02 15:02:45 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-02 15:02:45 +0100 |
| commit | 88aa558e5cf31d1b390d68fc40f55b47beac246e (patch) | |
| tree | e852c4b98e2f849fea60507363c22b39549d7601 | |
| parent | d2f77796711f55240d4a88c92ea8c6545baeee98 (diff) | |
| download | 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>
| -rw-r--r-- | miscutils/microcom.c | 4 | ||||
| -rw-r--r-- | networking/httpd.c | 6 | ||||
| -rw-r--r-- | networking/telnet.c | 4 | ||||
| -rw-r--r-- | util-linux/script.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/miscutils/microcom.c b/miscutils/microcom.c index 9a7a41d53..0fb51d2e8 100644 --- a/miscutils/microcom.c +++ b/miscutils/microcom.c @@ -119,7 +119,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) nfd = 2; // Not safe_poll: we want to exit on signal while (!bb_got_signal && poll(pfd, nfd, timeout) > 0) { - if (nfd > 1 && (pfd[1].revents & POLLIN)) { + if (nfd > 1 && pfd[1].revents) { char c; // read from stdin -> write to device if (safe_read(STDIN_FILENO, &c, 1) < 1) { @@ -143,7 +143,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) safe_poll(pfd, 1, delay); skip_write: ; } - if (pfd[0].revents & POLLIN) { + if (pfd[0].revents) { #define iobuf bb_common_bufsiz1 ssize_t len; // read from device -> write to stdout diff --git a/networking/httpd.c b/networking/httpd.c index 5bbc7ee85..8834c1c71 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 344bb0daa..09f75cc84 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 diff --git a/util-linux/script.c b/util-linux/script.c index 37213eec8..d9a62fbfe 100644 --- a/util-linux/script.c +++ b/util-linux/script.c @@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) * for example, try "script -c true" */ break; } - if (pfd[0].revents & POLLIN) { + if (pfd[0].revents) { errno = 0; count = safe_read(pty, buf, sizeof(buf)); if (count <= 0 && errno != EAGAIN) { @@ -143,7 +143,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) } } } - if (pfd[1].revents & POLLIN) { + if (pfd[1].revents) { count = safe_read(STDIN_FILENO, buf, sizeof(buf)); if (count <= 0) { /* err/eof from stdin: don't read stdin anymore */ |