/* Specification. */
#include <stdio.h>
-#if HAVE_POPEN
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Native Windows API. */
+
+# include <string.h>
+
+FILE *
+popen (const char *filename, const char *mode)
+{
+ /* Use binary mode by default. */
+ if (strcmp (mode, "r") == 0)
+ mode = "rb";
+ else if (strcmp (mode, "w") == 0)
+ mode = "wb";
+
+ return _popen (filename, mode);
+}
+
+#else
# include <errno.h>
# include <fcntl.h>
FILE *
rpl_popen (const char *filename, const char *mode)
{
- /* The mingw popen works fine, and all other platforms have fcntl.
+ /* All other platforms have popen and fcntl.
The bug of the child clobbering its own file descriptors if stdin
or stdout was closed in the parent can be worked around by
opening those two fds as close-on-exec to begin with. */
the fd leaks into subsequent popen calls. We could work around
this by maintaining a list of all fd's opened by popen, and
temporarily marking them cloexec around the real popen call, but
- we would also have to override pclose, and the bookkeepping seems
+ we would also have to override pclose, and the bookkeeping seems
extreme given that cygwin 1.7 no longer has the bug. */
FILE *result;
int cloexec0 = fcntl (STDIN_FILENO, F_GETFD);
return result;
}
-#else
-/* Native Windows API. */
-
-# include <string.h>
-
-FILE *
-popen (const char *filename, const char *mode)
-{
- /* Use binary mode by default. */
- if (strcmp (mode, "r") == 0)
- mode = "rb";
- else if (strcmp (mode, "w") == 0)
- mode = "wb";
-
- return _popen (filename, mode);
-}
-
#endif