Search
j0ke.net Open Build Service
>
Projects
>
stresslinux
>
busybox
> busybox-1.16.0-POLLHUP.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File busybox-1.16.0-POLLHUP.patch of Package busybox (Revision 28)
Currently displaying revision
28
,
show latest
diff -urpN busybox-1.16.0/miscutils/microcom.c busybox-1.16.0-POLLHUP/miscutils/microcom.c --- busybox-1.16.0/miscutils/microcom.c 2010-01-25 01:59:38.000000000 +0100 +++ busybox-1.16.0-POLLHUP/miscutils/microcom.c 2010-03-02 23:53:28.000000000 +0100 @@ -119,7 +119,7 @@ int microcom_main(int argc UNUSED_PARAM, 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, 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 -urpN busybox-1.16.0/networking/httpd.c busybox-1.16.0-POLLHUP/networking/httpd.c --- busybox-1.16.0/networking/httpd.c 2010-01-25 01:59:38.000000000 +0100 +++ busybox-1.16.0-POLLHUP/networking/httpd.c 2010-03-02 23:53:28.000000000 +0100 @@ -1167,7 +1167,7 @@ static NOINLINE void cgi_io_loop_and_exi 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_exi } } - 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_exi } } - if (pfd[FROM_CGI].revents & POLLIN) { + if (pfd[FROM_CGI].revents) { /* There is something to read from CGI */ char *rbuf = iobuf; diff -urpN busybox-1.16.0/networking/telnet.c busybox-1.16.0-POLLHUP/networking/telnet.c --- busybox-1.16.0/networking/telnet.c 2010-01-25 01:59:38.000000000 +0100 +++ busybox-1.16.0-POLLHUP/networking/telnet.c 2010-03-02 23:53:28.000000000 +0100 @@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, c 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, c } #ifdef USE_POLL - if (ufds[1].revents & POLLIN) + if (ufds[1].revents) #else if (FD_ISSET(netfd, &rfds)) #endif diff -urpN busybox-1.16.0/util-linux/script.c busybox-1.16.0-POLLHUP/util-linux/script.c --- busybox-1.16.0/util-linux/script.c 2010-01-25 01:59:39.000000000 +0100 +++ busybox-1.16.0-POLLHUP/util-linux/script.c 2010-03-02 23:53:28.000000000 +0100 @@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, c * 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, c } } } - 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 */
