dup2: work around mingw bug

dup2 (fd, -2) returned -2 instead of the proper -1.

* lib/dup2.c (rpl_dup2): Sanitize return value on mingw.
Reported by Simon Josefsson.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index bd5565b6ffe26f014f784a02747da87a6b5398a5..dc7776eab2f4ace657181a2c488df3fc9f29cc3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-08  Eric Blake  <ebb9@byu.net>
+
+       dup2: work around mingw bug
+       * lib/dup2.c (rpl_dup2): Sanitize return value on mingw.
+       Reported by Simon Josefsson.
+
 2010-01-07  John W. Eaton  <jwe@octave.org>  (tiny change)
 
        glob: Fix C++ compilation.

diff --git a/lib/dup2.c b/lib/dup2.c
index ef581a7efd2c8cdad84323b8737a907ea3fccf60..9b6a8f6321bd78f3e598fc0a0ce5e80a4194c705 100644 (file)
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -52,6 +52,13 @@ rpl_dup2 (int fd, int desired_fd)
         }
       return fd;
     }
+  /* Some mingw versions also return the wrong value if desired_fd is
+     negative but not -1.  */
+  if (desired_fd < 0)
+    {
+      errno = EBADF;
+      return -1;
+    }
 # endif
   result = dup2 (fd, desired_fd);
 # ifdef __linux__