fdopendir: detect FreeBSD bug

FreeBSD fdopendir(fd) always consumes fd, even if it fails with
ENOTDIR.  The code that works around the GNU Hurd bug also fixes this;
we just need to detect it.

* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Detect bug.
* doc/posix-functions/fdopendir.texi (fdopendir): Document it.
Reported by Jim Meyering.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index fae49b6d0977b8f731260f7c91fa288645ba7c93..19eaf55710bda9df48cd5bffb7fbefe2478ec122 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-04  Eric Blake  <eblake@redhat.com>
+
+       fdopendir: detect FreeBSD bug
+       * m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Detect bug.
+       * doc/posix-functions/fdopendir.texi (fdopendir): Document it.
+
 2011-02-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        stdbool: do not define HAVE_STDBOOL_H

diff --git a/doc/posix-functions/fdopendir.texi b/doc/posix-functions/fdopendir.texi
index 92f0a43129a7fd0953215795daf65c0e7d00ff6c..8b8a51e53723e9684de02e1e06353d69539ce2dd 100644 (file)
--- a/doc/posix-functions/fdopendir.texi
+++ b/doc/posix-functions/fdopendir.texi
@@ -23,6 +23,10 @@ FreeBSD 7.3.
 This function does not reject non-directory file descriptors on some
 platforms:
 GNU/Hurd.
+@item
+This function mistakenly closes non-directory file descriptors on some
+platforms:
+FreeBSD 8.1.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index 7ce0b5a5f53fa143c11170a8e218c60d17b92c96..f192a62830ad71004b805431ee5ce3af56864614 100644 (file)
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -1,4 +1,4 @@
-# serial 4
+# serial 5
 # See if we need to provide fdopendir.
 
 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
@@ -27,12 +27,16 @@ AC_DEFUN([gl_FUNC_FDOPENDIR],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <dirent.h>
 #include <fcntl.h>
+#include <unistd.h>
 #if !HAVE_DECL_FDOPENDIR
 extern DIR *fdopendir (int);
 #endif
-]], [int fd = open ("conftest.c", O_RDONLY);
-     if (fd < 0) return 2;
-     return !!fdopendir (fd);])],
+]], [int result = 0;
+     int fd = open ("conftest.c", O_RDONLY);
+     if (fd < 0) result |= 1;
+     if (fdopendir (fd)) result |= 2;
+     if (close (fd)) result |= 4;
+     return result;])],
          [gl_cv_func_fdopendir_works=yes],
          [gl_cv_func_fdopendir_works=no],
          [gl_cv_func_fdopendir_works="guessing no"])])