X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fspawn_faction_addopen.c;h=d13fc2c59483b806f3e879944acd335b8016c2e5;hb=150ce1bef700d6a3e56861c3a316da64be93d880;hp=82e60c0a49b53974c900a72c27fe910f3a9f9316;hpb=51e801f2f297e45a24004ee6256dd1a6c7389074;p=gnulib.git

diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c
index 82e60c0a4..d13fc2c59 100644
--- a/lib/spawn_faction_addopen.c
+++ b/lib/spawn_faction_addopen.c
@@ -26,7 +26,9 @@
 # define __sysconf(open_max) getdtablesize ()
 #endif
 
-#include "spawn_int.h"
+#if !HAVE_WORKING_POSIX_SPAWN
+# include "spawn_int.h"
+#endif
 
 /* Add an action to FILE-ACTIONS which tells the implementation to call
    'open' for the given file during the 'spawn' call.  */
@@ -34,30 +36,38 @@ int
 posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
                                   int fd, const char *path, int oflag,
                                   mode_t mode)
+#undef posix_spawn_file_actions_addopen
 {
   int maxfd = __sysconf (_SC_OPEN_MAX);
-  struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
   if (fd < 0 || fd >= maxfd)
     return EBADF;
 
+#if HAVE_WORKING_POSIX_SPAWN
+  return posix_spawn_file_actions_addopen (file_actions, fd, path, oflag, mode);
+#else
   /* Allocate more memory if needed.  */
   if (file_actions->_used == file_actions->_allocated
       && __posix_spawn_file_actions_realloc (file_actions) != 0)
     /* This can only mean we ran out of memory.  */
     return ENOMEM;
 
-  /* Add the new value.  */
-  rec = &file_actions->_actions[file_actions->_used];
-  rec->tag = spawn_do_open;
-  rec->action.open_action.fd = fd;
-  rec->action.open_action.path = path;
-  rec->action.open_action.oflag = oflag;
-  rec->action.open_action.mode = mode;
+  {
+    struct __spawn_action *rec;
+
+    /* Add the new value.  */
+    rec = &file_actions->_actions[file_actions->_used];
+    rec->tag = spawn_do_open;
+    rec->action.open_action.fd = fd;
+    rec->action.open_action.path = path;
+    rec->action.open_action.oflag = oflag;
+    rec->action.open_action.mode = mode;
 
-  /* Account for the new entry.  */
-  ++file_actions->_used;
+    /* Account for the new entry.  */
+    ++file_actions->_used;
 
-  return 0;
+    return 0;
+  }
+#endif
 }