X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=0aaa8284e011de7fd0ee2a1857d48cdbb4b62e60;hb=aa4d43968a50e9ee0f88fa4a2e55ecdcd1b3bc06;hp=79e0140d45e4b7adb1e10b7cad4dc2f4884cbc5a;hpb=c2304cbab66a808007a62aa84d8a381753528657;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index 79e0140d45..0aaa8284e0 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -46,23 +46,26 @@
 
 Do-first:
 
-keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
+keep_these_too="${keep_these_too} .cvsignore autoconf automake
 	apache bash 
-	bfd binutils byacc cvs deja-gnu dejagnu diff dosrel dvips emacs emacs19
-	examples expect fileutils findutils flex
-	gas gawk gcc gdb gdbm gdbtest glob gprof grep grez groff guile gzip
-	include inet install.sh ispell
-	ld less libg++ libgcc libgloss libiberty libio librx libstdc++
-	m4 make mmalloc move-if-change newlib ncurses opcodes
+	bfd binutils bison byacc cvs deja-gnu dejagnu diff dosrel dvips
+	emacs emacs19 examples expect fileutils findutils flex
+	gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
+	guile gzip
+	include inet install-sh ispell
+	ld less libgcc libgloss libiberty libio
+	libstdc++ libtool
+	m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
 	pagas patch perl prms
 	rcs readline sed send-pr shellutils sim tar textutils time
 	texinfo tgas utils uudecode wdiff xiberty
 	configure.bat makeall.bat setup.com makefile.vms winsup
-	mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install"
+	mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install
+	ltconfig ltmain.sh missing ylwrap"
 
-lose_these_too="${lose_these_too} testsuite"
+lose_these_too="${lose_these_too} libg++ librx testsuite"
 
-cygnus_files="release release-info build-all.mk test-build.mk COPYING.NEWLIB"
+cygnus_files="release release-info build-all.mk test-build.mk CYGNUS COPYING.NEWLIB"
 
 if ( echo $* | grep keep\-cygnus > /dev/null) ; then
 	keep_these_too="${keep_these_too} ${cygnus_files}"
@@ -70,7 +73,7 @@ else
 	lose_these_too="${lose_these_too} ${cygnus_files}"
 fi
 
-gdbtk_files="tcl tk"
+gdbtk_files="tcl tk itcl tix libgui"
 
 if ( echo $* | grep lose\-gdbtk > /dev/null) ; then
 	lose_these_too="${lose_these_too} ${gdbtk_files}"
@@ -105,6 +108,25 @@ else
 	keep_these_too="${keep_these_too} ${inet_files}"
 fi
 
+ide_files="libide libidetcl vmake jstools"
+
+if (echo $* | grep keep\-ide > /dev/null); then
+	keep_these_too="${keep_these_too} ${ide_files}"
+	test -n "$verbose" && echo Keeping ${ide_files}
+else
+	lose_these_too="${lose_these_too} ${ide_files}"
+fi
+
+# CGEN files:
+# It is not yet clear if the cgen package will be shipped with the
+# simulators.
+cgen_files="cgen"
+
+if (echo $* | grep keep\-cgen > /dev/null); then
+	keep_these_too="${keep_these_too} ${cgen_files}"
+else
+	lose_these_too="${lose_these_too} ${cgen_files}"
+fi
 
 # This top-level directory is special.  We often check out only subsets
 # of this directory, and complaining about directories or files we didn't
@@ -147,6 +169,9 @@ configure.in
 
 Things-to-lose:
 
+# Not sure we want to include mkdep in releases yet.
+mkdep
+
 # The lines between the "Do-last:" line and the end of the file
 # are executed as a /bin/sh shell script after everything else is
 # done.
@@ -205,27 +230,27 @@ else
 fi
 
 if [ -n "${verbose}" ] ; then
-	echo Processing \"arc\"...
+	echo Processing \"d30v\"...
 fi
 
-arc_files="config.sub configure.in config-ml.in"
+d30v_files="ChangeLog config.sub configure.in"
 
-if ( echo $* | grep keep\-arc > /dev/null ) ; then
-	for i in $arc_files ; do
-		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
+if ( echo $* | grep keep\-d30v > /dev/null ) ; then
+	for i in $d30v_files ; do
+		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping arc stuff in $i
+				echo Keeping d30v stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"arc\" from $i...
+				echo Removing traces of \"d30v\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-arc/,/end-\sanitize\-arc/d' < $i > new
+			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -238,27 +263,27 @@ else
 fi
 
 if [ -n "${verbose}" ] ; then
-	echo Processing \"d10v\"...
+	echo Processing \"v850\"...
 fi
 
-d10v_files="ChangeLog config.sub configure.in"
+v850_files="ChangeLog config.sub configure.in"
 
-if ( echo $* | grep keep\-d10v > /dev/null ) ; then
-	for i in $d10v_files ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
+if ( echo $* | grep keep\-v850e > /dev/null ) ; then
+	for i in $v850_files ; do
+		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping d10v stuff in $i
+				echo Keeping v850e stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-d10v $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d10v\" from $i...
+				echo Removing traces of \"v850e\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-d10v/,/end-\sanitize\-d10v/d' < $i > new
+			sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -270,28 +295,24 @@ else
 	done
 fi
 
-if [ -n "${verbose}" ] ; then
-	echo Processing \"d30v\"...
-fi
-
-d30v_files="ChangeLog config.sub configure.in"
+r5900_files="ChangeLog config.sub configure.in"
 
-if ( echo $* | grep keep\-d30v > /dev/null ) ; then
-	for i in $d30v_files ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
+	for i in $r5900_files ; do
+		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping d30v stuff in $i
+				echo Keeping r5900 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d30v\" from $i...
+				echo Removing traces of \"r5900\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new
+			sed '/start\-sanitize\-r5900/,/end-\sanitize\-r5900/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -303,28 +324,53 @@ else
 	done
 fi
 
-if [ -n "${verbose}" ] ; then
-	echo Processing \"m32r\"...
+vr4320_files="ChangeLog config.sub"
+
+if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
+	for i in $vr4320_files ; do
+		if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping vr4320 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"vr4320\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-vr4320/,/end-\sanitize\-vr4320/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
 fi
 
-m32r_files="config.sub configure.in ChangeLog"
+tx19_files="ChangeLog config.sub"
 
-if ( echo $* | grep keep\-m32r > /dev/null ) ; then
-	for i in $m32r_files ; do
-		if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
+if ( echo $* | grep keep\-tx19 > /dev/null ) ; then
+	for i in $tx19_files ; do
+		if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping m32r stuff in $i
+				echo Keeping tx19 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"m32r\" from $i...
+				echo Removing traces of \"tx19\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-m32r/,/end-\sanitize\-m32r/d' < $i > new
+			sed '/start\-sanitize\-tx19/,/end-\sanitize\-tx19/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -336,24 +382,24 @@ else
 	done
 fi
 
-rce_files="config.sub"
+tx49_files="ChangeLog config.sub"
 
-if ( echo $* | grep keep\-rce > /dev/null ) ; then
-	for i in $rce_files ; do
-		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
+if ( echo $* | grep keep\-tx49 > /dev/null ) ; then
+	for i in $tx49_files ; do
+		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping rce stuff in $i
+				echo Keeping tx49 stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $rce_files ; do
-		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"rce\" from $i...
+				echo Removing traces of \"tx49\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
+			sed '/start\-sanitize\-tx49/,/end-\sanitize\-tx49/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -365,24 +411,24 @@ else
 	done
 fi
 
-v850_files="ChangeLog config.sub configure.in"
+tic80_files="ChangeLog config.sub configure.in"
 
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-	for i in $v850_files ; do
-		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
+	for i in $tic80_files ; do
+		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping v850 stuff in $i
+				echo Keeping tic80 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850\" from $i...
+				echo Removing traces of \"tic80\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/d' < $i > new
+			sed '/start\-sanitize\-tic80/,/end-\sanitize\-tic80/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -394,24 +440,24 @@ else
 	done
 fi
 
-r5900_files="ChangeLog config.sub configure.in"
+sky_files="ChangeLog config.sub configure.in"
 
-if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
-	for i in $r5900_files ; do
-		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+if ( echo $* | grep keep\-sky > /dev/null ) ; then
+	for i in $sky_files ; do
+		if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping r5900 stuff in $i
+				echo Keeping sky stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"r5900\" from $i...
+				echo Removing traces of \"sky\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-r5900/,/end-\sanitize\-r5900/d' < $i > new
+			sed '/start\-sanitize\-sky/,/end-\sanitize\-sky/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -423,24 +469,22 @@ else
 	done
 fi
 
-tic80_files="ChangeLog config.sub configure.in"
-
-if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
-	for i in $tic80_files ; do
-		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
+if ( echo $* | grep keep\-ide > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping tic80 stuff in $i
+				echo Keeping ide stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"tic80\" from $i...
+				echo Removing traces of \"ide\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-tic80/,/end-\sanitize\-tic80/d' < $i > new
+			sed '/start\-sanitize\-ide/,/end-\sanitize\-ide/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -453,10 +497,25 @@ else
 fi
 
 if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
-	echo Catering to RMS by removing traces of \"gdbtk\"...
 	if [ -n "${verbose}" ] ; then
-		echo Removing traces of \"gdbtk\" from Makefile.in...
+		echo Catering to RMS by removing traces of \"gdbtk\"...
 	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"gdbtk\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
 	cp Makefile.in new
 	sed -e '/GDBTK_SUPPORT_DIRS=/d' -e 's/ $(GDBTK_SUPPORT_DIRS)//' < Makefile.in > new
 	if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
@@ -466,24 +525,88 @@ if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
 		mv Makefile.in .Recover
 	fi
 	mv new Makefile.in
+else
+	if [ -n "${verbose}" ] ; then
+		echo Leaving \"gdbtk\" in the sources...
+	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping \"gdbtk\" stuff in $i, but editing out sanitize lines...
+			fi
+			cp $i new
+			sed -e '/start\-sanitize\-gdbtk/d' -e '/end\-sanitize\-gdbtk/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
 fi
 
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
+if ( echo $* | grep lose\-mswin > /dev/null ) ; then
+	if [ -n "${verbose}" ] ; then
+		echo Removing traces of \"mswin\"...
+	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"mswin\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-mswin/,/end-\sanitize\-mswin/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+else
+	if [ -n "${verbose}" ] ; then
+		echo Leaving \"mswin\" in the sources...
+	fi
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping \"mswin\" stuff in $i, but editing out sanitize lines...
+			fi
+			cp $i new
+			sed -e '/start\-sanitize\-mswin/d' -e '/end\-sanitize\-mswin/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+vr5400_files="ChangeLog config.sub"
+
+if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
+	for i in $vr5400_files ; do
+		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping gm stuff in $i
+				echo Keeping vr5400 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"gm\" from $i...
+				echo Removing traces of \"vr5400\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
+			sed '/start\-sanitize\-vr5400/,/end-\sanitize\-vr5400/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -495,6 +618,72 @@ else
 	done
 fi
 
+m32rx_files="ChangeLog config-ml.in"
+if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
+	for i in $m32rx_files ; do
+		if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping m32rx stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"m32rx\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-m32rx/,/end-\sanitize\-m32rx/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+kcygnus_files="configure"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+	for i in $kcygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping Cygnus stuff in $i
+			fi
+			cp $i new
+			grep -v sanitize-cygnus $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"cygnus\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+
 # Do this check LAST!
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then