From 55485cd9a284f9fdefabb796e8d64f230ddb3adf Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 6 Dec 2001 16:41:18 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/cppfiles.c | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 88235dfc383..5b22f745316 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-12-06 Zack Weinberg + + * 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 * config/arm/arm.h (STRUCT_VALUE): Suppress definition. diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 52c095f28fc..33801d610a6 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -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 -- 2.30.2