From ee2abc0b62349d0733e14e7ff332496a214fdbaf Mon Sep 17 00:00:00 2001
From: mickey <>
Date: Mon, 8 Dec 1997 21:27:43 +0000
Subject: [PATCH] fix chN (N > 0) problem

---
 src/etc/etc.alpha/MAKEDEV   | 4 ++--
 src/etc/etc.amiga/MAKEDEV   | 4 ++--
 src/etc/etc.arm32/MAKEDEV   | 4 ++--
 src/etc/etc.i386/MAKEDEV    | 4 ++--
 src/etc/etc.mac68k/MAKEDEV  | 4 ++--
 src/etc/etc.powerpc/MAKEDEV | 4 ++--
 src/etc/etc.sparc/MAKEDEV   | 5 ++---
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index bd8efe5f..8ab4e53c 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.28 1997/09/16 06:00:49 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.29 1997/12/08 21:27:34 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -336,7 +336,7 @@ ch*)
 	ch*) name=ch;	chr=14;;
 	esac
 	rm -f $name$unit
-	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
+	mknod ${name}${unit}	c $chr $unit
 	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index c66fd17a..67a23dbb 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.29 1997/10/16 07:29:56 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.30 1997/12/08 21:27:37 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -321,7 +321,7 @@ ch*)
 	ch*) name=ch;  chr=40;;
 	esac
 	rm -f $name$unit
-	mknod $name$unit	c $chr `expr $unit '*' 16 + 0`
+	mknod $name$unit	c $chr $unit
 	chown root.operator $name$unit
 	chmod 640 $name$unit
 	umask 77
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index 6e17e347..54b8da47 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.10 1997/09/16 06:00:54 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.11 1997/12/08 21:27:38 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -267,7 +267,7 @@ ch*)
 	ch*) name=ch;  chr=27;;
 	esac
 	rm -f $name$unit
-	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
+	mknod ${name}${unit}	c $chr $unit
 	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 90bda7d0..3ccf2a05 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.52 1997/10/06 05:17:17 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.53 1997/12/08 21:27:39 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -419,7 +419,7 @@ ch*)
 	ch*) name=ch;  chr=17;;
 	esac
 	rm -f $name$unit
-	mknod $name$unit	c $chr `expr $unit '*' 16 + 0`
+	mknod $name$unit	c $chr $unit
 	chown root.operator $name$unit
 	chmod 640 $name$unit
 	umask 77
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 23773a03..e3c9fe5f 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.20 1997/09/16 06:01:00 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.21 1997/12/08 21:27:41 mickey Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -300,7 +300,7 @@ ch*)
 	rm -f $name$unit
 	case $unit in
 	0|1|2|3|4|5|6)
-		mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
+		mknod ${name}${unit}	c $chr $unit
 		chown root.operator ${name}${unit}
 		chmod 640 ${name}${unit}
 		;;
diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV
index 848c3776..e4edf21d 100644
--- a/src/etc/etc.powerpc/MAKEDEV
+++ b/src/etc/etc.powerpc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#       $OpenBSD: MAKEDEV,v 1.13 1997/10/13 14:45:06 pefo Exp $
+#       $OpenBSD: MAKEDEV,v 1.14 1997/12/08 21:27:42 mickey Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -322,7 +322,7 @@ ch*)
 	rm -f $name$unit
 	case $unit in
 	0|1|2|3|4|5|6)
-		mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
+		mknod ${name}${unit}	c $chr $unit
 		chgrp operator ${name}${unit}
 		chmod 640 ${name}${unit}
 		;;
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index af0337e2..c55f5f0f 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.33 1997/09/16 03:03:03 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.34 1997/12/08 21:27:43 mickey Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -454,8 +454,7 @@ ch*)
 	ch*) name=ch;  chr=19;;
 	esac
 	rm -f $name$unit
-	sixt=`mult $unit 16`
-	mknod $name$unit	c $chr `add $sixt 0`
+	mknod $name$unit	c $chr $unit
 	chown root.operator $name$unit
 	chmod 640 $name$unit
 	umask 77