diff options
| author | Jeffrey A Law <law@cygnus.com> | 1999-06-09 22:17:49 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-06-09 16:17:49 -0600 |
| commit | 88b94e29f08160be3e7989b76298a0793c217cb1 (patch) | |
| tree | 9cb2b20581048f96ad3b6ba4baa77f74f95c1b7a /gcc | |
| parent | 1e45a14105a4d5a218af2e718b58858f846c3f70 (diff) | |
| download | gcc-88b94e29f08160be3e7989b76298a0793c217cb1.zip gcc-88b94e29f08160be3e7989b76298a0793c217cb1.tar.gz gcc-88b94e29f08160be3e7989b76298a0793c217cb1.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 2 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 2 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fa0a0fb..f0860c2 100644 --- 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 6c65a7c6..4d12a4d 100644 --- 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 94517191..7153970 100644 --- 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 b4ba924..055c20e 100755 --- 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" |