commit d27787fba7902466d65ef03f737a63ce168f4aa1
from: rsc <devnull@localhost>
date: Fri Mar 18 21:52:04 2005 UTC

cleanup

commit - b5932d3d2a47d3cc111e84d6f015ce25242a83a9
commit + d27787fba7902466d65ef03f737a63ce168f4aa1
blob - d9cf2e83348b7576b9348b951ff54ca0ad2492fe
blob + 7c653aa4837f8e23dcc766bdc767bb7239826c55
--- src/cmd/samterm/io.c
+++ src/cmd/samterm/io.c
@@ -104,6 +104,12 @@ waitforio(void)
 	ulong type;
 
 again:
+	alts[RPlumb].c = plumbc;
+	alts[RPlumb].v = &i;
+	alts[RPlumb].op = CHANRCV;
+	if((block & (1<<RPlumb)) || plumbc == nil)
+		alts[RPlumb].op = CHANNOP;
+
 	alts[RHost].c = hostc;
 	alts[RHost].v = &i;
 	alts[RHost].op = CHANRCV;
@@ -121,12 +127,6 @@ again:
 	alts[RMouse].op = CHANRCV;
 	if(block & (1<<RMouse))
 		alts[RMouse].op = CHANNOP;
-
-	alts[RPlumb].c = plumbc;
-	alts[RPlumb].v = &i;
-	alts[RPlumb].op = CHANRCV;
-	if((block & (1<<RPlumb)) || plumbc == nil)
-		alts[RPlumb].op = CHANNOP;
 
 	alts[RResize].c = mousectl->resizec;
 	alts[RResize].v = nil;
@@ -262,7 +262,7 @@ ekbd(void)
 int
 kbdchar(void)
 {
-	int i, c;
+	int c, i;
 
 	c = externchar();
 	if(c > 0)
blob - 79870315e3c1ebff69eb6013b79deb0e1adf0830
blob + 3f232aabc41d54ce55325b1cd9336ef301b8122a
--- src/cmd/samterm/main.c
+++ src/cmd/samterm/main.c
@@ -50,7 +50,6 @@ threadmain(int argc, char *argv[])
 	open("/dev/null", OREAD);
 	if(open("/dev/tty", OWRITE) < 0)
 		open("/dev/null", OWRITE);
-dup(2, 1);
 
 	if(protodebug) print("getscreen\n");
 	getscreen(argc, argv);
blob - 5ba7c31504a862bb50c05fe3354df0619caa491f
blob + e4803d5986c4a6ed39f46b90668fce92e1efb18b
--- src/cmd/samterm/samterm.h
+++ src/cmd/samterm/samterm.h
@@ -88,7 +88,7 @@ extern int	hversion;
 extern int	plumbfd;
 extern int	hostfd[2];
 extern int	exiting;
-extern int autoindent;
+extern int	autoindent;
 
 #define gettext sam_gettext	/* stupid gcc built-in functions */
 Rune	*gettext(Flayer*, long, ulong*);