procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c/22133 (In MinGW trailing slash forward not allowed in include path)

Browse source 
PR 22133
	* c-incpath.c (add_path): Strip trailing path separators.

From-SVN: r124504
This commit is contained in:
Danny Smith 2007-05-07 17:41:35 +00:00 • committed by Nathan Froyd
parent ce2e63495d
commit b187f5cd2f
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ChangeLog
View file

@ -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.

19
gcc/c-incpath.c
View file

@ -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);