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
This commit is contained in:
Jeffrey A Law 1999-06-09 22:17:49 +00:00 committed by Jeff Law
parent 1e45a14105
commit 88b94e29f0
4 changed files with 6 additions and 3 deletions

View File

@ -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.

View File

@ -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

View File

@ -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,[^:]//[^"].*$,,';

View File

@ -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"