===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Attic/rc.wscons,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/etc/Attic/rc.wscons	2001/02/10 17:51:47	1.1
--- src/etc/Attic/rc.wscons	2001/02/12 04:26:33	1.2
***************
*** 1,4 ****
! # $OpenBSD: rc.wscons,v 1.1 2001/02/10 17:51:47 mickey Exp $
  # $NetBSD: rc.wscons,v 1.3 1999/05/15 14:28:14 drochner Exp $
  
  wscfg=/usr/sbin/wsconscfg
--- 1,4 ----
! # $OpenBSD: rc.wscons,v 1.2 2001/02/12 04:26:33 deraadt Exp $
  # $NetBSD: rc.wscons,v 1.3 1999/05/15 14:28:14 drochner Exp $
  
  wscfg=/usr/sbin/wsconscfg
***************
*** 9,33 ****
  
  while [ $# -gt 0 ]; do
  	case $1 in
! 		-n)
! 			DOIT=echo
! 			;;
! 		-f)
! 			config=$2
! 			shift
! 			;;
! 		-font)
! 			wsfld=$2
! 			shift
! 			;;
! 		-screen)
! 			wscfg=$2
! 			shift
! 			;;
! 		*)
! 			echo $usage
! 			exit 1
! 			;;
  	esac
  	shift
  done
--- 9,33 ----
  
  while [ $# -gt 0 ]; do
  	case $1 in
! 	-n)
! 		DOIT=echo
! 		;;
! 	-f)
! 		config=$2
! 		shift
! 		;;
! 	-font)
! 		wsfld=$2
! 		shift
! 		;;
! 	-screen)
! 		wscfg=$2
! 		shift
! 		;;
! 	*)
! 		echo $usage
! 		exit 1
! 		;;
  	esac
  	shift
  done
***************
*** 38,117 ****
  #	font   name width height enc file
  ( while read type arg1 arg2 arg3 arg4 arg5; do
  	case "$type" in
! 		\#*|"")
! 			continue
! 			;;
! 		font)
! 			name=$arg1
! 			width=$arg2
! 			height=$arg3
! 			enc=$arg4
! 			file=$arg5
! 			cmd=$wsfld
  
! 			case $width in
! 				-)
! 					;;
! 				*)
! 					cmd="$cmd -w $width"
! 					;;
! 			esac
! 			case $height in
! 				-)
! 					;;
! 				*)
! 					cmd="$cmd -h $height"
! 					;;
! 			esac
! 			case $enc in
! 				-)
! 					;;
! 				*)
! 					cmd="$cmd -e $enc"
! 					;;
! 			esac
! 			cmd="$cmd -N $name $file"
! 			eval $DOIT $cmd
  			;;
! 		screen)
! 			idx=$arg1
! 			scr=$arg2
! 			emul=$arg3
! 			cmd=$wscfg
  
! 			case $scr in
! 				-)
! 					;;
! 				*)
! 					cmd="$cmd -t $scr"
! 					;;
! 			esac
! 			case $emul in
! 				-)
! 					;;
! 				*)
! 					cmd="$cmd -e $emul"
! 					;;
! 			esac
! 			cmd="$cmd $idx"
! 			eval $DOIT $cmd
  			;;
! 		keyboard)
! 			kbd=$arg1
! 			cmd=$wscfg
! 			case $kbd in
! 				-|auto)
! 					cmd="$cmd -k"
! 					;;
! 				*)
! 					cmd="$cmd -k $kbd"
! 					;;
! 			esac
! 			eval $DOIT $cmd
  			;;
! 		mux)
! 			cmd="$wscfg -m $arg1"
! 			eval $DOIT $cmd
  			;;
  	esac
  done ) < $config
--- 38,117 ----
  #	font   name width height enc file
  ( while read type arg1 arg2 arg3 arg4 arg5; do
  	case "$type" in
! 	\#*|"")
! 		continue
! 		;;
! 	font)
! 		name=$arg1
! 		width=$arg2
! 		height=$arg3
! 		enc=$arg4
! 		file=$arg5
! 		cmd=$wsfld
  
! 		case $width in
! 		-)
  			;;
! 		*)
! 			cmd="$cmd -w $width"
! 			;;
! 		esac
! 		case $height in
! 		-)
! 			;;
! 		*)
! 			cmd="$cmd -h $height"
! 			;;
! 		esac
! 		case $enc in
! 		-)
! 			;;
! 		*)
! 			cmd="$cmd -e $enc"
! 			;;
! 		esac
! 		cmd="$cmd -N $name $file"
! 		eval $DOIT $cmd
! 		;;
! 	screen)
! 		idx=$arg1
! 		scr=$arg2
! 		emul=$arg3
! 		cmd=$wscfg
  
! 		case $scr in
! 		-)
  			;;
! 		*)
! 			cmd="$cmd -t $scr"
  			;;
! 		esac
! 		case $emul in
! 		-)
  			;;
+ 		*)
+ 			cmd="$cmd -e $emul"
+ 			;;
+ 		esac
+ 		cmd="$cmd $idx"
+ 		eval $DOIT $cmd
+ 		;;
+ 	keyboard)
+ 		kbd=$arg1
+ 		cmd=$wscfg
+ 		case $kbd in
+ 		-|auto)
+ 			cmd="$cmd -k"
+ 			;;
+ 		*)
+ 			cmd="$cmd -k $kbd"
+ 			;;
+ 		esac
+ 		eval $DOIT $cmd
+ 		;;
+ 	mux)
+ 		cmd="$wscfg -m $arg1"
+ 		eval $DOIT $cmd
+ 		;;
  	esac
  done ) < $config