===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/MAKEDEV.mi,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/etc/MAKEDEV.mi	2002/02/09 19:34:40	1.25
--- src/etc/MAKEDEV.mi	2002/02/10 21:52:30	1.26
***************
*** 1,6 ****
  include(MAKEDEV.sub)dnl
  dnl
! vers(a,{-$OpenBSD: MAKEDEV.mi,v 1.25 2002/02/09 19:34:40 drahn Exp $-})dnl
  dnl
  divert(1)dnl
  {-#-}
--- 1,6 ----
  include(MAKEDEV.sub)dnl
  dnl
! vers(a,{-$OpenBSD: MAKEDEV.mi,v 1.26 2002/02/10 21:52:30 deraadt Exp $-})dnl
  dnl
  divert(1)dnl
  {-#-}
***************
*** 459,473 ****
  {-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;;
  	esac
  	case $U in
  	0|1)	blk=major_flo_b; chr=major_flo_c;;
--- 459,473 ----
  {-typnam=$U${i#fd[01]*}
  	case $typnam in
  	0|1)	typnum=0;; # no type specified, assume A
! 	*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=major_flo_b; chr=major_flo_c;;
***************
*** 575,581 ****
  	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;;
--- 575,580 ----
***************
*** 855,869 ****
  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;;
  	esac
  }
  trunc()
  {
  	# XXX pdksh can't seem to deal with locally scoped variables
--- 854,869 ----
  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;;
  	esac
  }
+ 
  trunc()
  {
  	# XXX pdksh can't seem to deal with locally scoped variables
***************
*** 875,880 ****
--- 875,881 ----
  	r|*) echo ${arg1#$arg2} ;;
  	esac
  }
+ 
  unt()
  {
  	# XXX pdksh can't seem to deal with locally scoped variables
***************
*** 894,899 ****
--- 895,901 ----
  dnl dodisk(name,unit,blkmaj,chrmaj,unit,off[,stepping])
  dnl   arg: 1    2    3      4      5    6    7
  dnl
+ 
  dodisk()
  {
  	n=Add(Mult(${5},${7:-16}),${6}) count=0
***************
*** 918,923 ****
--- 920,926 ----
  dnl 6. off     - offset from 0 for all minor numbers (see svnd for an example)
  dnl 7. step    - optional, defaults to 16, number of partitions per device
  dnl
+ 
  dodisk2()
  {
  	n=Add(Mult({-$-}5,${7:-16}),{-$-}6)
***************
*** 931,936 ****
--- 934,940 ----
  # M name b/c major minor [mode] [group]
  RMlist="rm -f"
  MKlist=":"
+ 
  mkl() {
  dnl
  dnl uncomment if multi mknod happens
***************
*** 943,955 ****
  dnl
  dnl non multi mknod
  dnl
!  [ "${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
--- 947,960 ----
  dnl
  dnl non multi mknod
  dnl
! 	[ "${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
***************
*** 997,1004 ****
  		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'`
  	}
  fi
  list="$RMlist"
--- 1002,1009 ----
  		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'`
  	}
  fi
  list="$RMlist"
***************
*** 1016,1021 ****
--- 1021,1027 ----
  fi
  divert(3)dnl  
  dnl
+ 
  R() {
  [ "$DEBUG" ] && set -x
  for i in "$@"