summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko2018-04-07 15:02:20 +0200
committerDenys Vlasenko2018-04-07 15:02:20 +0200
commit2f094ae82106e91cb210e79ddc2e5285377b549e (patch)
treec76bacf7490a92aceda4113acc98bb9da45cd864 /networking
parente0afe0a9fd610b1972fdaa444ca39af0b0be6ec4 (diff)
downloadbusybox-2f094ae82106e91cb210e79ddc2e5285377b549e.zip
busybox-2f094ae82106e91cb210e79ddc2e5285377b549e.tar.gz
telnet: move winsize detection closer to I/O loop, delete non-functioning debug code
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/telnet.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/networking/telnet.c b/networking/telnet.c
index 8b0df7f..15d6a08 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -89,12 +89,6 @@
# define TELOPT_NAWS 31 /* window size */
#endif
-#ifdef DOTRACE
-# define TRACE(x, y) do { if (x) printf y; } while (0)
-#else
-# define TRACE(x, y)
-#endif
-
enum {
DATABUFSIZE = 128,
IACBUFSIZE = 128,
@@ -627,10 +621,6 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
INIT_G();
-#if ENABLE_FEATURE_TELNET_WIDTH
- get_terminal_width_height(0, &G.win_width, &G.win_height);
-#endif
-
#if ENABLE_FEATURE_TELNET_TTYPE
G.ttype = getenv("TERM");
#endif
@@ -661,6 +651,11 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
setsockopt_keepalive(netfd);
+#if ENABLE_FEATURE_TELNET_WIDTH
+ get_terminal_width_height(0, &G.win_width, &G.win_height);
+//TODO: support dynamic resize?
+#endif
+
signal(SIGINT, record_signo);
ufds[0].fd = STDIN_FILENO;
@@ -684,7 +679,6 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
if (len <= 0)
doexit(EXIT_SUCCESS);
- TRACE(0, ("Read con: %d\n", len));
handle_net_output(len);
}
@@ -694,7 +688,6 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
full_write1_str("Connection closed by foreign host\r\n");
doexit(EXIT_FAILURE);
}
- TRACE(0, ("Read netfd (%d): %d\n", netfd, len));
handle_net_input(len);
}
} /* while (1) */