compare-debug: Avoid spurious errors when .stripped files exist.

* compare-debug: Avoid spurious errors when .stripped files
exist.

From-SVN: r128911

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 15b87ac9a7d6c163aa8fecb3642bdd67d8b0043b..5f99c24e0f856e7cc789a5f23969eb8a433fc85a 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-01  Alexandre Oliva  <aoliva@redhat.com>
+
+       * compare-debug: Avoid spurious errors when .stripped files
+       exist.
+
 2007-09-22  Hans-Peter Nilsson  <hp@axis.com>
 
        * warn_summary (srcdirFilter): Add fixincludes, sim,

diff --git a/contrib/compare-debug b/contrib/compare-debug
index c583a59c520ae07633f8e2e23c38aa106ccf78d2..f1500b607884393276fec61cae36716bb36bb205 100755 (executable)
--- a/contrib/compare-debug
+++ b/contrib/compare-debug
@@ -36,31 +36,31 @@ if test ! -f "$2"; then
   exit 1
 fi
 
-if test -f "$1".stripped; then
-  echo "$1".stripped already exists, overwriting >&2
-  exit 1
-fi
+suf1=stripped
+while test -f "$1.$suf1"; do
+  suf1=$suf1.
+done
 
-if test -f "$2".stripped; then
-  echo "$2".stripped already exists, overwriting >&2
-  exit 1
-fi
+suf2=stripped
+while test -f "$2.$suf2"; do
+  suf2=$suf2.
+done
 
-trap 'rm -f "$1".stripped "$2".stripped' 0 1 2 15
+trap 'rm -f "$1.$suf1" "$2.$suf2"' 0 1 2 15
 
-cp "$1" "$1".stripped
-strip "$1".stripped
+cp "$1" "$1.$suf1"
+strip "$1.$suf1"
 
-cp "$2" "$2".stripped
-strip "$2".stripped
+cp "$2" "$2.$suf2"
+strip "$2.$suf2"
 
-if cmp "$1".stripped "$2".stripped; then
+if cmp "$1.$suf1" "$2.$suf2"; then
   status=0
 else
   status=1
 fi
 
-rm -f "$1".stripped "$2".stripped
+rm -f "$1.$suf1" "$2.$suf2"
 
 trap "exit $status; exit" 0 1 2 15