diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2000-02-07 18:34:05 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-02-07 18:34:05 +0000 |
| commit | 981cb4378aacbf1d6645e9397f8c412dab51f425 (patch) | |
| tree | e01a1135fbf8b8b4818dd4f72c24f89ede9a1fc9 /gcc/cppinit.c | |
| parent | c2f8b491493226d196fc80a9f0d4856612c52992 (diff) | |
| download | gcc-981cb4378aacbf1d6645e9397f8c412dab51f425.zip gcc-981cb4378aacbf1d6645e9397f8c412dab51f425.tar.gz gcc-981cb4378aacbf1d6645e9397f8c412dab51f425.tar.bz2 | |
[multiple changes]
2000-02-07 Zack Weinberg <zack@wolery.cumb.org>
* cppfiles.c (deps_output): Count spacers in deps_column.
2000-02-07 Neil Booth <NeilB@earthling.net>
* cppinit.c (initialize_dependency_output): If there is no
suffix, don't try to look for known suffixes. Use strrchr.
(cpp_start_read): Remove duplicate initialization.
From-SVN: r31832
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 6bc567c..102e815 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -636,10 +636,10 @@ initialize_dependency_output (pfile) /* Output P, but remove known suffixes. */ q = p + len; /* Point to the filename suffix. */ - r = rindex (p, '.'); - /* Compare against the known suffixes. */ - for (x = 0; known_suffixes[x]; x++) - { + r = strrchr (p, '.'); + if (r) + /* Compare against the known suffixes. */ + for (x = 0; known_suffixes[x]; x++) if (strncmp (known_suffixes[x], r, q - r) == 0) { /* Make q point to the bit we're going to overwrite @@ -647,7 +647,6 @@ initialize_dependency_output (pfile) q = r; break; } - } /* Supply our own suffix. */ strcpy (q, OBJECT_SUFFIX); @@ -804,7 +803,6 @@ cpp_start_read (pfile, fname) int default_len = sizeof GCC_INCLUDE_DIR - 8; int specd_len = strlen (specd_prefix); - default_len = sizeof GCC_INCLUDE_DIR - 8; memcpy (default_prefix, GCC_INCLUDE_DIR, default_len); default_prefix[default_len] = '\0'; |