diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-11 16:35:52 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-11 16:35:52 +0100 |
| commit | ed15dde60a72dce888df10295a916b199346929d (patch) | |
| tree | e3d9fab96ea62f20f29460de32e8cacaab9d2267 /networking/telnet.c | |
| parent | 6c1f348fa792a33d5a98e68c139df65c2d4c1628 (diff) | |
| download | busybox-ed15dde60a72dce888df10295a916b199346929d.tar.gz | |
Move FEATURE_AUTOWIDTH config option to two applets which use it
No code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/telnet.c')
| -rw-r--r-- | networking/telnet.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/networking/telnet.c b/networking/telnet.c index f520fe1dd..a70f74762 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -45,6 +45,11 @@ //config: remote host you are connecting to. This is useful when you need to //config: log into a machine without telling the username (autologin). This //config: option enables `-a' and `-l USER' arguments. +//config: +//config:config FEATURE_TELNET_WIDTH +//config: bool "Enable window size autodetection" +//config: default y +//config: depends on TELNET //applet:IF_TELNET(APPLET(telnet, BB_DIR_USR_BIN, BB_SUID_DROP)) @@ -128,7 +133,7 @@ struct globals { #if ENABLE_FEATURE_TELNET_AUTOLOGIN const char *autologin; #endif -#if ENABLE_FEATURE_AUTOWIDTH +#if ENABLE_FEATURE_TELNET_WIDTH unsigned win_width, win_height; #endif /* same buffer used both for network and console read/write */ @@ -401,7 +406,7 @@ static void put_iac_subopt_autologin(void) } #endif -#if ENABLE_FEATURE_AUTOWIDTH +#if ENABLE_FEATURE_TELNET_WIDTH static void put_iac_naws(byte c, int x, int y) { if (G.iaclen + 9 > IACBUFSIZE) @@ -538,7 +543,7 @@ static void to_new_environ(void) } #endif -#if ENABLE_FEATURE_AUTOWIDTH +#if ENABLE_FEATURE_TELNET_WIDTH static void to_naws(void) { /* Tell server we will do NAWS */ @@ -561,7 +566,7 @@ static void telopt(byte c) case TELOPT_NEW_ENVIRON: to_new_environ(); break; #endif -#if ENABLE_FEATURE_AUTOWIDTH +#if ENABLE_FEATURE_TELNET_WIDTH case TELOPT_NAWS: to_naws(); put_iac_naws(c, G.win_width, G.win_height); @@ -623,7 +628,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) INIT_G(); -#if ENABLE_FEATURE_AUTOWIDTH +#if ENABLE_FEATURE_TELNET_WIDTH get_terminal_width_height(0, &G.win_width, &G.win_height); #endif |