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 /miscutils/microcom.c | |
| parent | d2f77796711f55240d4a88c92ea8c6545baeee98 (diff) | |
| download | busybox-w32-88aa558e5cf31d1b390d68fc40f55b47beac246e.tar.gz busybox-w32-88aa558e5cf31d1b390d68fc40f55b47beac246e.tar.bz2 busybox-w32-88aa558e5cf31d1b390d68fc40f55b47beac246e.zip | |
*: 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 'miscutils/microcom.c')
| -rw-r--r-- | miscutils/microcom.c | 4 |
1 files changed, 2 insertions, 2 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) | |||
| 119 | nfd = 2; | 119 | nfd = 2; |
| 120 | // Not safe_poll: we want to exit on signal | 120 | // Not safe_poll: we want to exit on signal |
| 121 | while (!bb_got_signal && poll(pfd, nfd, timeout) > 0) { | 121 | while (!bb_got_signal && poll(pfd, nfd, timeout) > 0) { |
| 122 | if (nfd > 1 && (pfd[1].revents & POLLIN)) { | 122 | if (nfd > 1 && pfd[1].revents) { |
| 123 | char c; | 123 | char c; |
| 124 | // read from stdin -> write to device | 124 | // read from stdin -> write to device |
| 125 | if (safe_read(STDIN_FILENO, &c, 1) < 1) { | 125 | if (safe_read(STDIN_FILENO, &c, 1) < 1) { |
| @@ -143,7 +143,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) | |||
| 143 | safe_poll(pfd, 1, delay); | 143 | safe_poll(pfd, 1, delay); |
| 144 | skip_write: ; | 144 | skip_write: ; |
| 145 | } | 145 | } |
| 146 | if (pfd[0].revents & POLLIN) { | 146 | if (pfd[0].revents) { |
| 147 | #define iobuf bb_common_bufsiz1 | 147 | #define iobuf bb_common_bufsiz1 |
| 148 | ssize_t len; | 148 | ssize_t len; |
| 149 | // read from device -> write to stdout | 149 | // read from device -> write to stdout |