open.c (already_open): Test for POSIX close return value.

2009-04-08  Janne Blomqvist  <jb@gcc.gnu.org>

        * io/open.c (already_open): Test for POSIX close return value.
        * io/unit.c (close_unit_1): Likewise.
        * io/unix.c (raw_close): Return 0 for success for preconnected units.

From-SVN: r145761

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8bc904a..49b00c7 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-08  Janne Blomqvist  <jb@gcc.gnu.org>
 
+        * io/open.c (already_open): Test for POSIX close return value.
+        * io/unit.c (close_unit_1): Likewise.
+        * io/unix.c (raw_close): Return 0 for success for preconnected units.
+
+2009-04-08  Janne Blomqvist  <jb@gcc.gnu.org>
+
         * runtime/string.c (compare0): Use gfc_charlen_type.
         * runtime/error.c (gfc_itoa): Move to io/write.c
         (xtoa): Rename to gfc_xtoa.

diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c
index 7caa1c9..e3709f7 100644 (file)
--- a/libgfortran/io/open.c
+++ b/libgfortran/io/open.c
@@ -682,7 +682,7 @@ already_open (st_parameter_open *opp, gfc_unit * u, unit_flags * flags)
        }
 #endif
 
-      if (sclose (u->s) == FAILURE)
+      if (sclose (u->s) == -1)
        {
          unlock_unit (u);
          generate_error (&opp->common, LIBERROR_OS,

diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c
index 4c46016..00bea5a 100644 (file)
--- a/libgfortran/io/unit.c
+++ b/libgfortran/io/unit.c
@@ -626,7 +626,7 @@ close_unit_1 (gfc_unit *u, int locked)
   if (u->previous_nonadvancing_write)
     finish_last_advance_record (u);
 
-  rc = (u->s == NULL) ? 0 : sclose (u->s) == FAILURE;
+  rc = (u->s == NULL) ? 0 : sclose (u->s) == -1;
 
   u->closed = 1;
   if (!locked)

diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index 4f8cbb5..2fe73bb 100644 (file)
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -349,7 +349,7 @@ raw_close (unix_stream * s)
       && s->fd != STDIN_FILENO)
     retval = close (s->fd);
   else
-    retval = SUCCESS;
+    retval = 0;
   free_mem (s);
   return retval;
 }