X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Ftelnet.c;h=c835c7a4525b2450fdc820428e4cdc551614852c;hb=5929edc1fac4340f99ed84e92bf3a2bedd4177c2;hp=3143631886e20f22b14d2115ab7fa401d8d9b511;hpb=5a16a8942706839a57a600b5d11059ddfe2f94cd;p=oweals%2Fbusybox.git

diff --git a/networking/telnet.c b/networking/telnet.c
index 314363188..c835c7a45 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -35,7 +35,7 @@
 #include "busybox.h"
 
 #if 0
-static const int DOTRACE = 1;
+enum { DOTRACE = 1 };
 #endif
 
 #ifdef DOTRACE
@@ -45,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,
@@ -204,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++)
@@ -613,7 +606,7 @@ static void cookmode(void)
 	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;
@@ -647,7 +640,7 @@ extern int telnet_main(int argc, char** argv)
 #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN
 	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++] :
@@ -734,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:
-*/