projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- spelling
[oweals/busybox.git]
/
networking
/
telnet.c
diff --git
a/networking/telnet.c
b/networking/telnet.c
index 3143631886e20f22b14d2115ab7fa401d8d9b511..c835c7a4525b2450fdc820428e4cdc551614852c 100644
(file)
--- a/
networking/telnet.c
+++ b/
networking/telnet.c
@@
-35,7
+35,7
@@
#include "busybox.h"
#if 0
#include "busybox.h"
#if 0
-
static const int DOTRACE = 1
;
+
enum { DOTRACE = 1 }
;
#endif
#ifdef DOTRACE
#endif
#ifdef DOTRACE
@@
-45,24
+45,17
@@
static const int DOTRACE = 1;
#define TRACE(x, y)
#endif
#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
#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,
TS_0 = 1,
TS_IAC = 2,
TS_OPT = 3,
@@
-204,7
+197,7
@@
static void handlenetoutput(int len)
*/
int i, j;
*/
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++)
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);
}
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;
{
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");
#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++] :
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:
-*/