- spelling

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

diff --git a/networking/telnet.c b/networking/telnet.c
index 6ad7712ab87b900731bd1a88259040034e93a0c5..c835c7a4525b2450fdc820428e4cdc551614852c 100644 (file)
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -8,19 +8,7 @@
  * Created: Thu Apr  7 13:29:41 1994 too
  * Last modified: Fri Jun  9 14:34:24 2000 too
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * HISTORY
  * Revision 3.1  1994/04/17  11:31:54  too
@@ -47,7 +35,7 @@
 #include "busybox.h"
 
 #if 0
-static const int DOTRACE = 1;
+enum { DOTRACE = 1 };
 #endif
 
 #ifdef DOTRACE
@@ -57,24 +45,17 @@ static const int DOTRACE = 1;
 #define TRACE(x, y)
 #endif
 
-#if 0
-#define USE_POLL
-#include <sys/poll.h>
-#else
-#include <sys/time.h>
-#endif
-
 #define DATABUFSIZE  128
 #define IACBUFSIZE   128
 
-static const int CHM_TRY = 0;
-static const int CHM_ON = 1;
-static const int CHM_OFF = 2;
+enum {
+       CHM_TRY = 0,
+       CHM_ON = 1,
+       CHM_OFF = 2,
 
-static const int UF_ECHO = 0x01;
-static const int UF_SGA = 0x02;
+       UF_ECHO = 0x01,
+       UF_SGA = 0x02,
 
-enum {
        TS_0 = 1,
        TS_IAC = 2,
        TS_OPT = 3,
@@ -96,6 +77,7 @@ static struct Globalvars {
        byte    charmode;
        byte    telflags;
        byte    gotsig;
+       byte    do_termios;
        /* buffer to handle telnet negotiations */
        char    iacbuf[IACBUFSIZE];
        short   iaclen; /* could even use byte */
@@ -215,7 +197,7 @@ static void handlenetoutput(int len)
         */
 
        int i, j;
-       byte * p = G.buf;
+       byte * p = (byte*)G.buf;
        byte outbuf[4*DATABUFSIZE];
 
        for (i = len, j = 0; i > 0; i--, p++)
@@ -616,15 +598,15 @@ static void fgotsig(int sig)
 
 static void rawmode(void)
 {
-       tcsetattr(0, TCSADRAIN, &G.termios_raw);
+       if (G.do_termios) tcsetattr(0, TCSADRAIN, &G.termios_raw);
 }
 
 static void cookmode(void)
 {
-       tcsetattr(0, TCSADRAIN, &G.termios_def);
+       if (G.do_termios) tcsetattr(0, TCSADRAIN, &G.termios_def);
 }
 
-extern int telnet_main(int argc, char** argv)
+int telnet_main(int argc, char** argv)
 {
        int len;
        struct sockaddr_in s_in;
@@ -635,10 +617,6 @@ extern int telnet_main(int argc, char** argv)
        int maxfd;
 #endif
 
-#ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN
-       int opt;
-#endif
-
 #ifdef CONFIG_FEATURE_AUTOWIDTH
        get_terminal_width_height(0, &win_width, &win_height);
 #endif
@@ -649,30 +627,20 @@ extern int telnet_main(int argc, char** argv)
 
        memset(&G, 0, sizeof G);
 
-       if (tcgetattr(0, &G.termios_def) < 0)
-               exit(1);
+       if (tcgetattr(0, &G.termios_def) >= 0) {
+               G.do_termios = 1;
 
-       G.termios_raw = G.termios_def;
-       cfmakeraw(&G.termios_raw);
+               G.termios_raw = G.termios_def;
+               cfmakeraw(&G.termios_raw);
+       }
 
        if (argc < 2)
                bb_show_usage();
 
 #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN
-       autologin = NULL;
-       while ((opt = getopt(argc, argv, "al:")) != EOF) {
-               switch (opt) {
-                       case 'l':
-                               autologin = optarg;
-                               break;
-                       case 'a':
-                               autologin = getenv("USER");
-                               break;
-                       case '?':
-                               bb_show_usage();
-                               break;
-               }
-       }
+       if (1 & bb_getopt_ulflags(argc, argv, "al:", &autologin))
+               autologin = getenv("USER");
+
        if (optind < argc) {
                bb_lookup_host(&s_in, argv[optind++]);
                s_in.sin_port = bb_lookup_port((optind < argc) ? argv[optind++] :
@@ -759,11 +727,3 @@ extern int telnet_main(int argc, char** argv)
                }
        }
 }
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/