re PR libfortran/31052 ([4.2 only] Bad IOSTAT values when readings NAMELISTs past...

2007-03-22  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/31052
	* file_pos.c: Update Copyright year.
	* io/open.c (test_endfile): Restore test_endfile to fix SPEC regression.
	Update Copyright year.
	* io/io.h: Same.
	* io/unix.c (is_special): Add missing type for this function.
	Update Copyright year.
	* io/transfer.c (next_record_r): Restore test_endfile.
	(st_read): Fix whitespace.  Update Copyright year

From-SVN: r123139

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 2bf034e066dd0779092cd0d1c2aa8039db4fa654..1281bbb12ca470e976acb8eb6cdf1b12f57439dd 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-22  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libgfortran/31052
+       * file_pos.c: Update Copyright year.
+       * io/open.c (test_endfile): Restore test_endfile to fix SPEC regression.
+       Update Copyright year.
+       * io/io.h: Same.
+       * io/unix.c (is_special): Add missing type for this function.
+       Update Copyright year.
+       * io/transfer.c (next_record_r): Restore test_endfile.
+       (st_read): Fix whitespace.  Update Copyright year
+
 2007-03-20  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
        * configure.ac: Add missing check for gettimeofday.

diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
index 085921b04ccf60fb6bb425596e716c3b52750fb5..846dae932ecd6f018115f60e13f5d6c22dd8910f 100644 (file)
--- a/libgfortran/io/file_pos.c
+++ b/libgfortran/io/file_pos.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2003, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2003, 2005, 2006, 2007 Free Software Foundation, Inc.
    Contributed by Andy Vaught and Janne Blomqvist
 
 This file is part of the GNU Fortran runtime library (libgfortran).

diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index 3ec9506abda2a5c9b018b8780b51353b35cabc12..26273d9018e80aee1d22a717f36180ed8d02c014 100644 (file)
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -694,6 +695,9 @@ internal_proto(unlock_unit);
 
 /* open.c */
 
+extern void test_endfile (gfc_unit *);
+internal_proto(test_endfile);
+
 extern gfc_unit *new_unit (st_parameter_open *, gfc_unit *, unit_flags *);
 internal_proto(new_unit);
 

diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c
index d22663d9d057642c5bba115f34f452141bbd5770..8c6f9fb06188428f3587c55d19f2886c23f97b62 100644 (file)
--- a/libgfortran/io/open.c
+++ b/libgfortran/io/open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005
+/* Copyright (C) 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
@@ -109,6 +109,19 @@ static const st_option convert_opt[] =
   { NULL, 0}
 };
 
+/* Given a unit, test to see if the file is positioned at the terminal
+   point, and if so, change state from NO_ENDFILE flag to AT_ENDFILE.
+   This prevents us from changing the state from AFTER_ENDFILE to
+   AT_ENDFILE.  */
+
+void
+test_endfile (gfc_unit * u)
+{
+  if (u->endfile == NO_ENDFILE && file_length (u->s) == file_position (u->s))
+    u->endfile = AT_ENDFILE;
+}
+
+
 /* Change the modes of a file, those that are allowed * to be
    changed.  */
 
@@ -195,6 +208,8 @@ edit_modes (st_parameter_open *opp, gfc_unit * u, unit_flags * flags)
 
       u->current_record = 0;
       u->last_record = 0;
+
+      test_endfile (u);                /* We might be at the end.  */
       break;
 
     case POSITION_APPEND:
@@ -471,6 +486,13 @@ new_unit (st_parameter_open *opp, gfc_unit *u, unit_flags * flags)
   memmove (u->file, opp->file, opp->file_len);
   u->file_len = opp->file_len;
 
+  /* Curiously, the standard requires that the
+     position specifier be ignored for new files so a newly connected
+     file starts out at the initial point.  We still need to figure
+     out if the file is at the end or not.  */
+
+  test_endfile (u);
+
   if (flags->status == STATUS_SCRATCH && opp->file != NULL)
     free_mem (opp->file);
   return u;

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index efa788cda52731d68c55033be2e03d2e737542b0..77e2ab1344a50a441b6f5322d2e34ec87fb3a148 100644 (file)
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
    Contributed by Andy Vaught
    Namelist transfer functions contributed by Paul Thomas
 
@@ -2222,6 +2223,9 @@ next_record_r (st_parameter_dt *dtp)
 
       break;
     }
+
+  if (dtp->u.p.current_unit->flags.access == ACCESS_SEQUENTIAL)
+    test_endfile (dtp->u.p.current_unit);
 }
 
 
@@ -2681,7 +2685,7 @@ st_read (st_parameter_dt *dtp)
 
   data_transfer_init (dtp, 1);
 
-  /* Handle complications dealing with the endfile record. */
+  /* Handle complications dealing with the endfile record.  */
 
   if (dtp->u.p.current_unit->flags.access == ACCESS_SEQUENTIAL)
     switch (dtp->u.p.current_unit->endfile)

diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index 4b9d87f4ee8396d2d16b663c3bd865b7908f14dd..458983c4595b978fa93f18d5e9e0be8814e151b5 100644 (file)
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -1892,6 +1892,7 @@ is_seekable (stream *s)
 
 /* is_special()-- Return nonzero if the stream is not a regular file.  */
 
+int
 is_special (stream *s)
 {
   return ((unix_stream *) s)->special_file;