From: Zack Weinberg <zack@codesourcery.com>
Date: Thu, 6 Dec 2001 16:41:18 +0000 (+0000)
Subject: cppfiles.c (open_file): If we've opened a directory by mistake, close it.
X-Git-Tag: prereleases/libstdc++-3.0.95~409
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55485cd9a284f9fdefabb796e8d64f230ddb3adf;p=thirdparty%2Fgcc.git

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 88235dfc3838..5b22f7453166 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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.
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 52c095f28fcc..33801d610a64 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