nonblocking: fix mingw test failures

Actually testing on mingw uncovered a few more problems.

* lib/nonblocking.c (set_nonblocking_flag): Succeed when clearing
non-blocking flag on regular file.
(get_nonblocking_flag): Set errno on invalid fd.
* tests/test-nonblocking.c (main): Avoid test failure on
directories if fchdir is not active.
* modules/nonblocking-tests (Depends-on): Drop unused dependency.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index c4687ce05fdfd1bf893aed1ef49b22f50afcd5e9..9f5847191ecd07faa62622c1576eefec180b5265 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-31  Eric Blake  <eblake@redhat.com>
+
+       nonblocking: fix mingw test failures
+       * lib/nonblocking.c (set_nonblocking_flag): Succeed when clearing
+       non-blocking flag on regular file.
+       (get_nonblocking_flag): Set errno on invalid fd.
+       * tests/test-nonblocking.c (main): Avoid test failure on
+       directories if fchdir is not active.
+       * modules/nonblocking-tests (Depends-on): Drop unused dependency.
+
 2011-03-31  Bruno Haible  <bruno@clisp.org>
 
        Fix bug with gl_WARN_ON_USE_PREPARE, introduced on 2011-01-23.

diff --git a/lib/nonblocking.c b/lib/nonblocking.c
index cb103be4becb7e02b32964a28269bc3c47a3d2eb..f28e4231b0252d0cc9dffc62ff1a378f4c1f4f63 100644 (file)
--- a/lib/nonblocking.c
+++ b/lib/nonblocking.c
@@ -24,6 +24,7 @@
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Native Woe32 API.  */
 
+# include <sys/ioctl.h>
 # include <sys/socket.h>
 # include <unistd.h>
 
@@ -35,6 +36,11 @@ int
 get_nonblocking_flag (int desc)
 {
   HANDLE h = (HANDLE) _get_osfhandle (desc);
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
   if (GetFileType (h) == FILE_TYPE_PIPE)
     {
       /* h is a pipe or socket.  */
@@ -56,6 +62,11 @@ int
 set_nonblocking_flag (int desc, bool value)
 {
   HANDLE h = (HANDLE) _get_osfhandle (desc);
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
   if (GetFileType (h) == FILE_TYPE_PIPE)
     {
       /* h is a pipe or socket.  */
@@ -90,6 +101,8 @@ set_nonblocking_flag (int desc, bool value)
   else
     {
       /* Win32 does not support non-blocking on regular files.  */
+      if (!value)
+        return 0;
       errno = ENOTSUP;
       return -1;
     }

diff --git a/modules/nonblocking-tests b/modules/nonblocking-tests
index 94fccb208995f830073e6ddc5267c5636afe01d2..34d206d779e5633c23b903a8f974c82f9a4edfc3 100644 (file)
--- a/modules/nonblocking-tests
+++ b/modules/nonblocking-tests
@@ -4,7 +4,6 @@ tests/macros.h
 
 Depends-on:
 close
-open
 pipe-posix
 socket
 

diff --git a/tests/test-nonblocking.c b/tests/test-nonblocking.c
index 0762cd0ae19377955b67f765e73dc4e828a75191..f1b761054333ddbe118e512ce51e8c23ca6a9750 100644 (file)
--- a/tests/test-nonblocking.c
+++ b/tests/test-nonblocking.c
@@ -55,11 +55,14 @@ main (void)
 
   /* Test directories; setting nonblocking is unspecified.  */
   fd_file = open (".", O_RDONLY);
-  ASSERT (STDERR_FILENO < fd_file);
-  ASSERT (get_nonblocking_flag (fd_file) == 0);
-  ASSERT (set_nonblocking_flag (fd_file, false) == 0);
-  ASSERT (get_nonblocking_flag (fd_file) == 0);
-  ASSERT (close (fd_file) == 0);
+  if (STDERR_FILENO < fd_file)
+    {
+      /* mingw can't open directories unless fchdir module is active.  */
+      ASSERT (get_nonblocking_flag (fd_file) == 0);
+      ASSERT (set_nonblocking_flag (fd_file, false) == 0);
+      ASSERT (get_nonblocking_flag (fd_file) == 0);
+      ASSERT (close (fd_file) == 0);
+    }
 
   /* Test pipes.  */
   ASSERT (pipe (fd_pipe) == 0);