diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-12 12:29:55 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-12 12:29:55 +0100 |
commit | cb23d93c6845df3f2733a32caa4194e60ef871a7 (patch) | |
tree | 3df3fae13c62eea184d61ceaed25a4fdf85c809c /networking/telnet.c | |
parent | 385cc59117f2788d24d2cd75fd58f7ff044d501c (diff) | |
download | busybox-w32-cb23d93c6845df3f2733a32caa4194e60ef871a7.tar.gz busybox-w32-cb23d93c6845df3f2733a32caa4194e60ef871a7.tar.bz2 busybox-w32-cb23d93c6845df3f2733a32caa4194e60ef871a7.zip |
*: 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/telnet.c')
-rw-r--r-- | networking/telnet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/telnet.c b/networking/telnet.c index 77e17479d..013d959a1 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -618,12 +618,12 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) | |||
618 | default: | 618 | default: |
619 | 619 | ||
620 | #ifdef USE_POLL | 620 | #ifdef USE_POLL |
621 | if (ufds[0].revents) /* well, should check POLLIN, but ... */ | 621 | if (ufds[0].revents & POLLIN) |
622 | #else | 622 | #else |
623 | if (FD_ISSET(STDIN_FILENO, &rfds)) | 623 | if (FD_ISSET(STDIN_FILENO, &rfds)) |
624 | #endif | 624 | #endif |
625 | { | 625 | { |
626 | len = read(STDIN_FILENO, G.buf, DATABUFSIZE); | 626 | len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE); |
627 | if (len <= 0) | 627 | if (len <= 0) |
628 | doexit(EXIT_SUCCESS); | 628 | doexit(EXIT_SUCCESS); |
629 | TRACE(0, ("Read con: %d\n", len)); | 629 | TRACE(0, ("Read con: %d\n", len)); |
@@ -631,12 +631,12 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) | |||
631 | } | 631 | } |
632 | 632 | ||
633 | #ifdef USE_POLL | 633 | #ifdef USE_POLL |
634 | if (ufds[1].revents) /* well, should check POLLIN, but ... */ | 634 | if (ufds[1].revents & POLLIN) |
635 | #else | 635 | #else |
636 | if (FD_ISSET(netfd, &rfds)) | 636 | if (FD_ISSET(netfd, &rfds)) |
637 | #endif | 637 | #endif |
638 | { | 638 | { |
639 | len = read(netfd, G.buf, DATABUFSIZE); | 639 | len = safe_read(netfd, G.buf, DATABUFSIZE); |
640 | if (len <= 0) { | 640 | if (len <= 0) { |
641 | write_str(1, "Connection closed by foreign host\r\n"); | 641 | write_str(1, "Connection closed by foreign host\r\n"); |
642 | doexit(EXIT_FAILURE); | 642 | doexit(EXIT_FAILURE); |