honor verbose flag

5 files changed, 83 insertions, 19 deletions

diff --git a/.Sanitize b/.Sanitize
index 31ebb7c..4c4534c 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -105,20 +105,32 @@ xiberty
 
 Do-last:
 
-echo Looking for signs of \"v9\"...
+if ( echo $* | egrep verbose > /dev/null ) ; then
+	verbose=true
+else
+	verbose=
+fi
+
+if [ -n "${verbose}" ] ; then
+	echo Looking for signs of \"v9\"...
+fi
 
 # Don't try to clean directories here, as the 'mv' command will fail.
 # Also, grep fails on NFS mounted directories.
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
-			echo Keeping v9 stuff in $i
+			if [ -n "${verbose}" ] ; then
+				echo Keeping v9 stuff in $i
+			fi
 		fi
 	done
 else
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-v9 $i > /dev/null) ; then
-			echo Cleaning the \"v9\" out of $i...
+			if [ -n "${verbose}" ] ; then
+				echo Cleaning the \"v9\" out of $i...
+			fi
 			cp $i new
 			sed '/start\-sanitize\-v9/,/end-\sanitize\-v9/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
@@ -129,24 +141,32 @@ else
 	done
 fi
 
-echo Thawing away the \"chill\"...
+if [ -n "${verbose}" ] ; then
+	echo Thawing away the \"chill\"...
+fi
 
 # Don't try to clean directories here, as the 'mv' command will fail.
 # Also, grep fails on NFS mounted directories.
 if ( echo $* | grep keep\-chill > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Keeping chill stuff in $i
+			if [ -n "${verbose}" ] ; then
+				echo Keeping chill stuff in $i
+			fi
 		fi
 	done
 else
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Thawing the \"chill\" out of $i...
+			if [ -n "${verbose}" ] ; then
+				echo Thawing the \"chill\" out of $i...
+			fi
 			cp $i new
 			sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				echo Caching $i in .Recover...
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
 				mv $i .Recover
 			fi
 			mv new $i
@@ -156,7 +176,7 @@ 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!
+		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
 	fi
 done
 
diff --git a/include/aout/.Sanitize b/include/aout/.Sanitize
index bc6e1f5..60f72ac 100644
--- a/include/aout/.Sanitize
+++ b/include/aout/.Sanitize
@@ -45,11 +45,22 @@ Do-last:
 
 v9dirty="aout64.h"
 
+if ( echo $* | egrep verbose > /dev/null ) ; then
+	verbose=true
+else
+	verbose=
+fi
+
+
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	echo Keeping v9 in ${v9dirty}
+	if [ -n "${verbose}" ] ; then
+		echo Keeping v9 in ${v9dirty}
+	fi
 else
 	for i in ${v9dirty} ; do
-		echo Sanitizing v9 in $i
+		if [ -n "${verbose}" ] ; then
+			echo Sanitizing v9 in $i
+		fi
 		rm -f new
 		grep -v v9 $i > new
 		if [ -n "${safe}" ] ; then
diff --git a/include/elf/.Sanitize b/include/elf/.Sanitize
index 11b6cd4..a4ced8f 100644
--- a/include/elf/.Sanitize
+++ b/include/elf/.Sanitize
@@ -36,11 +36,21 @@ Do-last:
 
 v9dirty="common.h"
 
+if ( echo $* | egrep verbose > /dev/null ) ; then
+	verbose=true
+else
+	verbose=
+fi
+
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	echo Keeping v9 in ${v9dirty}
+	if [ -n "${verbose}" ] ; then
+		echo Keeping v9 in ${v9dirty}
+	fi
 else
 	for i in ${v9dirty} ; do
-		echo Sanitizing v9 in $i
+		if [ -n "${verbose}" ] ; then
+			echo Sanitizing v9 in $i
+		fi
 		rm -f new
 		grep -v v9 $i > new
 		if [ -n "${safe}" ] ; then
diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize
index e0303d8..6ac35ba 100644
--- a/include/opcode/.Sanitize
+++ b/include/opcode/.Sanitize
@@ -51,11 +51,21 @@ Do-last:
 
 v9dirty="sparc.h"
 
+if ( echo $* | egrep verbose > /dev/null ) ; then
+	verbose=true
+else
+	verbose=
+fi
+
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	echo Keeping v9 in ${v9dirty}
+	if [ -n "${verbose}" ] ; then
+		echo Keeping v9 in ${v9dirty}
+	fi
 else
 	for i in ${v9dirty} ; do
-		echo Sanitizing v9 in $i
+		if [ -n "${verbose}" ] ; then
+			echo Sanitizing v9 in $i
+		fi
 		rm -f new
 		grep -v v9 $i > new
 		if [ -n "${safe}" ] ; then
diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index 4cff0d3..1252742 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -49,11 +49,20 @@ alpha-dis.c
 
 Do-last:
 
+if ( echo $* | egrep verbose > /dev/null ) ; then
+	verbose=true
+else
+	verbose=
+fi
 
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	echo Keeping v9 in sparc-opc.c
+	if [ -n "${verbose}" ] ; then
+		echo Keeping v9 in sparc-opc.c
+	fi
 else
-	echo Sanitizing v9 in sparc-opc.c
+	if [ -n "${verbose}" ] ; then
+		echo Sanitizing v9 in sparc-opc.c
+	fi
 	rm -f new
 	grep -v v9 sparc-opc.c > new
 	if [ -n "${safe}" ] ; then
@@ -68,14 +77,18 @@ fi
 v9dirty="sparc-dis.c"
 
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	echo Keeping v9 in ${v9dirty}
+	if [ -n "${verbose}" ] ; then
+		echo Keeping v9 in ${v9dirty}
+	fi
 else
 	for i in ${v9dirty} ; do
-		echo Sanitizing v9 in $i
+		if [ -n "${verbose}" ] ; then
+			echo Sanitizing v9 in $i
+		fi
 		rm -f new
 		sed '/^#ifndef[ 	]NO_V9/,/^#endif/d' < $i > new
 		if grep -s -i v9 new ; then
-			echo ***** SANITIZING V9 IN $i FAILED *****
+			echo '***' SANITIZING V9 IN $i FAILED ***** 1>&2
 		fi
 		if [ -n "${safe}" ] ; then
 			mv $i .Recover