diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-incpath.c | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ee9e51a10f6..df4aa2f5508 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-05-07 Danny Smith <dannysmith@users.sourceforge.net> + Nathan Froyd <froydnj@codesourcery.com + + PR 22133 + * c-incpath.c (add_path): Strip trailing path separators. + 2007-05-07 Eric Botcazou <ebotcazou@adacore.com> * tree-ssa-dom.c (tree_ssa_dominator_optimize): Reset cfg_altered. diff --git a/gcc/c-incpath.c b/gcc/c-incpath.c index 3e819cec838..8b6512c8e0f 100644 --- a/gcc/c-incpath.c +++ b/gcc/c-incpath.c @@ -389,13 +389,18 @@ add_path (char *path, int chain, int cxx_aware, bool user_supplied_p) cpp_dir *p; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Convert all backslashes to slashes. The native CRT stat() - function does not recognize a directory that ends in a backslash - (unless it is a drive root dir, such "c:\"). Forward slashes, - trailing or otherwise, cause no problems for stat(). */ - char* c; - for (c = path; *c; c++) - if (*c == '\\') *c = '/'; + /* Remove unnecessary trailing slashes. On some versions of MS + Windows, trailing _forward_ slashes cause no problems for stat(). + On newer versions, stat() does not recognise a directory that ends + in a '\\' or '/', unless it is a drive root dir, such as "c:/", + where it is obligatory. */ + int pathlen = strlen (path); + char* end = path + pathlen - 1; + /* Preserve the lead '/' or lead "c:/". */ + char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1); + + for (; end > start && IS_DIR_SEPARATOR (*end); end--) + *end = 0; #endif p = XNEW (cpp_dir); |