From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Thu, 15 Jan 2015 03:57:29 +0000 (+0000)
Subject: re PR fortran/61933 (Inquire on internal units)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=351b44325229ff37ba8c8e4685cdabce38644d68;p=gcc.git

re PR fortran/61933 (Inquire on internal units)

2015-01-14  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/61933
	* io/inquire.c (inquire_via_unit): Set existing to true if a
	gfc_unit stucture was found for the given unit number.
	* runtime/error.c (translate_error): Add case for
	LIBERROR_INQUIRE_INTERNAL_UNIT.

From-SVN: r219631
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 4e3ba2308b6..33fb6dad9e5 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-14  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/61933
+	* io/inquire.c (inquire_via_unit): Set existing to true if a
+	gfc_unit stucture was found for the given unit number.
+	* runtime/error.c (translate_error): Add case for
+	LIBERROR_INQUIRE_INTERNAL_UNIT.
+
 2015-01-05  Jakub Jelinek  <jakub@redhat.com>
 
 	Update copyright years.
diff --git a/libgfortran/io/inquire.c b/libgfortran/io/inquire.c
index b53b1de5422..21367a6d83f 100644
--- a/libgfortran/io/inquire.c
+++ b/libgfortran/io/inquire.c
@@ -41,19 +41,11 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u)
   const char *p;
   GFC_INTEGER_4 cf = iqp->common.flags;
 
-  if ((cf & IOPARM_INQUIRE_HAS_EXIST) != 0)
-    {
-      *iqp->exist = (iqp->common.unit >= 0
-		     && iqp->common.unit <= GFC_INTEGER_4_HUGE);
+  if (iqp->common.unit == -1)
+    generate_error (&iqp->common, LIBERROR_INQUIRE_INTERNAL_UNIT, NULL);
 
-      if ((cf & IOPARM_INQUIRE_HAS_FILE) == 0)
-	{
-	  if (!(*iqp->exist))
-	    *iqp->common.iostat = LIBERROR_BAD_UNIT;
-	  *iqp->exist = *iqp->exist
-			&& (*iqp->common.iostat != LIBERROR_BAD_UNIT);
-	}
-    }
+  if ((cf & IOPARM_INQUIRE_HAS_EXIST) != 0)
+    *iqp->exist = (u != NULL);
 
   if ((cf & IOPARM_INQUIRE_HAS_OPENED) != 0)
     *iqp->opened = (u != NULL);
diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index e2df96d23a9..098231916aa 100644
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -488,6 +488,10 @@ translate_error (int code)
       p = "Unformatted file structure has been corrupted";
       break;
 
+    case LIBERROR_INQUIRE_INTERNAL_UNIT:
+      p = "Inquire statement identifies an internal file";
+      break;
+
     default:
       p = "Unknown error code";
       break;