From: Janne Blomqvist <jb@gcc.gnu.org>
Date: Wed, 17 Sep 2014 21:44:15 +0000 (+0300)
Subject: PR libfortran/62768 Use gfc_unit.filename also when HAVE_TTYNAME{_R} is not defined.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=010718fc37a1e84698479677381e654169082cd0;p=gcc.git

PR libfortran/62768 Use gfc_unit.filename also when HAVE_TTYNAME{_R} is not defined.

2014-09-18  Janne Blomqvist  <jb@gcc.gnu.org>

	PR libfortran/62768
	* io/inquire.c (inquire_via_unit): Use gfc_unit.filename also when
	HAVE_TTYNAME{_R} is not defined.

From-SVN: r215338
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index fde3965e5eb..e27c2a7f7c1 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-18  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	PR libfortran/62768
+	* io/inquire.c (inquire_via_unit): Use gfc_unit.filename also when
+	HAVE_TTYNAME{_R} is not defined.
+
 2014-09-17  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	PR libfortran/62768
diff --git a/libgfortran/io/inquire.c b/libgfortran/io/inquire.c
index 4d03161cbf8..c8b5623402c 100644
--- a/libgfortran/io/inquire.c
+++ b/libgfortran/io/inquire.c
@@ -92,9 +92,9 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u)
       else if (u->unit_number == options.stderr_unit)
 	fstrcpy (iqp->name, iqp->name_len, "CONERR$", sizeof("CONERR$"));
       else
-	fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
+	cf_strcpy (iqp->name, iqp->name_len, u->filename);
 #else
-    fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
+    cf_strcpy (iqp->name, iqp->name_len, u->filename);
 #endif
     }