From 96baf03c0d0764e389b69a73b29dea39918bc76e Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 7 Feb 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-02-07

---
 carrera/kbd.c | 2 ++
 pc/devastar.c | 2 +-
 pc/devvga.c   | 1 +
 pc/kbd.c      | 2 ++
 port/error.h  | 2 +-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/carrera/kbd.c b/carrera/kbd.c
index b45363eec81b83ac30bd5b3c2e48678dc2409ffd..9c0ff717c0367dbfb37349db57ed69bf864cf142 100644
--- a/carrera/kbd.c
+++ b/carrera/kbd.c
@@ -406,4 +406,6 @@ mousectl(char *cmd)
 		mousecmd(0xF4);	/* enabled */
 		splx(s);
 	}
+	else
+		error(Ebadctl);
 }
diff --git a/pc/devastar.c b/pc/devastar.c
index 298afbe97527935d62cba66a9f3773e4c68786c0..1b0087633aafd0e292fcd3f966a5c4808a0252e8 100644
--- a/pc/devastar.c
+++ b/pc/devastar.c
@@ -546,7 +546,7 @@ astaropen(Chan *c, int omode)
 		qlock(ac);
 		if(waserror()){
 			qunlock(ac);
-			ac->qopens--;
+			ac->opens--;
 			nexterror();
 		}
 		if(ac->opens++ == 0){
diff --git a/pc/devvga.c b/pc/devvga.c
index 72234657d439ac14b4735b37e08dbb9575b64daf..0519cef4ede49557e0d5946ec2fec5b6452206af 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -290,6 +290,7 @@ vgactl(char *arg)
 		case 1:
 			z = 0; break;
 		default:
+			z = 0;
 			error(Ebadarg);
 		}
 		interlaced[0] = *cp;
diff --git a/pc/kbd.c b/pc/kbd.c
index 33d02e85e241cef395bb624d639d75e08e9362c1..93cea3622a130f9979b0ced18e74e26dcb6dd159 100644
--- a/pc/kbd.c
+++ b/pc/kbd.c
@@ -590,6 +590,8 @@ mousectl(char *arg)
 		}
 	} else if(strcmp(field[0], "swap") == 0)
 		mouseswap ^= 1;
+	else
+		error(Ebadctl);
 }
 
 void
diff --git a/port/error.h b/port/error.h
index e38a94b7b08dafde19b30a22554f97e9355f957a..b5191837b7a7b86108d47e8c0419e285b6113429 100644
--- a/port/error.h
+++ b/port/error.h
@@ -26,7 +26,7 @@ extern char Enoport[];		/* network port not available */
 extern char Enoifc[];		/* bad interface or no free interface slots */
 extern char Enolisten[];	/* not announced */
 extern char Ehungup[];		/* write to hungup channel */
-extern char Ebadctl[];		/* bad process or stream control request */
+extern char Ebadctl[];		/* bad process or channel control request */
 extern char Enodev[];		/* no free devices */
 extern char Enoenv[];		/* no free environment resources */
 extern char Emuxshutdown[];	/* mux server shut down */