fcntl-h: fix O_ACCMODE on cygwin

* doc/posix-headers/fcntl.texi (fcntl.h): Document the bug.
* lib/fcntl.in.h (O_ACCMODE): Fix it.

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

diff --git a/ChangeLog b/ChangeLog
index fe0a886391bcd34857fead57f9b0b0af8fe4b4be..58f0c53cadcc4d35bd807f32b86d5f48ba688ec5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-08  Eric Blake  <eblake@redhat.com>
 
+       fcntl-h: fix O_ACCMODE on cygwin
+       * doc/posix-headers/fcntl.texi (fcntl.h): Document the bug.
+       * lib/fcntl.in.h (O_ACCMODE): Fix it.
+
        pipe-filter: drop O_NONBLOCK workarounds
        * modules/pipe-filter-gi (Depends-on): Add fcntl-h.
        * modules/pipe-filter-ii (Depends-on): Likewise.

diff --git a/doc/posix-headers/fcntl.texi b/doc/posix-headers/fcntl.texi
index 29b61ecb47db1dfd69536f8f6d4cb54cd03977ea..c87e8726d4807823860003e7066ca7877dc6d6cc 100644 (file)
--- a/doc/posix-headers/fcntl.texi
+++ b/doc/posix-headers/fcntl.texi
@@ -22,6 +22,11 @@ non-zero value; otherwise, the gnulib replacement is 0.
 @samp{O_EXEC} and @samp{O_SEARCH} are not defined on some platforms.
 Gnulib defines these macros to @samp{O_RDONLY}, which is typically 0.
 
+@item
+The @samp{O_ACCMODE} mask mistakenly omits @samp{O_SEARCH} and
+@samp{O_EXEC} on some platforms:
+Cygwin.
+
 @item
 @samp{O_BINARY}, @samp{O_TEXT} (not specified by POSIX, but essential for
 portability to Woe32 platforms) are defined on some platforms but not on

diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index b6521d67192eb4fcc7c1ac404868631d87468482..971316fc05d07c720c0310803d7509f7c7b952b9 100644 (file)
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -256,6 +256,11 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 # define O_TTY_INIT 0
 #endif
 
+#if O_ACCMODE != (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
+# undef O_ACCMODE
+# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
+#endif
+
 /* For systems that distinguish between text and binary I/O.
    O_BINARY is usually declared in fcntl.h  */
 #if !defined O_BINARY && defined _O_BINARY