OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cppfiles.c (open_file): If we've opened a directory by mistake, close it. 

* cppfiles.c (open_file): If we've opened a directory by
	mistake, close it.
	(find_include_file): Avoid turning / into // or // into ///.

From-SVN: r47722
This commit is contained in:
Zack Weinberg 2001-12-06 16:41:18 +00:00 committed by Zack Weinberg
parent e04546dce3
commit 55485cd9a2
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2001-12-06 Zack Weinberg <zack@codesourcery.com>
* cppfiles.c (open_file): If we've opened a directory by
mistake, close it.
(find_include_file): Avoid turning / into // or // into ///.
2001-12-06 Nick Clifton <nickc@cambridge.redhat.com>
* config/arm/arm.h (STRUCT_VALUE): Suppress definition.

14
gcc/cppfiles.c
View File

@ -259,10 +259,13 @@ open_file (pfile, filename)
{
if (!S_ISDIR (file->st.st_mode))
return file;
/* If it's a directory, we return null and continue the search
as the file we're looking for may appear elsewhere in the
search path. */
errno = ENOENT;
close (file->fd);
file->fd = -1;
}
file->err_no = errno;
@ -556,9 +559,14 @@ find_include_file (pfile, header, type)
name = (char *) alloca (strlen (fname) + pfile->max_include_len + 2);
for (; path; path = path->next)
{
memcpy (name, path->name, path->len);
name[path->len] = '/';
strcpy (&name[path->len + 1], fname);
int len = path->len;
memcpy (name, path->name, len);
/* Don't turn / into // or // into ///; // may be a namespace
escape. */
if (name[len-1] == '/')
len--;
name[len] = '/';
strcpy (&name[len + 1], fname);
if (CPP_OPTION (pfile, remap))
n = remap_filename (pfile, name, path);
else