From 7bb4c06a28547f9aaed057eab1cd86d6b15cc0c6 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 11 Jan 1996 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1996-01-11

---
 boot/boot.c           |  2 --
 boot/boot.h           |  1 -
 boot/doauthenticate.c | 19 ++++++++++---------
 port/devns16552.c     |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/boot/boot.c b/boot/boot.c
index 7bd3ad082e85bce00992f5262471156b5a27750d..74d9474bf9d7b97e3afa25b3213fe98f1e5a2e73 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -19,7 +19,6 @@ int	mflag;
 int	fflag;
 int	kflag;
 int	aflag;
-int	afd = -1;
 
 char	*bargv[Nbarg];
 int	bargc;
@@ -153,7 +152,6 @@ boot(int argc, char *argv[])
 	}
 
 	settime(islocal);
-	close(afd);
 	swapproc();
 
 	sprint(cmd, "/%s/init", cputype);
diff --git a/boot/boot.h b/boot/boot.h
index 6f62bd81d8558a7140887b21bb41665f90f244c7..59dc3720d36392c4cc3930a17b04a9dd96eeeb4f 100644
--- a/boot/boot.h
+++ b/boot/boot.h
@@ -28,7 +28,6 @@ enum
 };
 extern int	bargc;
 extern char	*bargv[Nbarg];
-extern int	afd;
 
 /* libc equivalent */
 extern int	cache(int);
diff --git a/boot/doauthenticate.c b/boot/doauthenticate.c
index ba549ddf200f73dbc890ac2a7f76bfaf8b727a92..9f5077347b0924c638d00c94ce16f25d188c3b17 100644
--- a/boot/doauthenticate.c
+++ b/boot/doauthenticate.c
@@ -22,22 +22,21 @@ readn(int fd, char *buf, int len)
 static char*
 fromauth(Method *mp, char *trbuf, char *tbuf)
 {
+	int afd;
 	char t;
 	char *msg;
 	static char error[2*ERRLEN];
 
-	if(afd < 0){
-		if(mp->auth == 0)
-			fatal("no method for accessing auth server");
-		afd = (*mp->auth)();
-		if(afd < 0) {
-			sprint(error, "%s: %r", ccmsg);
-			return error;
-		}
+	if(mp->auth == 0)
+		fatal("no method for accessing auth server");
+	afd = (*mp->auth)();
+	if(afd < 0) {
+		sprint(error, "%s: %r", ccmsg);
+		return error;
 	}
+
 	if(write(afd, trbuf, TICKREQLEN) < 0 || read(afd, &t, 1) != 1){
 		close(afd);
-		afd = -1;
 		sprint(error, "%s: %r", pbmsg);
 		return error;
 	}
@@ -63,6 +62,8 @@ fromauth(Method *mp, char *trbuf, char *tbuf)
 		msg = pbmsg;
 		break;
 	}
+
+	close(afd);
 	return msg;
 }
 
diff --git a/port/devns16552.c b/port/devns16552.c
index d38e6c21a500d6eeb4b379d0a1beba14d2248902..e0882db5a896b7ec3534f4c739bd49bb12d01c16 100644
--- a/port/devns16552.c
+++ b/port/devns16552.c
@@ -359,7 +359,7 @@ ns16552disable(Uart *p)
 	Uart **l;
 
 	/*
- 	 *  turn off interrpts
+ 	 *  turn off interrupts
 	 */
 	p->sticky[Iena] = 0;
 	uartwrreg(p, Iena, 0);
@@ -462,7 +462,7 @@ ns16552setup0(Uart *p)
 	 *  set rate to 9600 baud.
 	 *  8 bits/character.
 	 *  1 stop bit.
-	 *  interrpts enabled.
+	 *  interrupts enabled.
 	 */
 	p->sticky[Format] = Bits8;
 	uartwrreg(p, Format, 0);