inclhack.def (no_double_slash): Fix quoting for test.

        * fixinc/inclhack.def (no_double_slash): Fix quoting for test.
        * fixinc/inclhack.sh, fixinc/fixincl.x, fixinc/fixincl.sh; Rebuilt.

From-SVN: r27460

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa0a0fb4845db5eea56781997ac1e84bda48361a..f0860c217d02e9edb8b20130daea161e99cfb546 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -18,6 +18,9 @@ Wed Jun  9 19:44:26 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 Wed Jun  9 13:12:24 1999  Jeffrey A Law  (law@cygnus.com)
 
+       * fixinc/inclhack.def (no_double_slash): Fix quoting for test.
+       * fixinc/inclhack.sh, fixinc/fixincl.x, fixinc/fixincl.sh; Rebuilt.
+
        * varasm.c (remove_from_pending_weak_list): Verify t->name
        is non-NULL before passing it to strcmp.
 

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 6c65a7c654a9ba7efa11bc2ed043d196024c0cc4..4d12a4d41f242ceb97bc0f77296811af784c4d45 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -606,7 +606,7 @@ tSCC zNo_Double_SlashSelect0[] =
  *  perform the 'test' shell command - do fix on success
  */
 tSCC zNo_Double_SlashTest0[] =
-       "-z `echo ${file} | egrep '(CC|cxx|\\+\\+)/' `";
+       " -z \"`echo ${file} | egrep '(CC|cxx|++)/' `\"";
 
 #define    NO_DOUBLE_SLASH_TEST_CT  2
 #define    NO_DOUBLE_SLASH_RE_CT    1

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 94517191e6779b301361e02c1923eec403cff1b4..71539703099b91b9237ecd0fbfc9d2940097e85a 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -350,7 +350,7 @@ fix = {
      *  Also, only accept double slashes that are not part of URL's
      *  and are not the end of a quoted string.
      */
-    test   = '-z `echo ${file} | egrep \'(CC|cxx|\+\+)/\' `';
+    test   = " -z \"`echo ${file} | egrep \'(CC|cxx|\+\+)/\' `\"";
     select = '(^|[^:])//[^"*]';
     sed    = 's,^//.*$,,';
     sed    = 's,[^:]//[^"].*$,,';

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index b4ba924f2853b73ffb257d2670d276b11e34a5d6..055c20e514c03d209296aad9ad4b9aa854f82a55 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -748,7 +748,7 @@ struct rusage;
     # Fix  17:  No_Double_Slash
     #
     if ( test -n "`egrep '(^|[^:])//[^\"*]' ${file}`" -a \
-              '(' -z `echo ${file} | egrep '(CC|cxx|\+\+)/' ` ')'
+              '('  -z "`echo ${file} | egrep '(CC|cxx|++)/' `" ')'
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       no_double_slash"