Restored order of cuac above ttyc.

Fixed some style bugs for cua* and tty*.

Removed superfluous chmod for consolectl.

FIxed a tiny security bug for perfmon and changed the style for
perfmon to match the style of the non-std devices.

2 files changed, 60 insertions, 56 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index c404a1d5..00bfbc1 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -102,7 +102,7 @@
 #	perfmon	CPU performance-monitoring counters
 #	pci	PCI configuration-space access from user mode
 #
-#	$Id: MAKEDEV,v 1.124 1996/10/13 01:12:01 davidg Exp $
+#	$Id: MAKEDEV,v 1.125 1996/10/22 20:41:03 se Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:
@@ -746,42 +746,42 @@ tty0?|ttyd?|tty?)
 	chown root.wheel tty*d$unit
 	;;
 
-ttyc?)
-	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v"
+cuac?)
+	umask 7
+	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f
+		  g h i j k l m n o p q r s t u v"
 	major=48
-	card=`expr $i : 'tty.*\(.\)$'`
-
+	card=`expr $i : 'cua.*\(.\)$'`
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
 		minor=`expr $card \* 65536 + $minor`
 		name=$card$unit
-		rm -f ttyc$name ttyic$name ttylc$name
-		mknod ttyc$name c $major $minor
-		mknod ttyic$name c $major `expr $minor + 32`
-		mknod ttylc$name c $major `expr $minor + 64`
-		chown root.wheel ttyc$name ttyic$name ttylc$name
+		rm -f cuac$name cuaic$name cualc$name
+		mknod cuac$name c $major `expr $minor + 128`
+		mknod cuaic$name c $major `expr $minor + 32 + 128`
+		mknod cualc$name c $major `expr $minor + 64 + 192`
+		chown uucp.dialer cuac$name cuaic$name cualc$name
 	done
+	umask 77
 	;;
 
-cuac?)
-	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v"
+ttyc?)
+	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f
+		  g h i j k l m n o p q r s t u v"
 	major=48
-	card=`expr $i : 'cua.*\(.\)$'`
-	umask 7
-
+	card=`expr $i : 'tty.*\(.\)$'`
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
 		minor=`expr $card \* 65536 + $minor`
 		name=$card$unit
-		rm -f cuac$name cuaic$name cualc$name
-		mknod cuac$name c $major `expr $minor + 128`
-		mknod cuaic$name c $major `expr $minor + 160`
-		mknod cualc$name c $major `expr $minor + 192`
-		chown uucp.dialer cuac$name cuaic$name cualc$name
+		rm -f ttyc$name ttyic$name ttylc$name
+		mknod ttyc$name c $major $minor
+		mknod ttyic$name c $major `expr $minor + 32`
+		mknod ttylc$name c $major `expr $minor + 64`
+		chown root.wheel ttyc$name ttyic$name ttylc$name
 	done
-	umask 77
 	;;
 
 # RISCom8 'rc' driver entries
@@ -829,6 +829,7 @@ ttyA*)
 	chmod 600 si_control
 	chown root.wheel si_control
 	;;
+
 cuaA*)
 	umask 7
 	major=68
@@ -858,7 +859,6 @@ ttyD?)
 	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f"
 	major=58
 	card=`expr $i : 'tty.*\(.\)$'`
-
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
@@ -871,12 +871,12 @@ ttyD?)
 		chown root.wheel tty*D$name
 	done
 	;;
+
 cuaD?)
+	umask 7
 	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f"
 	major=58
 	card=`expr $i : 'cua.*\(.\)$'`
-	umask 7
-
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
@@ -884,8 +884,8 @@ cuaD?)
 		name=$card$unit
 		rm -f cua*D$name
 		mknod cuaD$name c $major `expr $minor + 128`
-		mknod cuaiD$name c $major `expr $minor + 160`
-		mknod cualD$name c $major `expr $minor + 192`
+		mknod cuaiD$name c $major `expr $minor + 32 + 128`
+		mknod cualD$name c $major `expr $minor + 64 + 192`
 		chown uucp.dialer cua*D$name
 	done
 	umask 77
@@ -1085,7 +1085,6 @@ sysmouse)
 	mknod sysmouse c 12 128
 	mknod consolectl c 12 255
 	chown root.wheel sysmouse consolectl
-	chmod 600 sysmouse consolectl
 	;;
 
 snp?)
@@ -1195,7 +1194,10 @@ labpc*)
 	;;
 
 perfmon)
-	mknod perfmon	c 2 32;	chmod 640 perfmon;	chown root.kmem perfmon
+	rm -f perfmon
+	mknod perfmon c 2 32
+	chown root.kmem perfmon
+	chmod 640 perfmon
 	;;
 
 local)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index c404a1d5..00bfbc1 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -102,7 +102,7 @@
 #	perfmon	CPU performance-monitoring counters
 #	pci	PCI configuration-space access from user mode
 #
-#	$Id: MAKEDEV,v 1.124 1996/10/13 01:12:01 davidg Exp $
+#	$Id: MAKEDEV,v 1.125 1996/10/22 20:41:03 se Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:
@@ -746,42 +746,42 @@ tty0?|ttyd?|tty?)
 	chown root.wheel tty*d$unit
 	;;
 
-ttyc?)
-	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v"
+cuac?)
+	umask 7
+	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f
+		  g h i j k l m n o p q r s t u v"
 	major=48
-	card=`expr $i : 'tty.*\(.\)$'`
-
+	card=`expr $i : 'cua.*\(.\)$'`
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
 		minor=`expr $card \* 65536 + $minor`
 		name=$card$unit
-		rm -f ttyc$name ttyic$name ttylc$name
-		mknod ttyc$name c $major $minor
-		mknod ttyic$name c $major `expr $minor + 32`
-		mknod ttylc$name c $major `expr $minor + 64`
-		chown root.wheel ttyc$name ttyic$name ttylc$name
+		rm -f cuac$name cuaic$name cualc$name
+		mknod cuac$name c $major `expr $minor + 128`
+		mknod cuaic$name c $major `expr $minor + 32 + 128`
+		mknod cualc$name c $major `expr $minor + 64 + 192`
+		chown uucp.dialer cuac$name cuaic$name cualc$name
 	done
+	umask 77
 	;;
 
-cuac?)
-	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v"
+ttyc?)
+	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f
+		  g h i j k l m n o p q r s t u v"
 	major=48
-	card=`expr $i : 'cua.*\(.\)$'`
-	umask 7
-
+	card=`expr $i : 'tty.*\(.\)$'`
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
 		minor=`expr $card \* 65536 + $minor`
 		name=$card$unit
-		rm -f cuac$name cuaic$name cualc$name
-		mknod cuac$name c $major `expr $minor + 128`
-		mknod cuaic$name c $major `expr $minor + 160`
-		mknod cualc$name c $major `expr $minor + 192`
-		chown uucp.dialer cuac$name cuaic$name cualc$name
+		rm -f ttyc$name ttyic$name ttylc$name
+		mknod ttyc$name c $major $minor
+		mknod ttyic$name c $major `expr $minor + 32`
+		mknod ttylc$name c $major `expr $minor + 64`
+		chown root.wheel ttyc$name ttyic$name ttylc$name
 	done
-	umask 77
 	;;
 
 # RISCom8 'rc' driver entries
@@ -829,6 +829,7 @@ ttyA*)
 	chmod 600 si_control
 	chown root.wheel si_control
 	;;
+
 cuaA*)
 	umask 7
 	major=68
@@ -858,7 +859,6 @@ ttyD?)
 	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f"
 	major=58
 	card=`expr $i : 'tty.*\(.\)$'`
-
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
@@ -871,12 +871,12 @@ ttyD?)
 		chown root.wheel tty*D$name
 	done
 	;;
+
 cuaD?)
+	umask 7
 	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f"
 	major=58
 	card=`expr $i : 'cua.*\(.\)$'`
-	umask 7
-
 	for unit in $portlist
 	do
 		minor=`ttyminor $unit`
@@ -884,8 +884,8 @@ cuaD?)
 		name=$card$unit
 		rm -f cua*D$name
 		mknod cuaD$name c $major `expr $minor + 128`
-		mknod cuaiD$name c $major `expr $minor + 160`
-		mknod cualD$name c $major `expr $minor + 192`
+		mknod cuaiD$name c $major `expr $minor + 32 + 128`
+		mknod cualD$name c $major `expr $minor + 64 + 192`
 		chown uucp.dialer cua*D$name
 	done
 	umask 77
@@ -1085,7 +1085,6 @@ sysmouse)
 	mknod sysmouse c 12 128
 	mknod consolectl c 12 255
 	chown root.wheel sysmouse consolectl
-	chmod 600 sysmouse consolectl
 	;;
 
 snp?)
@@ -1195,7 +1194,10 @@ labpc*)
 	;;
 
 perfmon)
-	mknod perfmon	c 2 32;	chmod 640 perfmon;	chown root.kmem perfmon
+	rm -f perfmon
+	mknod perfmon c 2 32
+	chown root.kmem perfmon
+	chmod 640 perfmon
 	;;
 
 local)