Sanitize anything mentioning CARP.

gdb/.Sanitize

@@ -85,6 +85,20 @@ else
 	fi
 fi
 
+carp_files=""
+
+if ( echo $* | grep keep\-carp > /dev/null ) ; then
+	keep_these_too="${carp_files} ${keep_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${carp_files}
+	fi
+else
+	lose_these_too="${carp_files} ${lose_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${carp_files}
+	fi
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -844,6 +858,33 @@ else
 	done
 fi
 
+if ( echo $* | grep keep\-carp > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-carp $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping carp stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-carp $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"carp\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-carp/,/end-\sanitize\-carp/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
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2