From 840d172649033a2b1dd1db05e65cf2f432b043cc Mon Sep 17 00:00:00 2001
From: phil <phil@NetBSD.org>
Date: Tue, 22 Jul 1997 23:13:05 +0000
Subject: [PATCH] Make all MAKEDEVs make fd/* similar. No need for awk or expr.
 Inspired by PR 3420.  Some MAKEDEVS had the fd separated out of std and fd
 added to std.

---
 etc/etc.alpha/MAKEDEV   | 10 ++++++----
 etc/etc.amiga/MAKEDEV   | 10 ++++++----
 etc/etc.arm32/MAKEDEV   | 10 ++++++----
 etc/etc.atari/MAKEDEV   | 11 ++++++-----
 etc/etc.hp300/MAKEDEV   | 10 ++++++----
 etc/etc.i386/MAKEDEV    |  7 ++++---
 etc/etc.mac68k/MAKEDEV  | 10 ++++++----
 etc/etc.mvme68k/MAKEDEV | 10 ++++++----
 etc/etc.pc532/MAKEDEV   | 10 ++++++----
 etc/etc.pmax/MAKEDEV    | 16 +++++++++++-----
 etc/etc.sparc/MAKEDEV   | 24 +++++++++++++++---------
 etc/etc.sun3/MAKEDEV    | 14 ++++++++------
 etc/etc.vax/MAKEDEV     | 16 +++++++++++-----
 etc/etc.x68k/MAKEDEV    | 11 ++++++-----
 14 files changed, 103 insertions(+), 66 deletions(-)

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index e60ca18a0e4e..26b5b6177003 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV,v 1.17 1997/07/13 19:29:17 hpeyerl Exp $
+#	$NetBSD: MAKEDEV,v 1.18 1997/07/22 23:13:05 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -110,9 +110,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 10 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 10 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index b1d7217b9db7..51a51d7c4ef5 100644
--- a/etc/etc.amiga/MAKEDEV
+++ b/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.28 1997/07/07 22:26:54 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.29 1997/07/22 23:13:09 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -137,9 +137,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 21 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 21 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.arm32/MAKEDEV b/etc/etc.arm32/MAKEDEV
index 0b8cf9261063..d3ca8f782d10 100644
--- a/etc/etc.arm32/MAKEDEV
+++ b/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.9 1997/07/17 00:12:55 mark Exp $
+#	$NetBSD: MAKEDEV,v 1.10 1997/07/22 23:13:11 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -136,9 +136,11 @@ ttyv*)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-	 		printf("mknod %d c 34 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 34 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.atari/MAKEDEV b/etc/etc.atari/MAKEDEV
index e192d5212b43..ac7791ef82e5 100644
--- a/etc/etc.atari/MAKEDEV
+++ b/etc/etc.atari/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.17 1997/07/07 22:26:59 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.18 1997/07/22 23:13:13 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -130,10 +130,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && i=0 && while [ $i -lt 64 ]; do
-		mknod $i c 18 $i
-		i=$(($i+1))
-		done)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 18 $n
+		n=$(($n+1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 44e69960bbed..19496e228764 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.17 1997/07/07 22:27:00 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.18 1997/07/22 23:13:16 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -98,9 +98,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 21 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 21 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 4f6c40b357c5..4c9dcb997d9e 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.52 1997/07/13 19:16:59 hpeyerl Exp $
+#	$NetBSD: MAKEDEV,v 1.53 1997/07/22 23:13:18 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -138,8 +138,9 @@ ttyv*)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	n=0; while [ $n -lt 64 ]; do
-		mknod fd/$n	c 22 $n
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 22 $n
 		n=$(($n + 1))
 	done
 	chown -R bin.bin fd
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 490041924eab..823fd39cfc59 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -20,7 +20,7 @@
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #	from: @(#)MAKEDEV	5.2 (Berkeley) 6/22/90
-#	$NetBSD: MAKEDEV,v 1.26 1997/07/07 22:27:04 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.27 1997/07/22 23:13:20 phil Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	a smattering--at least one of each except
@@ -127,9 +127,11 @@ adb)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-	 		printf("mknod %d c 21 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 21 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 9c8e8d4c1937..67bc4fa38a12 100755
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.7 1997/07/07 22:27:05 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.8 1997/07/22 23:13:24 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -91,9 +91,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-	 		printf("mknod %d c 21 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 21 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.pc532/MAKEDEV b/etc/etc.pc532/MAKEDEV
index 4713b190018c..209a9f1d0d77 100644
--- a/etc/etc.pc532/MAKEDEV
+++ b/etc/etc.pc532/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.13 1997/07/07 22:27:07 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.14 1997/07/22 23:13:26 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -99,9 +99,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-	 		printf("mknod %d c 11 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 11 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.pmax/MAKEDEV b/etc/etc.pmax/MAKEDEV
index 1296259de4f1..f84f2f1b9381 100644
--- a/etc/etc.pmax/MAKEDEV
+++ b/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.7 1997/07/07 22:27:09 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.8 1997/07/22 23:13:31 phil Exp $
 #
 #	from: @(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
@@ -39,7 +39,7 @@ do
 case $i in
 
 all)
-	sh MAKEDEV std rz0 rz1 rz2 rz3 rz4 tz0 tz1
+	sh MAKEDEV std fd rz0 rz1 rz2 rz3 rz4 tz0 tz1
 	sh MAKEDEV cd0
 	sh MAKEDEV pty0 vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV tun0 tun1 tun2 tun3
@@ -62,10 +62,16 @@ std)
 	mknod stdin		c 7 0	; chmod 666 stdin
 	mknod stdout		c 7 1	; chmod 666 stdout
 	mknod stderr		c 7 2	; chmod 666 stderr
+	;;
+
+fd)
+	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 7 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 7 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 60ead2ac7108..31a242736958 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.25 1997/07/07 22:27:10 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.26 1997/07/22 23:13:32 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -79,7 +79,7 @@ do
 case $i in
 
 all)
-	sh -$- $0 std sd0 sd1 sd2 sd3 sd4 xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3
+	sh -$- $0 std fd sd0 sd1 sd2 sd3 sd4 xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3
 	sh -$- $0 cd0 st0 st1 fd0
 	sh -$- $0 pty0 vnd0 vnd1 vnd2 vnd3 audio tun0 tun1 tun2 tun3
 	sh -$- $0 ccd0 ccd1 ccd2 ccd3
@@ -103,13 +103,6 @@ std)
 	mknod stdin		c 24 0	; chmod 666 stdin
 	mknod stdout		c 24 1	; chmod 666 stdout
 	mknod stderr		c 24 2	; chmod 666 stderr
-	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 24 %d;", i, i)}'`)
-	chown -R bin.bin fd
-	chmod 555 fd
-	chmod 666 fd/*
 
 	mknod ttya		c 12 0
 	mknod ttyb		c 12 1
@@ -118,6 +111,19 @@ std)
 	mknod kbd		c 29 0 ; chmod 666 kbd
 	;;
 
+fd)
+	rm -f fd/*
+	mkdir fd > /dev/null 2>&1
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 24 $n
+		n=$(($n + 1))
+	done
+	chown -R bin.bin fd
+	chmod 555 fd
+	chmod 666 fd/*
+	;;
+
 bwtwo*)
 	unit=${i#bwtwo}
 	rm -f bwtwo$unit
diff --git a/etc/etc.sun3/MAKEDEV b/etc/etc.sun3/MAKEDEV
index 9b82d10450fe..ceb710097625 100644
--- a/etc/etc.sun3/MAKEDEV
+++ b/etc/etc.sun3/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.11 1997/05/06 18:42:27 gwr Exp $
+#	$NetBSD: MAKEDEV,v 1.12 1997/07/22 23:13:34 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -118,12 +118,14 @@ std)
 	;;
 
 fd)
-	mkdir fd >/dev/null 2>&1
-	i=0 ; while [ $i != 64 ]
-	do
-		mk fd/$i c 23 $i
-		i=`expr $i + 1`
+	rm -f fd/*
+	mkdir fd > /dev/null 2>&1
+	n=0
+	while [ $n -lt 64 ]; do
+		mk fd/$n c 23 $n
+		n=$(($n + 1))
 	done
+	chown -R bin.bin fd
 	;;
 
 bpf*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index d7c8c2178102..b581ab4bf510 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV,v 1.8 1997/07/07 22:27:12 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.9 1997/07/22 23:13:36 phil Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
@@ -66,7 +66,7 @@ do
 case $i in
 
 all)
-	sh $0 std vnd0 ccd0 pty0 pty1 lkm
+	sh $0 std fd vnd0 ccd0 pty0 pty1 lkm
 	sh $0 mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0
 	sh $0 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 sd0 sd1 sd2 sd3 rd0 rd1 rd2
 	sh $0 dz0 dl0 dhu0
@@ -95,10 +95,16 @@ std)
 	mknod ipnat		c 42 1	; chmod 600 ipnat
 	mknod ipstate		c 42 2	; chmod 600 ipstate
 	mknod ipauth		c 42 3	; chmod 600 ipauth
+	;;
+
+fd)
+	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 53 %d;", i, i)}'`)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 53 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*
diff --git a/etc/etc.x68k/MAKEDEV b/etc/etc.x68k/MAKEDEV
index 4fe311312e7b..88df41bb6ae0 100755
--- a/etc/etc.x68k/MAKEDEV
+++ b/etc/etc.x68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.9 1997/07/07 22:29:35 veego Exp $
+#	$NetBSD: MAKEDEV,v 1.10 1997/07/22 23:13:38 phil Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -128,10 +128,11 @@ std)
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
-	(cd fd && i=0 && while [ $i -lt 64 ]; do
-		mknod $i c 21 $i
-		i=$(($i+1))
-		done)
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 21 $n
+		n=$(($n + 1))
+	done
 	chown -R bin.bin fd
 	chmod 555 fd
 	chmod 666 fd/*