X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fspawn_faction_addopen.c;h=8aaeca6a5007f8ea696949fb30b052c41296600a;hb=c2b08ae26cdc70a3acf7d1bc15bc77c92bbcc97c;hp=231d4be3047e88b4f4cb57681ee25cf7044bcd00;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c
index 231d4be30..8aaeca6a5 100644
--- a/lib/spawn_faction_addopen.c
+++ b/lib/spawn_faction_addopen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,38 +26,48 @@
 # 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.  */
+   'open' for the given file during the 'spawn' call.  */
 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
 }