30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
diff -rupN gcc-4.2.orig/gcc/c-incpath.c gcc-4.2/gcc/c-incpath.c
|
|
--- gcc-4.2.orig/gcc/c-incpath.c 2007-09-01 11:28:30.000000000 -0400
|
|
+++ gcc-4.2/gcc/c-incpath.c 2008-08-17 16:56:01.000000000 -0400
|
|
@@ -340,13 +340,18 @@ add_path (char *path, int chain, int cxx
|
|
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);
|