diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index 875495bc..7dc604b0 100644 --- a/src/etc/etc.alpha/MAKEDEV +++ b/src/etc/etc.alpha/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.alpha/MAKEDEV.md,v 1.7 2002/02/09 16:59:50 deraadt Exp -# OpenBSD: MAKEDEV.mi,v 1.24 2002/02/09 16:59:50 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.26 2002/02/10 21:52:30 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp # -# $OpenBSD: MAKEDEV,v 1.70 2002/02/09 17:01:40 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.71 2002/02/10 21:53:03 deraadt Exp $ # # Copyright (c) 2001 Todd T. Fries # All rights reserved. @@ -101,15 +101,16 @@ T=$0 hex() { case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; + [0-9]) echo -n $1;; + 10) echo -n a;; + 11) echo -n b;; + 12) echo -n c;; + 13) echo -n d;; + 14) echo -n e;; + 15) echo -n f;; esac } + trunc() { # XXX pdksh can't seem to deal with locally scoped variables @@ -121,6 +122,7 @@ trunc() r|*) echo ${arg1#$arg2} ;; esac } + unt() { # XXX pdksh can't seem to deal with locally scoped variables @@ -136,6 +138,7 @@ unt() done echo $arg } + dodisk() { n=$(($((${5}*${7:-16}))+${6})) count=0 @@ -149,6 +152,7 @@ dodisk() done MKlist="$MKlist;chown root.operator $1$2? r$1$2?" } + dodisk2() { n=$(($(($5*${7:-16}))+$6)) @@ -162,14 +166,16 @@ dodisk2() # M name b/c major minor [mode] [group] RMlist="rm -f" MKlist=":" + mkl() { - [ "${mklist[$1]}" ] && { - mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" - } || { - mklist[$1]="mknod -m $1 $2 $3 $4 $5" - modes="$modes $1" - } + [ "${mklist[$1]}" ] && { + mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" + } || { + mklist[$1]="mknod -m $1 $2 $3 $4 $5" + modes="$modes $1" + } } + M() { RMlist="$RMlist $1" mkl ${5-666} $1 $2 $3 $4 @@ -190,6 +196,7 @@ M() { } return 0 } + R() { [ "$DEBUG" ] && set -x for i in "$@" @@ -371,7 +378,6 @@ pty*) 1) off=16 name=q;; 2) off=32 name=r;; 3) off=48 name=s;; -# Note that telnetd, rlogind, and xterm (at least) only look at p-s. 4) off=64 name=t;; 5) off=80 name=u;; 6) off=96 name=v;; @@ -434,15 +440,15 @@ fd*) typnam=$U${i#fd[01]*} case $typnam in 0|1) typnum=0;; # no type specified, assume A - *A) typnam=0; typnum=0;; - *B) typnum=1;; - *C) typnum=2;; - *D) typnum=3;; - *E) typnum=4;; - *F) typnum=5;; - *G) typnum=6;; - *H) typnum=7;; - *) echo bad type $typnam for $i; exit 1;; + *A) typnum=0; typnam=0;; + *B) typnum=1;; + *C) typnum=2;; + *D) typnum=3;; + *E) typnum=4;; + *F) typnum=5;; + *G) typnum=6;; + *H) typnum=7;; + *) echo bad type $typnam for $i; exit 1;; esac case $U in 0|1) blk=4; chr=37;; @@ -526,8 +532,8 @@ if [ "$os" = "SunOS" ]; then 440) mask=227;; esac echo `echo "$@"|sed \ - 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ - s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` + 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ + s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` } fi list="$RMlist" diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index d9cb333e..52886249 100644 --- a/src/etc/etc.i386/MAKEDEV +++ b/src/etc/etc.i386/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.i386/MAKEDEV.md,v 1.3 2002/02/09 16:59:50 deraadt Exp -# OpenBSD: MAKEDEV.mi,v 1.24 2002/02/09 16:59:50 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.26 2002/02/10 21:52:30 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp # -# $OpenBSD: MAKEDEV,v 1.114 2002/02/09 17:01:40 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.115 2002/02/10 21:53:03 deraadt Exp $ # # Copyright (c) 2001 Todd T. Fries # All rights reserved. @@ -116,15 +116,16 @@ T=$0 hex() { case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; + [0-9]) echo -n $1;; + 10) echo -n a;; + 11) echo -n b;; + 12) echo -n c;; + 13) echo -n d;; + 14) echo -n e;; + 15) echo -n f;; esac } + trunc() { # XXX pdksh can't seem to deal with locally scoped variables @@ -136,6 +137,7 @@ trunc() r|*) echo ${arg1#$arg2} ;; esac } + unt() { # XXX pdksh can't seem to deal with locally scoped variables @@ -151,6 +153,7 @@ unt() done echo $arg } + dodisk() { n=$(($((${5}*${7:-16}))+${6})) count=0 @@ -164,6 +167,7 @@ dodisk() done MKlist="$MKlist;chown root.operator $1$2? r$1$2?" } + dodisk2() { n=$(($(($5*${7:-16}))+$6)) @@ -177,14 +181,16 @@ dodisk2() # M name b/c major minor [mode] [group] RMlist="rm -f" MKlist=":" + mkl() { - [ "${mklist[$1]}" ] && { - mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" - } || { - mklist[$1]="mknod -m $1 $2 $3 $4 $5" - modes="$modes $1" - } + [ "${mklist[$1]}" ] && { + mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" + } || { + mklist[$1]="mknod -m $1 $2 $3 $4 $5" + modes="$modes $1" + } } + M() { RMlist="$RMlist $1" mkl ${5-666} $1 $2 $3 $4 @@ -205,6 +211,7 @@ M() { } return 0 } + R() { [ "$DEBUG" ] && set -x for i in "$@" @@ -425,7 +432,6 @@ pty*) 1) off=16 name=q;; 2) off=32 name=r;; 3) off=48 name=s;; -# Note that telnetd, rlogind, and xterm (at least) only look at p-s. 4) off=64 name=t;; 5) off=80 name=u;; 6) off=96 name=v;; @@ -505,15 +511,15 @@ fd*) typnam=$U${i#fd[01]*} case $typnam in 0|1) typnum=0;; # no type specified, assume A - *A) typnam=0; typnum=0;; - *B) typnum=1;; - *C) typnum=2;; - *D) typnum=3;; - *E) typnum=4;; - *F) typnum=5;; - *G) typnum=6;; - *H) typnum=7;; - *) echo bad type $typnam for $i; exit 1;; + *A) typnum=0; typnam=0;; + *B) typnum=1;; + *C) typnum=2;; + *D) typnum=3;; + *E) typnum=4;; + *F) typnum=5;; + *G) typnum=6;; + *H) typnum=7;; + *) echo bad type $typnam for $i; exit 1;; esac case $U in 0|1) blk=2; chr=9;; @@ -603,8 +609,8 @@ if [ "$os" = "SunOS" ]; then 440) mask=227;; esac echo `echo "$@"|sed \ - 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ - s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` + 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ + s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` } fi list="$RMlist" diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV index a4016246..97ba090a 100644 --- a/src/etc/etc.macppc/MAKEDEV +++ b/src/etc/etc.macppc/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.macppc/MAKEDEV.md,v 1.3 2002/01/23 07:53:01 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.25 2002/02/09 19:34:40 drahn Exp +# OpenBSD: MAKEDEV.mi,v 1.26 2002/02/10 21:52:30 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp # -# $OpenBSD: MAKEDEV,v 1.11 2002/02/09 19:35:31 drahn Exp $ +# $OpenBSD: MAKEDEV,v 1.12 2002/02/10 21:53:03 deraadt Exp $ # # Copyright (c) 2001 Todd T. Fries # All rights reserved. @@ -94,15 +94,16 @@ T=$0 hex() { case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; + [0-9]) echo -n $1;; + 10) echo -n a;; + 11) echo -n b;; + 12) echo -n c;; + 13) echo -n d;; + 14) echo -n e;; + 15) echo -n f;; esac } + trunc() { # XXX pdksh can't seem to deal with locally scoped variables @@ -114,6 +115,7 @@ trunc() r|*) echo ${arg1#$arg2} ;; esac } + unt() { # XXX pdksh can't seem to deal with locally scoped variables @@ -129,6 +131,7 @@ unt() done echo $arg } + dodisk() { n=$(($((${5}*${7:-16}))+${6})) count=0 @@ -142,6 +145,7 @@ dodisk() done MKlist="$MKlist;chown root.operator $1$2? r$1$2?" } + dodisk2() { n=$(($(($5*${7:-16}))+$6)) @@ -155,14 +159,16 @@ dodisk2() # M name b/c major minor [mode] [group] RMlist="rm -f" MKlist=":" + mkl() { - [ "${mklist[$1]}" ] && { - mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" - } || { - mklist[$1]="mknod -m $1 $2 $3 $4 $5" - modes="$modes $1" - } + [ "${mklist[$1]}" ] && { + mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" + } || { + mklist[$1]="mknod -m $1 $2 $3 $4 $5" + modes="$modes $1" + } } + M() { RMlist="$RMlist $1" mkl ${5-666} $1 $2 $3 $4 @@ -183,6 +189,7 @@ M() { } return 0 } + R() { [ "$DEBUG" ] && set -x for i in "$@" @@ -334,7 +341,6 @@ pty*) 1) off=16 name=q;; 2) off=32 name=r;; 3) off=48 name=s;; -# Note that telnetd, rlogind, and xterm (at least) only look at p-s. 4) off=64 name=t;; 5) off=80 name=u;; 6) off=96 name=v;; @@ -472,8 +478,8 @@ if [ "$os" = "SunOS" ]; then 440) mask=227;; esac echo `echo "$@"|sed \ - 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ - s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` + 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ + s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` } fi list="$RMlist" diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index 0e633ef1..30e6761d 100644 --- a/src/etc/etc.sparc/MAKEDEV +++ b/src/etc/etc.sparc/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.sparc/MAKEDEV.md,v 1.7 2002/02/09 16:59:50 deraadt Exp -# OpenBSD: MAKEDEV.mi,v 1.24 2002/02/09 16:59:50 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.26 2002/02/10 21:52:30 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp # -# $OpenBSD: MAKEDEV,v 1.79 2002/02/09 17:01:41 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.80 2002/02/10 21:53:03 deraadt Exp $ # # Copyright (c) 2001 Todd T. Fries # All rights reserved. @@ -91,15 +91,16 @@ T=$0 hex() { case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; + [0-9]) echo -n $1;; + 10) echo -n a;; + 11) echo -n b;; + 12) echo -n c;; + 13) echo -n d;; + 14) echo -n e;; + 15) echo -n f;; esac } + trunc() { # XXX pdksh can't seem to deal with locally scoped variables @@ -111,6 +112,7 @@ trunc() r|*) echo ${arg1#$arg2} ;; esac } + unt() { # XXX pdksh can't seem to deal with locally scoped variables @@ -126,6 +128,7 @@ unt() done echo $arg } + dodisk() { n=$(($((${5}*${7:-16}))+${6})) count=0 @@ -139,6 +142,7 @@ dodisk() done MKlist="$MKlist;chown root.operator $1$2? r$1$2?" } + dodisk2() { n=$(($(($5*${7:-16}))+$6)) @@ -152,14 +156,16 @@ dodisk2() # M name b/c major minor [mode] [group] RMlist="rm -f" MKlist=":" + mkl() { - [ "${mklist[$1]}" ] && { - mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" - } || { - mklist[$1]="mknod -m $1 $2 $3 $4 $5" - modes="$modes $1" - } + [ "${mklist[$1]}" ] && { + mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" + } || { + mklist[$1]="mknod -m $1 $2 $3 $4 $5" + modes="$modes $1" + } } + M() { RMlist="$RMlist $1" mkl ${5-666} $1 $2 $3 $4 @@ -180,6 +186,7 @@ M() { } return 0 } + R() { [ "$DEBUG" ] && set -x for i in "$@" @@ -374,7 +381,6 @@ pty*) 1) off=16 name=q;; 2) off=32 name=r;; 3) off=48 name=s;; -# Note that telnetd, rlogind, and xterm (at least) only look at p-s. 4) off=64 name=t;; 5) off=80 name=u;; 6) off=96 name=v;; @@ -408,15 +414,15 @@ fd*) typnam=$U${i#fd[01]*} case $typnam in 0|1) typnum=0;; # no type specified, assume A - *A) typnam=0; typnum=0;; - *B) typnum=1;; - *C) typnum=2;; - *D) typnum=3;; - *E) typnum=4;; - *F) typnum=5;; - *G) typnum=6;; - *H) typnum=7;; - *) echo bad type $typnam for $i; exit 1;; + *A) typnum=0; typnam=0;; + *B) typnum=1;; + *C) typnum=2;; + *D) typnum=3;; + *E) typnum=4;; + *F) typnum=5;; + *G) typnum=6;; + *H) typnum=7;; + *) echo bad type $typnam for $i; exit 1;; esac case $U in 0|1) blk=16; chr=54;; @@ -508,8 +514,8 @@ if [ "$os" = "SunOS" ]; then 440) mask=227;; esac echo `echo "$@"|sed \ - 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ - s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` + 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ + s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` } fi list="$RMlist" diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index 709191b7..a30f1ad7 100644 --- a/src/etc/etc.sparc64/MAKEDEV +++ b/src/etc/etc.sparc64/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.sparc64/MAKEDEV.md,v 1.15 2002/02/09 16:59:50 deraadt Exp -# OpenBSD: MAKEDEV.mi,v 1.24 2002/02/09 16:59:50 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.26 2002/02/10 21:52:30 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp # -# $OpenBSD: MAKEDEV,v 1.49 2002/02/09 17:01:41 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.50 2002/02/10 21:53:03 deraadt Exp $ # # Copyright (c) 2001 Todd T. Fries # All rights reserved. @@ -104,15 +104,16 @@ T=$0 hex() { case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; + [0-9]) echo -n $1;; + 10) echo -n a;; + 11) echo -n b;; + 12) echo -n c;; + 13) echo -n d;; + 14) echo -n e;; + 15) echo -n f;; esac } + trunc() { # XXX pdksh can't seem to deal with locally scoped variables @@ -124,6 +125,7 @@ trunc() r|*) echo ${arg1#$arg2} ;; esac } + unt() { # XXX pdksh can't seem to deal with locally scoped variables @@ -139,6 +141,7 @@ unt() done echo $arg } + dodisk() { n=$(($((${5}*${7:-16}))+${6})) count=0 @@ -152,6 +155,7 @@ dodisk() done MKlist="$MKlist;chown root.operator $1$2? r$1$2?" } + dodisk2() { n=$(($(($5*${7:-16}))+$6)) @@ -165,14 +169,16 @@ dodisk2() # M name b/c major minor [mode] [group] RMlist="rm -f" MKlist=":" + mkl() { - [ "${mklist[$1]}" ] && { - mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" - } || { - mklist[$1]="mknod -m $1 $2 $3 $4 $5" - modes="$modes $1" - } + [ "${mklist[$1]}" ] && { + mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5" + } || { + mklist[$1]="mknod -m $1 $2 $3 $4 $5" + modes="$modes $1" + } } + M() { RMlist="$RMlist $1" mkl ${5-666} $1 $2 $3 $4 @@ -193,6 +199,7 @@ M() { } return 0 } + R() { [ "$DEBUG" ] && set -x for i in "$@" @@ -393,7 +400,6 @@ pty*) 1) off=16 name=q;; 2) off=32 name=r;; 3) off=48 name=s;; -# Note that telnetd, rlogind, and xterm (at least) only look at p-s. 4) off=64 name=t;; 5) off=80 name=u;; 6) off=96 name=v;; @@ -497,15 +503,15 @@ fd*) typnam=$U${i#fd[01]*} case $typnam in 0|1) typnum=0;; # no type specified, assume A - *A) typnam=0; typnum=0;; - *B) typnum=1;; - *C) typnum=2;; - *D) typnum=3;; - *E) typnum=4;; - *F) typnum=5;; - *G) typnum=6;; - *H) typnum=7;; - *) echo bad type $typnam for $i; exit 1;; + *A) typnum=0; typnam=0;; + *B) typnum=1;; + *C) typnum=2;; + *D) typnum=3;; + *E) typnum=4;; + *F) typnum=5;; + *G) typnum=6;; + *H) typnum=7;; + *) echo bad type $typnam for $i; exit 1;; esac case $U in 0|1) blk=16; chr=54;; @@ -578,8 +584,8 @@ if [ "$os" = "SunOS" ]; then 440) mask=227;; esac echo `echo "$@"|sed \ - 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ - s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` + 's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\ + s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'` } fi list="$RMlist"