svn commit: trunk/busybox/networking

vda at busybox.net vda at busybox.net
Mon Mar 19 14:52:27 UTC 2007


Author: vda
Date: 2007-03-19 07:52:26 -0700 (Mon, 19 Mar 2007)
New Revision: 18163

Log:
telnet: finish style cleanup bits


Modified:
   trunk/busybox/networking/telnet.c


Changeset:
Modified: trunk/busybox/networking/telnet.c
===================================================================
--- trunk/busybox/networking/telnet.c	2007-03-19 14:47:09 UTC (rev 18162)
+++ trunk/busybox/networking/telnet.c	2007-03-19 14:52:26 UTC (rev 18163)
@@ -72,7 +72,8 @@
 	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 @@
 
 #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 @@
 	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 @@
 		write(G.netfd, outbuf, j);
 }
 
-
 static void handlenetinput(int len)
 {
 	int i;
@@ -266,15 +266,11 @@
 		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 @@
 }
 #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 will_charmode(void)
 {
 	G.charmode = CHM_TRY;
@@ -404,8 +391,6 @@
 	iacflush();
 }
 
-/* ******************************* */
-
 static void to_notsup(char c)
 {
 	if (G.telwish == WILL)
@@ -517,11 +502,7 @@
 	}
 }
 
-
-/* ******************************* */
-
 /* subnegotiation -- ignore all (except TTYPE,NAWS) */
-
 static int subneg(byte c)
 {
 	switch (G.telstate) {
@@ -548,8 +529,6 @@
 	return FALSE;
 }
 
-/* ******************************* */
-
 static void fgotsig(int sig)
 {
 	G.gotsig = sig;
@@ -558,12 +537,14 @@
 
 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);




More information about the busybox-cvs mailing list