* fhandler_registry.cc (fhandler_registry::close): Return any error result to

the caller.
* syscalls.cc (_close): Return result of fhandler::close to the caller.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 989f978..486554c 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-26  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
+       * fhandler_registry.cc (fhandler_registry::close): Return any error
+       result to the caller.
+       * syscalls.cc (_close): Return result of fhandler::close to the caller.
+
 2002-07-25  Christopher Faylor  <cgf@redhat.com>
 
        * security.cc (allow_ntsec): Default to on.

diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc
index 4fc875a..f2e5e21 100644 (file)
--- a/winsup/cygwin/fhandler_registry.cc
+++ b/winsup/cygwin/fhandler_registry.cc
@@ -533,7 +533,7 @@ fhandler_registry::close ()
     }
   if (value_name)
     cfree (value_name);
-  return 0;
+  return res;
 }
 
 bool

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index f2d7b19..7efe14f 100644 (file)
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -578,9 +578,8 @@ _close (int fd)
     res = -1;
   else
     {
-      cfd->close ();
+      res = cfd->close ();
       cfd.release ();
-      res = 0;
     }
 
   syscall_printf ("%d = close (%d)", res, fd);