===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.120
retrieving revision 1.121
diff -c -r1.120 -r1.121
*** src/etc/rc	1999/10/07 05:11:19	1.120
--- src/etc/rc	1999/10/11 20:09:53	1.121
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.120 1999/10/07 05:11:19 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.121 1999/10/11 20:09:53 millert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 328,374 ****
  	rm -f $T
  fi
  
! # vi file recovery
! vidir=/var/tmp/vi.recover
! if [ ! -e $vidir ]; then
! 	mkdir $vidir
! 	chmod 1777 $vidir
! elif [ -L $vidir ]; then
! 	echo "Warning! $vidir is a symbolic link! (ignoring)"
! elif [ ! -O $vidir ]; then
! 	echo "Warning! $vidir is not owned by root! (ignoring)"
! elif [ ! -d $vidir -a -e $vidir ]; then
! 	echo "Warning!  $vidir is not a directory! (ignoring)"
! else
! 	vibackup=$vidir/vi.*
! 	for i in $vibackup; do
! 		[ "$i" = "$vibackup" ] && break
! 		# Unmodified vi editor backup files either have the
! 		# execute bit set or are zero length.  Delete them.
! 		# Anything that is not a normal file gets deleted too.
! 		if [ -x $i -o ! -s $i -o ! -f $i ]; then
! 			rm $i
! 		fi
! 	done
! 
! 	virecovery=$vidir/recover.*
! 	echo preserving editor files
! 	for i in $virecovery; do
! 		[ "$i" = "$virecovery" ] && break
! 		# Delete any recovery files that are zero length,
! 		# corrupted, # or that have no corresponding backup
! 		# file.  Else send mail to the user.
! 		if [ -f $i ]; then
! 			recfile=`awk '/^X-vi-recover-path:/{print $2}' < $i`
! 			if [ -n "$recfile" -a -s "$recfile" ]; then
! 				sendmail -t < $i
! 			else
! 				rm $i
! 			fi
! 		else
! 			rm $i
! 		fi
! 	done
  fi
  
  if [ -f /var/account/acct ]; then
--- 328,335 ----
  	rm -f $T
  fi
  
! if [ -x /usr/libexec/vi.recover ]; then
! 	echo 'preserving editor files';	/usr/libexec/vi.recover
  fi
  
  if [ -f /var/account/acct ]; then