[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/4] pipe2: fix O_NONBLOCK support on mingw
From: |
Eric Blake |
Subject: |
[PATCH 4/4] pipe2: fix O_NONBLOCK support on mingw |
Date: |
Fri, 8 Apr 2011 11:33:03 -0600 |
* modules/pipe2 (Depends-on): Add nonblocking.
* lib/pipe2.c (pipe2) [WIN32]: Add O_NONBLOCK support.
* tests/test-pipe2.c (is_nonblocking): Adjust test accordingly.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 5 +++++
lib/pipe2.c | 34 ++++++++++++++++++++++------------
modules/pipe2 | 1 +
tests/test-pipe2.c | 37 ++++++-------------------------------
4 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 58f0c53..7fce4d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-04-08 Eric Blake <address@hidden>
+ pipe2: fix O_NONBLOCK support on mingw
+ * modules/pipe2 (Depends-on): Add nonblocking.
+ * lib/pipe2.c (pipe2) [WIN32]: Add O_NONBLOCK support.
+ * tests/test-pipe2.c (is_nonblocking): Adjust test accordingly.
+
fcntl-h: fix O_ACCMODE on cygwin
* doc/posix-headers/fcntl.texi (fcntl.h): Document the bug.
* lib/fcntl.in.h (O_ACCMODE): Fix it.
diff --git a/lib/pipe2.c b/lib/pipe2.c
index 4fa014f..744dbc8 100644
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -24,6 +24,7 @@
#include <fcntl.h>
#include "binary-io.h"
+#include "nonblocking.h"
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
/* Native Woe32 API. */
@@ -55,34 +56,43 @@ pipe2 (int fd[2], int flags)
}
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API. */
-
/* Check the supported flags. */
- if ((flags & ~(O_CLOEXEC | O_BINARY | O_TEXT)) != 0)
+ if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0)
{
errno = EINVAL;
return -1;
}
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Native Woe32 API. */
+
+ if (flags & O_NONBLOCK)
+ {
+ int result = _pipe (fd, 4096, flags & O_NONBLOCK);
+ if (result != 0)
+ return result;
+ if (set_nonblocking_flag (fd[0], true) != 0
+ || set_nonblocking_flag (fd[1], true) != 0)
+ {
+ int saved_errno = errno;
+ close (fd[0]);
+ close (fd[1]);
+ result = -1;
+ errno = saved_errno;
+ }
+ return result;
+ }
return _pipe (fd, 4096, flags);
#else
/* Unix API. */
- /* Check the supported flags. */
- if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0)
- {
- errno = EINVAL;
- return -1;
- }
-
if (pipe (fd) < 0)
return -1;
/* POSIX <http://www.opengroup.org/onlinepubs/9699919799/functions/pipe.html>
says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
- both fd[0] amd fd[1]. */
+ both fd[0] and fd[1]. */
if (flags & O_NONBLOCK)
{
diff --git a/modules/pipe2 b/modules/pipe2
index 1183657..ca72216 100644
--- a/modules/pipe2
+++ b/modules/pipe2
@@ -10,6 +10,7 @@ unistd
fcntl-h
binary-io
extensions
+nonblocking
configure.ac:
gl_FUNC_PIPE2
diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c
index ddfb819..9a1d238 100644
--- a/tests/test-pipe2.c
+++ b/tests/test-pipe2.c
@@ -33,6 +33,7 @@ SIGNATURE_CHECK (pipe2, int, (int[2], int));
#include "binary-io.h"
#include "macros.h"
+#include "nonblocking.h"
/* Return true if FD is open. */
static bool
@@ -67,49 +68,23 @@ is_cloexec (int fd)
#endif
}
-/* Return true if FD is in non-blocking mode. */
-static bool
-is_nonblocking (int fd)
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
- /* We don't use the non-blocking mode for sockets here. */
- return 0;
-#else
- int flags;
- ASSERT ((flags = fcntl (fd, F_GETFL)) >= 0);
- return (flags & O_NONBLOCK) != 0;
-#endif
-}
-
int
main ()
{
int use_nonblocking;
int use_cloexec;
-#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
for (use_nonblocking = 0; use_nonblocking <= 1; use_nonblocking++)
-#else
- use_nonblocking = 0;
-#endif
-#if O_CLOEXEC
- for (use_cloexec = 0; use_cloexec <= 1; use_cloexec++)
-#else
- use_cloexec = 0;
-#endif
+ for (use_cloexec = 0; use_cloexec <= !!O_CLOEXEC; use_cloexec++)
{
int o_flags;
int fd[2];
o_flags = 0;
-#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
if (use_nonblocking)
o_flags |= O_NONBLOCK;
-#endif
-#if O_CLOEXEC
if (use_cloexec)
o_flags |= O_CLOEXEC;
-#endif
fd[0] = -1;
fd[1] = -1;
@@ -131,13 +106,13 @@ main ()
}
if (use_nonblocking)
{
- ASSERT (is_nonblocking (fd[0]));
- ASSERT (is_nonblocking (fd[1]));
+ ASSERT (get_nonblocking_flag (fd[0]) == 1);
+ ASSERT (get_nonblocking_flag (fd[1]) == 1);
}
else
{
- ASSERT (!is_nonblocking (fd[0]));
- ASSERT (!is_nonblocking (fd[1]));
+ ASSERT (get_nonblocking_flag (fd[0]) == 0);
+ ASSERT (get_nonblocking_flag (fd[1]) == 0);
}
}
--
1.7.4.2