From: Francois-Xavier Coudert <coudert@clipper.ens.fr>
Date: Fri, 2 Dec 2005 16:46:49 +0000 (+0100)
Subject: re PR libfortran/25116 ([4.0] namelist read from non-opened file)
X-Git-Tag: releases/gcc-4.2.0~5610
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc0de35e81bc14d3b72fcfc5e3ce01175f420320;p=thirdparty%2Fgcc.git

re PR libfortran/25116 ([4.0] namelist read from non-opened file)

	PR libfortran/25116
	* io/transfer.c (data_transfer_init): Don't set the default for
	namelist I/O on preconnected files to UNFORMATTED.

From-SVN: r107900
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 90b431805cb7..eaddca326b78 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-02  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	PR libfortran/25116
+	* io/transfer.c (data_transfer_init): Don't set the default for
+	namelist I/O on preconnected files to UNFORMATTED.
+
 2005-11-30  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* libgfortran.h (ILP32 typedefs): Define _UINT8_T, _UINT32_T and
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 44cf27ec65af..84d3532deac6 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -1239,11 +1239,14 @@ data_transfer_init (st_parameter_dt *dtp, int read_flag)
      memset (&u_flags, '\0', sizeof (u_flags));
      u_flags.access = ACCESS_SEQUENTIAL;
      u_flags.action = ACTION_READWRITE;
+
      /* Is it unformatted?  */
-     if (!(cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT)))
+     if (!(cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT
+		 | IOPARM_DT_IONML_SET)))
        u_flags.form = FORM_UNFORMATTED;
      else
        u_flags.form = FORM_UNSPECIFIED;
+
      u_flags.delim = DELIM_UNSPECIFIED;
      u_flags.blank = BLANK_UNSPECIFIED;
      u_flags.pad = PAD_UNSPECIFIED;