X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fspawn_faction_adddup2.c;h=56ff1ecc188f6da7b5ec9a420c4d671ca3ce83b7;hb=4ec4a8e6d91a7247cf7d5b819572026ef5e654c3;hp=e86196009935e25b793bbc12cb426b66e0cb1700;hpb=23be8c8099f5adb14590f02b4a1c669ce49229f7;p=gnulib.git

diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c
index e86196009..56ff1ecc1 100644
--- a/lib/spawn_faction_adddup2.c
+++ b/lib/spawn_faction_adddup2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 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
@@ -23,43 +23,48 @@
 #include <unistd.h>
 
 #if !_LIBC
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-#  include <stdio.h>
-#  define __sysconf(open_max) _getmaxstdio ()
-# else
-#  define __sysconf(open_max) getdtablesize ()
-# endif
+# 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
-   `dup2' for the given file descriptors during the `spawn' call.  */
+   'dup2' for the given file descriptors during the 'spawn' call.  */
 int
 posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions,
-				  int fd, int newfd)
+                                  int fd, int newfd)
+#undef posix_spawn_file_actions_adddup2
 {
   int maxfd = __sysconf (_SC_OPEN_MAX);
-  struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
   if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd)
     return EBADF;
 
+#if HAVE_WORKING_POSIX_SPAWN
+  return posix_spawn_file_actions_adddup2 (file_actions, fd, newfd);
+#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_dup2;
-  rec->action.dup2_action.fd = fd;
-  rec->action.dup2_action.newfd = newfd;
+  {
+    struct __spawn_action *rec;
+
+    /* Add the new value.  */
+    rec = &file_actions->_actions[file_actions->_used];
+    rec->tag = spawn_do_dup2;
+    rec->action.dup2_action.fd = fd;
+    rec->action.dup2_action.newfd = newfd;
 
-  /* Account for the new entry.  */
-  ++file_actions->_used;
+    /* Account for the new entry.  */
+    ++file_actions->_used;
 
-  return 0;
+    return 0;
+  }
+#endif
 }