diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-04 10:16:52 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-04 10:16:52 +0000 |
| commit | 74324c86663f57a19c1de303ee8c8e5449db9ef2 (patch) | |
| tree | 11f5da9de4212875ce5811be2e1050e076378c9a /networking/telnet.c | |
| parent | 4e5f82c76f08614d0b69f9ec4a8baac303af15f6 (diff) | |
| download | busybox-74324c86663f57a19c1de303ee8c8e5449db9ef2.tar.gz | |
Audit bb_common_bufsiz usage, add script which looks for misuse.
tr: stop using globals needlessly.
code: -103 bytes
Diffstat (limited to 'networking/telnet.c')
| -rw-r--r-- | networking/telnet.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/networking/telnet.c b/networking/telnet.c index caca89d2d..a634d7a2b 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -52,7 +52,6 @@ enum { typedef unsigned char byte; - struct globals { int netfd; /* console fd:s are 0 and 1 (and 2) */ short iaclen; /* could even use byte */ @@ -78,9 +77,13 @@ struct globals { struct termios termios_def; struct termios termios_raw; }; - #define G (*(struct globals*)&bb_common_bufsiz1) - +void BUG_telnet_globals_too_big(void); +#define INIT_G() do { \ + if (sizeof(G) > COMMON_BUFSIZE) \ + BUG_telnet_globals_too_big(); \ + /* memset(&G, 0, sizeof G); - already is */ \ +} while (0) /* Function prototypes */ static void rawmode(void); @@ -547,8 +550,6 @@ static void cookmode(void) tcsetattr(0, TCSADRAIN, &G.termios_def); } -void BUG_telnet_globals_too_big(void); - int telnet_main(int argc, char** argv); int telnet_main(int argc, char** argv) { @@ -562,9 +563,7 @@ int telnet_main(int argc, char** argv) int maxfd; #endif - if (sizeof(G) > sizeof(bb_common_bufsiz1)) - BUG_telnet_globals_too_big(); - /* memset(&G, 0, sizeof G); - already is */ + INIT_G(); #if ENABLE_FEATURE_AUTOWIDTH get_terminal_width_height(0, &G.win_width, &G.win_height); |