summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-03-19 14:52:26 +0000
committerDenis Vlasenko2007-03-19 14:52:26 +0000
commit54e3d1f00d161ee6713d9f8795fe54ad3af61122 (patch)
tree8b2deaa360da113b349109fe6729ffd45a58e03c
parentf24cdf1554a4481bf7c86eb167d62dc7c67f8026 (diff)
downloadbusybox-54e3d1f00d161ee6713d9f8795fe54ad3af61122.zip
busybox-54e3d1f00d161ee6713d9f8795fe54ad3af61122.tar.gz
telnet: finish style cleanup bits
-rw-r--r--networking/telnet.c39
1 files changed, 10 insertions, 29 deletions
diff --git a/networking/telnet.c b/networking/telnet.c
index 82dbb58..cd88a9b 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -72,7 +72,8 @@ struct globals {
int win_width, win_height;
#endif
/* same buffer used both for network and console read/write */
- char buf[DATABUFSIZE]; /* allocating so static size is smaller */
+ char buf[DATABUFSIZE];
+ /* buffer to handle telnet negotiations */
char iacbuf[IACBUFSIZE];
struct termios termios_def;
struct termios termios_raw;
@@ -97,8 +98,7 @@ static void iacflush(void)
#define write_str(fd, str) write(fd, str, sizeof(str) - 1)
-static void /* buffer to handle telnet negotiations */
-doexit(int ev)
+static void doexit(int ev)
{
cookmode();
exit(ev);
@@ -151,6 +151,7 @@ static void conescape(void)
G.gotsig = 0;
}
+
static void handlenetoutput(int len)
{
/* here we could do smart tricks how to handle 0xFF:s in output
@@ -191,7 +192,6 @@ static void handlenetoutput(int len)
write(G.netfd, outbuf, j);
}
-
static void handlenetinput(int len)
{
int i;
@@ -266,15 +266,11 @@ static void handlenetinput(int len)
write(1, G.buf, len);
}
-
-/* ******************************* */
-
static void putiac(int c)
{
G.iacbuf[G.iaclen++] = c;
}
-
static void putiac2(byte wwdd, byte c)
{
if (G.iaclen + 3 > IACBUFSIZE)
@@ -354,24 +350,17 @@ static void putiac_naws(byte c, int x, int y)
}
#endif
-/* void putiacstring (subneg strings) */
-
-/* ******************************* */
-
static char const escapecharis[] = "\r\nEscape character is ";
static void setConMode(void)
{
- if (G.telflags & UF_ECHO)
- {
+ if (G.telflags & UF_ECHO) {
if (G.charmode == CHM_TRY) {
G.charmode = CHM_ON;
printf("\r\nEntering character mode%s'^]'.\r\n", escapecharis);
rawmode();
}
- }
- else
- {
+ } else {
if (G.charmode != CHM_OFF) {
G.charmode = CHM_OFF;
printf("\r\nEntering line mode%s'^C'.\r\n", escapecharis);
@@ -380,8 +369,6 @@ static void setConMode(void)
}
}
-/* ******************************* */
-
static void will_charmode(void)
{
G.charmode = CHM_TRY;
@@ -404,8 +391,6 @@ static void do_linemode(void)
iacflush();
}
-/* ******************************* */
-
static void to_notsup(char c)
{
if (G.telwish == WILL)
@@ -517,11 +502,7 @@ static void telopt(byte c)
}
}
-
-/* ******************************* */
-
/* subnegotiation -- ignore all (except TTYPE,NAWS) */
-
static int subneg(byte c)
{
switch (G.telstate) {
@@ -548,8 +529,6 @@ static int subneg(byte c)
return FALSE;
}
-/* ******************************* */
-
static void fgotsig(int sig)
{
G.gotsig = sig;
@@ -558,12 +537,14 @@ static void fgotsig(int sig)
static void rawmode(void)
{
- if (G.do_termios) tcsetattr(0, TCSADRAIN, &G.termios_raw);
+ if (G.do_termios)
+ tcsetattr(0, TCSADRAIN, &G.termios_raw);
}
static void cookmode(void)
{
- if (G.do_termios) tcsetattr(0, TCSADRAIN, &G.termios_def);
+ if (G.do_termios)
+ tcsetattr(0, TCSADRAIN, &G.termios_def);
}
void BUG_telnet_globals_too_big(void);