X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-dup2.c;h=a14807a36ee660061877ee97f5d6965efd86f23e;hb=eea38e67b2eb57529b01092d86178935d7ead222;hp=b65fcad614e6f29941703ec4abac463a326ba1e0;hpb=1d0664a751fdfdcae30e22a5e6bd82f442111b36;p=gnulib.git

diff --git a/tests/test-dup2.c b/tests/test-dup2.c
index b65fcad61..a14807a36 100644
--- a/tests/test-dup2.c
+++ b/tests/test-dup2.c
@@ -1,5 +1,5 @@
 /* Test duplicating file descriptors.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 
 #include "binary-io.h"
 
-#if GNULIB_CLOEXEC
+#if GNULIB_TEST_CLOEXEC
 # include "cloexec.h"
 #endif
 
@@ -36,6 +36,8 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 /* Get declarations of the Win32 API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
+/* Get _get_osfhandle.  */
+# include "msvc-nothrow.h"
 #endif
 
 #include "macros.h"
@@ -57,11 +59,12 @@ is_open (int fd)
 #endif
 }
 
+#if GNULIB_TEST_CLOEXEC
 /* Return non-zero if FD is open and inheritable across exec/spawn.  */
 static int
 is_inheritable (int fd)
 {
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   /* On Win32, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
@@ -70,14 +73,15 @@ is_inheritable (int fd)
   if (h == INVALID_HANDLE_VALUE || GetHandleInformation (h, &flags) == 0)
     return 0;
   return (flags & HANDLE_FLAG_INHERIT) != 0;
-#else
-# ifndef F_GETFD
-#  error Please port fcntl to your platform
-# endif
+# else
+#  ifndef F_GETFD
+#   error Please port fcntl to your platform
+#  endif
   int i = fcntl (fd, F_GETFD);
   return 0 <= i && (i & FD_CLOEXEC) == 0;
-#endif
+# endif
 }
+#endif /* GNULIB_TEST_CLOEXEC */
 
 #if !O_BINARY
 # define setmode(f,m) zero ()
@@ -119,6 +123,9 @@ main (void)
   ASSERT (dup2 (-1, fd) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
+  ASSERT (dup2 (99, fd) == -1);
+  ASSERT (errno == EBADF);
+  errno = 0;
   ASSERT (dup2 (AT_FDCWD, fd) == -1);
   ASSERT (errno == EBADF);
   ASSERT (is_open (fd));
@@ -159,7 +166,7 @@ main (void)
   ASSERT (read (fd, buffer, 1) == 1);
   ASSERT (*buffer == '2');
 
-#if GNULIB_CLOEXEC
+#if GNULIB_TEST_CLOEXEC
   /* Any new fd created by dup2 must not be cloexec.  */
   ASSERT (close (fd + 2) == 0);
   ASSERT (dup_cloexec (fd) == fd + 1);
@@ -167,7 +174,12 @@ main (void)
   ASSERT (dup2 (fd + 1, fd + 1) == fd + 1);
   ASSERT (!is_inheritable (fd + 1));
   ASSERT (dup2 (fd + 1, fd + 2) == fd + 2);
+  ASSERT (!is_inheritable (fd + 1));
   ASSERT (is_inheritable (fd + 2));
+  errno = 0;
+  ASSERT (dup2 (fd + 1, -1) == -1);
+  ASSERT (errno == EBADF);
+  ASSERT (!is_inheritable (fd + 1));
 #endif
 
   /* On systems that distinguish between text and binary mode, dup2