cppfiles.c (open_file): Account for the fact that on windows, opening a directory...

        * cppfiles.c (open_file): Account for the
        fact that on windows, opening a directory gives
        EACCES.

From-SVN: r125590

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 712bc32..205c1dd 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-09  Vladimir Prus  <vladimir@codesourcery.com>
+
+       * cppfiles.c (open_file): Account for the
+        fact that on windows, opening a directory gives
+        EACCES.
+
 2007-06-05  Joerg Wunsch  <j.gnu@uriah.heep.sax.de>
 
        PR preprocessor/23479

diff --git a/libcpp/files.c b/libcpp/files.c
index 3751184..b20c38e 100644 (file)
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -228,6 +228,19 @@ open_file (_cpp_file *file)
       close (file->fd);
       file->fd = -1;
     }
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  else if (errno == EACCES)
+    {
+      /* On most UNIX systems, open succeeds on a directory.  Above,
+         we check if we have opened a directory and if so, set errno
+         to ENOENT.  However, on Windows, opening a directory
+         fails with EACCESS.  We want to return ENOENT in that
+         case too.  */
+      if (stat (file->path, &file->st) == 0
+          && S_ISDIR (file->st.st_mode))
+        errno = ENOENT;
+    }
+#endif    
   else if (errno == ENOTDIR)
     errno = ENOENT;