Use shell arithmetic rather than expr(1), per Charles Hannum. (Wow,

a major speed improvement on an hp319!)
This commit is contained in:
thorpej 1997-01-05 21:21:43 +00:00
parent ea9ed8902e
commit e83414c602
1 changed files with 35 additions and 35 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
# $NetBSD: MAKEDEV,v 1.13 1997/01/05 21:21:43 thorpej Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@ -105,16 +105,16 @@ fd)
;;
ct*|mt*|st*)
umask 0 ; unit=`expr $i : '..\(.*\)'`
umask 0
case $i in
ct*) name=ct; blk=0; chr=7;;
mt*) name=mt; blk=1; chr=16;;
st*) name=st; blk=6; chr=20;;
ct*) name=ct; unit=${i#ct}; blk=0; chr=7;;
mt*) name=mt; unit=${i#mt}; blk=1; chr=16;;
st*) name=st; unit=${i#st}; blk=6; chr=20;;
esac
case $unit in
0|1|2|3|4|5|6|7)
four=`expr $unit + 4` ; eight=`expr $unit + 8`
twelve=`expr $unit + 12`; twenty=`expr $unit + 20`
four=$(($unit + 4)) ; eight=$(($unit + 8))
twelve=$(($unit + 12)) ; twenty=$(($unit + 20))
#
# block devices don't work so don't make them
#rm -f ${name}${unit} ${name}${four} ${name}${eight} \
@ -143,7 +143,7 @@ ct*|mt*|st*)
;;
bpf*)
unit=`expr $i : 'bpf\(.*\)'`
unit=${i#bpf}
rm -f bpf$unit
mknod bpf$unit c 22 $unit
chmod 600 bpf$unit
@ -151,7 +151,7 @@ bpf*)
;;
tun*)
unit=`expr $i : 'tun\(.*\)'`
unit=${i#tun}
rm -f tun$unit
mknod tun$unit c 23 $unit
chmod 600 tun$unit
@ -159,33 +159,33 @@ tun*)
;;
ccd*|fd*|rd*|sd*|vnd*)
umask 2 ; unit=`expr $i : '.*d\(.*\)'`
umask 2
case $i in
rd*) name=rd; blk=2; chr=9;;
sd*) name=sd; blk=4; chr=8;;
ccd*) name=ccd; blk=5; chr=17;;
vnd*) name=vnd; blk=6; chr=19;;
rd*) name=rd; unit=${i#rd}; blk=2; chr=9;;
sd*) name=sd; unit=${i#sd}; blk=4; chr=8;;
ccd*) name=ccd; unit=${i#ccd}; blk=5; chr=17;;
vnd*) name=vnd; unit=${i#vnd}; blk=6; chr=19;;
esac
case $unit in
0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\
17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)
rm -f $name$unit? r$name$unit?
mknod ${name}${unit}a b $blk `expr $unit '*' 8 + 0`
mknod ${name}${unit}b b $blk `expr $unit '*' 8 + 1`
mknod ${name}${unit}c b $blk `expr $unit '*' 8 + 2`
mknod ${name}${unit}d b $blk `expr $unit '*' 8 + 3`
mknod ${name}${unit}e b $blk `expr $unit '*' 8 + 4`
mknod ${name}${unit}f b $blk `expr $unit '*' 8 + 5`
mknod ${name}${unit}g b $blk `expr $unit '*' 8 + 6`
mknod ${name}${unit}h b $blk `expr $unit '*' 8 + 7`
mknod r${name}${unit}a c $chr `expr $unit '*' 8 + 0`
mknod r${name}${unit}b c $chr `expr $unit '*' 8 + 1`
mknod r${name}${unit}c c $chr `expr $unit '*' 8 + 2`
mknod r${name}${unit}d c $chr `expr $unit '*' 8 + 3`
mknod r${name}${unit}e c $chr `expr $unit '*' 8 + 4`
mknod r${name}${unit}f c $chr `expr $unit '*' 8 + 5`
mknod r${name}${unit}g c $chr `expr $unit '*' 8 + 6`
mknod r${name}${unit}h c $chr `expr $unit '*' 8 + 7`
mknod ${name}${unit}a b $blk $(($unit * 8 + 0))
mknod ${name}${unit}b b $blk $(($unit * 8 + 1))
mknod ${name}${unit}c b $blk $(($unit * 8 + 2))
mknod ${name}${unit}d b $blk $(($unit * 8 + 3))
mknod ${name}${unit}e b $blk $(($unit * 8 + 4))
mknod ${name}${unit}f b $blk $(($unit * 8 + 5))
mknod ${name}${unit}g b $blk $(($unit * 8 + 6))
mknod ${name}${unit}h b $blk $(($unit * 8 + 7))
mknod r${name}${unit}a c $chr $(($unit * 8 + 0))
mknod r${name}${unit}b c $chr $(($unit * 8 + 1))
mknod r${name}${unit}c c $chr $(($unit * 8 + 2))
mknod r${name}${unit}d c $chr $(($unit * 8 + 3))
mknod r${name}${unit}e c $chr $(($unit * 8 + 4))
mknod r${name}${unit}f c $chr $(($unit * 8 + 5))
mknod r${name}${unit}g c $chr $(($unit * 8 + 6))
mknod r${name}${unit}h c $chr $(($unit * 8 + 7))
chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
;;
@ -198,7 +198,7 @@ ccd*|fd*|rd*|sd*|vnd*)
dca*)
# XXX What about dca cards?
unit=`expr $i : 'dca\(.*\)'`
unit=${i#dca}
case $unit in
0)
rm -f tty0
@ -211,7 +211,7 @@ dca*)
;;
dcm*)
unit=`expr $i : 'dcm\(.*\)'`
unit=${i#dcm}
case $unit in
0|1|2|3)
eval `echo $unit | awk ' { unit = $1; u = 4 * $1 } END {
@ -225,7 +225,7 @@ dcm*)
;;
ite*)
unit=`expr $i : 'ite\(.*\)'`
unit=${i#ite}
case $unit in
0|1|2|3)
rm -f ttye${unit}
@ -238,7 +238,7 @@ ite*)
;;
grf*)
unit=`expr $i : 'grf\(.*\)'`
unit=${i#grf}
case $unit in
0|1|2|3)
rm -f grf${unit}
@ -293,7 +293,7 @@ lkm)
;;
pty*)
class=`expr $i : 'pty\(.*\)'`
class=${i#pty}
case $class in
0) offset=0 name=p;;
1) offset=16 name=q;;