--- rc.dist	Wed Jan  5 16:09:07 2000
+++ rc	Thu Jan  6 19:28:36 2000
@@ -346,6 +346,7 @@
 find /var/tmp/vi.recover ! -type f -a ! -type d -delete
 vibackup=`echo /var/tmp/vi.recover/vi.*`
 if [ "$vibackup" != '/var/tmp/vi.recover/vi.*' ]; then
+	cd /var/tmp/vi.recover
 	echo 'Recovering vi editor sessions'
 	for i in $vibackup; do
 		# Only test files that are readable.
@@ -356,7 +357,7 @@
 		# Unmodified nvi editor backup files either have the
 		# execute bit set or are zero length.  Delete them.
 		if test -x $i -o ! -s $i; then
-			rm -f $i
+			rm -f "$i"
 		fi
 	done
 
@@ -375,12 +376,13 @@
 			# Else send mail to the user.
 			recfile=`awk '/^X-vi-recover-path:/{print $2}' < $i`
 			if test -n "$recfile" -a -s "$recfile"; then
-				sendmail -t < $i
+				sendmail -t < "$i"
 			else
-				rm -f $i
+				rm -f "$i"
 			fi
 		done
 	fi
+	cd /
 fi
 
 # make a bounds file for msgs(1) if there isn't one already