summaryrefslogtreecommitdiff
path: root/networking/telnet.c
diff options
context:
space:
mode:
authorDenys Vlasenko2010-01-12 12:29:55 +0100
committerDenys Vlasenko2010-01-12 12:29:55 +0100
commitcb23d93c6845df3f2733a32caa4194e60ef871a7 (patch)
tree3df3fae13c62eea184d61ceaed25a4fdf85c809c /networking/telnet.c
parent385cc59117f2788d24d2cd75fd58f7ff044d501c (diff)
downloadbusybox-cb23d93c6845df3f2733a32caa4194e60ef871a7.zip
busybox-cb23d93c6845df3f2733a32caa4194e60ef871a7.tar.gz
*: 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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/telnet.c b/networking/telnet.c
index 77e1747..013d959 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -618,12 +618,12 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
default:
#ifdef USE_POLL
- if (ufds[0].revents) /* well, should check POLLIN, but ... */
+ if (ufds[0].revents & POLLIN)
#else
if (FD_ISSET(STDIN_FILENO, &rfds))
#endif
{
- len = read(STDIN_FILENO, G.buf, DATABUFSIZE);
+ len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
if (len <= 0)
doexit(EXIT_SUCCESS);
TRACE(0, ("Read con: %d\n", len));
@@ -631,12 +631,12 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
}
#ifdef USE_POLL
- if (ufds[1].revents) /* well, should check POLLIN, but ... */
+ if (ufds[1].revents & POLLIN)
#else
if (FD_ISSET(netfd, &rfds))
#endif
{
- len = read(netfd, G.buf, DATABUFSIZE);
+ len = safe_read(netfd, G.buf, DATABUFSIZE);
if (len <= 0) {
write_str(1, "Connection closed by foreign host\r\n");
doexit(EXIT_FAILURE);