X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fopen.c;h=08ecaff44b49efb636931828e54b6b89861445d8;hb=4a60ba548bf42233384fa86fd97cf0091514c553;hp=326e6d15c0f83234b5a7268f60d13815fb68113b;hpb=2514e7d5af226b15be3f737286b3ff8c0c91d761;p=gnulib.git

diff --git a/lib/open.c b/lib/open.c
index 326e6d15c..08ecaff44 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -38,6 +38,11 @@ orig_open (const char *filename, int flags, mode_t mode)
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
+
+#ifndef REPLACE_OPEN_DIRECTORY
+# define REPLACE_OPEN_DIRECTORY 0
+#endif
 
 int
 open (const char *filename, int flags, ...)
@@ -98,6 +103,29 @@ open (const char *filename, int flags, ...)
 
   fd = orig_open (filename, flags, mode);
 
+#if REPLACE_FCHDIR
+  /* Implementing fchdir and fdopendir requires the ability to open a
+     directory file descriptor.  If open doesn't support that (as on
+     mingw), we use a dummy file that behaves the same as directories
+     on Linux (ie. always reports EOF on attempts to read()), and
+     override fstat() in fchdir.c to hide the fact that we have a
+     dummy.  */
+  if (REPLACE_OPEN_DIRECTORY && fd < 0 && errno == EACCES
+      && (mode & O_ACCMODE) == O_RDONLY)
+    {
+      struct stat statbuf;
+      if (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))
+        {
+          /* Maximum recursion depth of 1.  */
+          fd = open ("/dev/null", flags, mode);
+          if (0 <= fd)
+            fd = _gl_register_fd (fd, filename);
+        }
+      else
+        errno = EACCES;
+    }
+#endif
+
 #if OPEN_TRAILING_SLASH_BUG
   /* If the filename ends in a slash and fd does not refer to a directory,
      then fail.
@@ -128,9 +156,9 @@ open (const char *filename, int flags, ...)
     }
 #endif
 
-#ifdef FCHDIR_REPLACEMENT
-  if (fd >= 0)
-    _gl_register_fd (fd, filename);
+#if REPLACE_FCHDIR
+  if (!REPLACE_OPEN_DIRECTORY && 0 <= fd)
+    fd = _gl_register_fd (fd, filename);
 #endif
 
   return fd;