fcntl-h: define O_CLOEXEC and O_EXEC if not defined; use new defines

* doc/posix-headers/fcntl.texi (fcntl.h): Document that
O_CLOEXEC is now defined to 0 if it is not defined, like other flags.
Also, O_EXEC is now defined to be O_RDONLY if O_EXEC is not defined.
Similarly for O_SEARCH; this last was already true, but not documented.
* lib/fcntl.in.h (O_CLOEXEC): Define to 0 if not defined.
* lib/dup-safer-flag.c (O_CLOEXEC): Remove now-useless #define.
* lib/dup3.c, lib/pipe2.c, tests/test-dup-safer.c, tests/test-fcntl.c:
Likewise.
* lib/popen-safer.c (open_noinherit): Check whether O_CLOEXEC
is zero, not whether it is defined.
* tests/test-dup3.c, tests/test-pipe2.c (main): Likewise.
* lib/progreloc.c (find_executable): Use O_EXEC rather than O_RDONLY.
* lib/open.c (open): Check for O_SEARCH as well as for O_RDONLY.

diff --git a/ChangeLog b/ChangeLog
index 16f4a21830a5ac831260d0cfe089d8c5a3aec63f..48a4d32d4778f7f742147bd24b0dc71524fc1fa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+       fcntl-h: define O_CLOEXEC and O_EXEC if not defined; use new defines
+       * doc/posix-headers/fcntl.texi (fcntl.h): Document that
+       O_CLOEXEC is now defined to 0 if it is not defined, like other flags.
+       Also, O_EXEC is now defined to be O_RDONLY if O_EXEC is not defined.
+       Similarly for O_SEARCH; this last was already true, but not documented.
+       * lib/fcntl.in.h (O_CLOEXEC): Define to 0 if not defined.
+       * lib/dup-safer-flag.c (O_CLOEXEC): Remove now-useless #define.
+       * lib/dup3.c, lib/pipe2.c, tests/test-dup-safer.c, tests/test-fcntl.c:
+       Likewise.
+       * lib/popen-safer.c (open_noinherit): Check whether O_CLOEXEC
+       is zero, not whether it is defined.
+       * tests/test-dup3.c, tests/test-pipe2.c (main): Likewise.
+       * lib/progreloc.c (find_executable): Use O_EXEC rather than O_RDONLY.
+       * lib/open.c (open): Check for O_SEARCH as well as for O_RDONLY.
+
 2010-09-10  Bruno Haible  <bruno@clisp.org>
 
        langinfo, nl_langinfo: Fix for IRIX 5.3.

diff --git a/doc/posix-headers/fcntl.texi b/doc/posix-headers/fcntl.texi
index 993db2dc1e070e566d7ec6f3c9d84f0e49c6e424..1e3f97792ea750f6afd0a785fa0be0fd2a3c1aa9 100644 (file)
--- a/doc/posix-headers/fcntl.texi
+++ b/doc/posix-headers/fcntl.texi
@@ -8,9 +8,14 @@ Gnulib module: fcntl-h
 Portability problems fixed by Gnulib:
 @itemize
 @item
-@samp{O_NOCTTY}, @samp{O_DSYNC}, @samp{O_NONBLOCK}, @samp{O_RSYNC},
-@samp{O_SYNC}, @samp{O_DIRECTORY}, @samp{O_NOFOLLOW}, and
-@samp{O_TTY_INIT} are not defined on some platforms.
+@samp{O_CLOEXEC}, @samp{O_DIRECTORY}, @samp{O_DSYNC}, @samp{O_NOCTTY},
+@samp{O_NOFOLLOW}, @samp{O_NONBLOCK}, @samp{O_RSYNC}, @samp{O_SYNC},
+and @samp{O_TTY_INIT} are not defined on some platforms.  Gnulib defines
+these macros to 0.
+
+@item
+@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
 @samp{O_BINARY}, @samp{O_TEXT} (not specified by POSIX, but essential for
@@ -48,14 +53,6 @@ Solaris 10.
 
 Portability problems not fixed by Gnulib:
 @itemize
-@item
-@samp{O_CLOEXEC} is not defined on some platforms.  The gnulib
-replacement is not atomic on these platforms.
-
-@item
-@samp{O_SEARCH} and @samp{O_EXEC} are not defined
-on some platforms.
-
 @item
 @samp{F_SETFD}, @samp{F_GETFL}, @samp{F_SETFL}, @samp{F_GETLK},
 @samp{F_SETLK}, @samp{F_SETLOKW}, @samp{F_GETOWN}, and @samp{F_SETOWN}

diff --git a/lib/dup-safer-flag.c b/lib/dup-safer-flag.c
index 10d6a1bb31c7279aa4d1350672e9a5096fd1126d..e4c0597ca0fb1b7e22c670f147481983563cd530 100644 (file)
--- a/lib/dup-safer-flag.c
+++ b/lib/dup-safer-flag.c
@@ -28,10 +28,6 @@
 
 #include "cloexec.h"
 
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
 /* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
    STDERR_FILENO.  If FLAG contains O_CLOEXEC, behave like
    fcntl(F_DUPFD_CLOEXEC) rather than fcntl(F_DUPFD).  */

diff --git a/lib/dup3.c b/lib/dup3.c
index d44aa92b01ab9585cc1742bd50ea40c480034c07..5ae8b44ea860aea4c9d57f0fdddf46f0225c9df8 100644 (file)
--- a/lib/dup3.c
+++ b/lib/dup3.c
@@ -38,13 +38,6 @@
 /* Upper bound on getdtablesize().  See lib/getdtablesize.c.  */
 # define OPEN_MAX_MAX 0x10000
 
-#else
-/* Unix API.  */
-
-# ifndef O_CLOEXEC
-#  define O_CLOEXEC 0
-# endif
-
 #endif
 
 int

diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index 42fb81bfb0796351d3472d2af4f8c13c1e47c647..a7e4a95016223e58d5f8c18105b177c1c145df2e 100644 (file)
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -170,6 +170,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 # define O_CLOEXEC O_NOINHERIT
 #endif
 
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+
 #ifndef O_DIRECT
 # define O_DIRECT 0
 #endif
@@ -182,6 +186,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 # define O_DSYNC 0
 #endif
 
+#ifndef O_EXEC
+# define O_EXEC O_RDONLY /* This is often close enough in older systems.  */
+#endif
+
 #ifndef O_NDELAY
 # define O_NDELAY 0
 #endif

diff --git a/lib/open.c b/lib/open.c
index f612b802d2185505b2aa19cc72290ab790190cba..4e4493658476a25d28de113108bdddc5ddeea5e3 100644 (file)
--- a/lib/open.c
+++ b/lib/open.c
@@ -111,7 +111,8 @@ open (const char *filename, int flags, ...)
      override fstat() in fchdir.c to hide the fact that we have a
      dummy.  */
   if (REPLACE_OPEN_DIRECTORY && fd < 0 && errno == EACCES
-      && (flags & O_ACCMODE) == O_RDONLY)
+      && ((flags & O_ACCMODE) == O_RDONLY
+          || (O_SEARCH != O_RDONLY && (flags & O_ACCMODE) == O_SEARCH)))
     {
       struct stat statbuf;
       if (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))

diff --git a/lib/pipe2.c b/lib/pipe2.c
index 2d973dceb5449209534dd4cc34b87420cce13861..8257fcf362ca63463d4560cc541ab335a621a6c9 100644 (file)
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -30,13 +30,6 @@
 
 # include <io.h>
 
-#else
-/* Unix API.  */
-
-# ifndef O_CLOEXEC
-#  define O_CLOEXEC 0
-# endif
-
 #endif
 
 int

diff --git a/lib/popen-safer.c b/lib/popen-safer.c
index 1791bc3b247735d0cb5d2177113257d624246ab5..be67c7698e1e34c2a69672b827bade6df83d4025 100644 (file)
--- a/lib/popen-safer.c
+++ b/lib/popen-safer.c
@@ -34,7 +34,7 @@ static int
 open_noinherit (char const *name, int flags)
 {
   int fd;
-#ifdef O_CLOEXEC
+#if O_CLOEXEC
   /* 0 = unknown, 1 = yes, -1 = no.  */
   static int have_cloexec;
   if (have_cloexec >= 0)

diff --git a/lib/progreloc.c b/lib/progreloc.c
index 1e27de72cbe54e837029faacc375acc484c43ee5..19bbc125c43717a923b96863eac4e19a96c6d23c 100644 (file)
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -189,7 +189,7 @@ find_executable (const char *argv0)
     if (link != NULL && link[0] != '[')
       return link;
     if (executable_fd < 0)
-      executable_fd = open ("/proc/self/exe", O_RDONLY, 0);
+      executable_fd = open ("/proc/self/exe", O_EXEC, 0);
 
     {
       char buf[6+10+5];
@@ -198,7 +198,7 @@ find_executable (const char *argv0)
       if (link != NULL && link[0] != '[')
         return link;
       if (executable_fd < 0)
-        executable_fd = open (buf, O_RDONLY, 0);
+        executable_fd = open (buf, O_EXEC, 0);
     }
   }
 #endif

diff --git a/tests/test-dup-safer.c b/tests/test-dup-safer.c
index 28f131772331b9ad9c73e277fe77faacfa9189e2..b71b6c3912ffe0dcf3e3a19dfefa23441baf3582 100644 (file)
--- a/tests/test-dup-safer.c
+++ b/tests/test-dup-safer.c
@@ -38,9 +38,6 @@
 # define setmode(f,m) zero ()
 static int zero (void) { return 0; }
 #endif
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
 
 /* This test intentionally closes stderr.  So, we arrange to have fd 10
    (outside the range of interesting fd's during the test) set up to

diff --git a/tests/test-dup3.c b/tests/test-dup3.c
index a719234103637847b56f91941242909432747a9e..f1e978b15de9884ab97360835c5dc4a9753877b0 100644 (file)
--- a/tests/test-dup3.c
+++ b/tests/test-dup3.c
@@ -75,7 +75,7 @@ main ()
 {
   int use_cloexec;
 
-#if defined O_CLOEXEC
+#if O_CLOEXEC
   for (use_cloexec = 0; use_cloexec <= 1; use_cloexec++)
 #else
   use_cloexec = 0;
@@ -87,7 +87,7 @@ main ()
       char buffer[1];
 
       o_flags = 0;
-#if defined O_CLOEXEC
+#if O_CLOEXEC
       if (use_cloexec)
         o_flags |= O_CLOEXEC;
 #endif

diff --git a/tests/test-fcntl.c b/tests/test-fcntl.c
index 71dfb9869fb665d94888749fb991dfba1c500775..a181da3571c57622f88fd2580b240e80031b4f3f 100644 (file)
--- a/tests/test-fcntl.c
+++ b/tests/test-fcntl.c
@@ -39,11 +39,6 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...));
 #include "binary-io.h"
 #include "macros.h"
 
-/* Use O_CLOEXEC if available, but test works without it.  */
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
 #if !O_BINARY
 # define setmode(f,m) zero ()
 static int zero (void) { return 0; }

diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c
index bd6df7ce1977e25e2e7b7b015ebef556e2cbb61a..e8e579897411bd79e3139995852f248d222c9b6f 100644 (file)
--- a/tests/test-pipe2.c
+++ b/tests/test-pipe2.c
@@ -92,7 +92,7 @@ main ()
 #else
   use_nonblocking = 0;
 #endif
-#if defined O_CLOEXEC
+#if O_CLOEXEC
     for (use_cloexec = 0; use_cloexec <= 1; use_cloexec++)
 #else
     use_cloexec = 0;
@@ -106,7 +106,7 @@ main ()
         if (use_nonblocking)
           o_flags |= O_NONBLOCK;
 #endif
-#if defined O_CLOEXEC
+#if O_CLOEXEC
         if (use_cloexec)
           o_flags |= O_CLOEXEC;
 #endif