Patch from Christian Meyer:

[oweals/busybox.git] / networking / telnet.c

diff --git a/networking/telnet.c b/networking/telnet.c
index 14b71c85da8045763370b39074a7d203b1b23920..88607f6531e5e6aacf7d91972d39116d3768ea86 100644 (file)
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -25,7 +25,7 @@
  * HISTORY
  * Revision 3.1  1994/04/17  11:31:54  too
  * initial revision
- * Modified 2000/06/13 for inclusion into BusyBox by Erik Andersen <andersee@debian.org>
+ * Modified 2000/06/13 for inclusion into BusyBox by Erik Andersen <andersen@codepoet.org>
  * Modified 2001/05/07 to add ability to pass TTYPE to remote host by Jim McQuillan
  * <jam@ltsp.org>
  *
@@ -110,8 +110,6 @@ static struct Globalvars {
 #ifdef USE_GLOBALVAR_PTR
 struct Globalvars * Gptr;
 #define G (*Gptr)
-#else
-static struct Globalvars G;
 #endif
 
 static inline void iacflush(void)
@@ -606,7 +604,7 @@ extern int telnet_main(int argc, char** argv)
        G.termios_raw = G.termios_def;
        cfmakeraw(&G.termios_raw);
        
-       if (argc < 2)   show_usage();
+       if (argc < 2)   bb_show_usage();
        port = (argc > 2)? argv[2] : "23";
        
        host = argv[1];