Sanitize out gdbtk references unless keep-gdbtk specified

1 files changed, 40 insertions, 3 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index d707964..68e5c85 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -29,6 +29,20 @@ else
 	fi
 fi
 
+gdbtk_files="gdbtk.c gdbtk.tcl"
+
+if ( echo $* | grep keep\-gdbtk > /dev/null ) ; then
+	keep_these_too="${gdbtk_files} ${keep_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${gdbtk_files}
+	fi
+else
+	lose_these_too="${gdbtk_files} ${lose_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${gdbtk_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
@@ -131,8 +145,6 @@ gdba.el
 gdbcmd.h
 gdbcore.h
 gdbserver
-gdbtk.c
-gdbtk.tcl
 gdbtypes.c
 gdbtypes.h
 go32-xdep.c
@@ -366,7 +378,32 @@ else
 	done
 fi
 
-r16_files = "configure.in"
+echo Catering to RMS by removing traces of \"gdbtk\"...
+
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+if ( echo $* | grep keep\-gdbtk > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			echo Keeping gdbtk stuff in $i
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			echo Removing traces of \"gdbtk\" out of $i...
+			cp $i new
+			sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				echo Caching $i in .Recover...
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+r16_files="configure.in"
 
 if ( echo $* | grep keep\-r16 > /dev/null ) ; then
 	for i in $r16_files ; do