diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-03-04 15:10:46 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-03-04 15:10:46 +0000 |
| commit | 04c8d9b90a16788a17fa495cbafe1f592f97a875 (patch) | |
| tree | f4993d16ae6e55eb95f7863e140de35acfa9f472 /gcc | |
| parent | 7868b4a2520b831eec35cbabc7f28d3694aebbf4 (diff) | |
| download | gcc-04c8d9b90a16788a17fa495cbafe1f592f97a875.zip gcc-04c8d9b90a16788a17fa495cbafe1f592f97a875.tar.gz gcc-04c8d9b90a16788a17fa495cbafe1f592f97a875.tar.bz2 | |
* cppfiles.c (search_from): Special case the empty string.
From-SVN: r40236
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cppfiles.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a1772b..029af4b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2001-03-04 Neil Booth <neil@daikokuya.demon.co.uk> + * cppfiles.c (search_from): Special case the empty string. + +2001-03-04 Neil Booth <neil@daikokuya.demon.co.uk> + * cppfiles.c (_cpp_execute_include): Don't make a null-terminated copy of the filename. Don't use CPP_PREV_BUFFER. Don't call strlen or strcpy; we already know the length. diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 0dfd9d0..7f15a8d 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -804,7 +804,11 @@ search_from (pfile, inc) if (CPP_OPTION (pfile, ignore_srcdir)) return CPP_OPTION (pfile, quote_include); - dlen = basename (inc->name) - inc->name; + /* basename () on Solaris returns "." for an empty string. */ + dlen = 0; + if (inc->name[0] != '\0') + dlen = basename (inc->name) - inc->name; + if (dlen) { /* We don't guarantee NAME is null-terminated. This saves |