From d27787fba7902466d65ef03f737a63ce168f4aa1 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 18 Mar 2005 21:52:04 +0000
Subject: cleanup

---
 src/cmd/samterm/io.c      | 14 +++++++-------
 src/cmd/samterm/main.c    |  1 -
 src/cmd/samterm/samterm.h |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/cmd/samterm/io.c b/src/cmd/samterm/io.c
index d9cf2e83..7c653aa4 100644
--- a/src/cmd/samterm/io.c
+++ b/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;
@@ -122,12 +128,6 @@ again:
 	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;
 	alts[RResize].op = CHANRCV;
@@ -262,7 +262,7 @@ ekbd(void)
 int
 kbdchar(void)
 {
-	int i, c;
+	int c, i;
 
 	c = externchar();
 	if(c > 0)
diff --git a/src/cmd/samterm/main.c b/src/cmd/samterm/main.c
index 79870315..3f232aab 100644
--- a/src/cmd/samterm/main.c
+++ b/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);
diff --git a/src/cmd/samterm/samterm.h b/src/cmd/samterm/samterm.h
index 5ba7c315..e4803d59 100644
--- a/src/cmd/samterm/samterm.h
+++ b/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*);
-- 
cgit v1.2.3