From 0d9fce2a47c3ff91991d9f93259ccf5877af2ccc Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Mon, 24 Aug 2009 16:00:44 -0600
Subject: [PATCH] dup2, pipe2: fix some recent test failures on cygwin 1.5.x

* lib/pipe2.c (includes): Add binary-io.h.
* lib/dup2.c (rpl_dup2): Correct buggy errno value.

Signed-off-by: Eric Blake <ebb9@byu.net>
---
 ChangeLog   | 6 ++++++
 lib/dup2.c  | 3 +++
 lib/pipe2.c | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 501fba7f9..986e12c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-24  Eric Blake  <ebb9@byu.net>
+
+	dup2, pipe2: fix some recent test failures on cygwin 1.5.x
+	* lib/pipe2.c (includes): Add binary-io.h.
+	* lib/dup2.c (rpl_dup2): Correct buggy errno value.
+
 2009-08-24  Bruno Haible  <bruno@clisp.org>
 
 	Tolerate declared but missing accept4 syscall.
diff --git a/lib/dup2.c b/lib/dup2.c
index 6d6182934..6b6f45db4 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -57,6 +57,9 @@ rpl_dup2 (int fd, int desired_fd)
   result = dup2 (fd, desired_fd);
   if (result == 0)
     result = desired_fd;
+  /* Correct a cygwin 1.5.x errno value.  */
+  else if (result == -1 && errno == EMFILE)
+    errno = EBADF;
   return result;
 }
 
diff --git a/lib/pipe2.c b/lib/pipe2.c
index d3b612d44..7def1b15c 100644
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -23,6 +23,8 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#include "binary-io.h"
+
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Native Woe32 API.  */
 
-- 
2.11.0