re PR libfortran/61499 (Internal read of negative integer broken)

[gcc.git] / libgfortran / io / lock.c

diff --git a/libgfortran/io/lock.c b/libgfortran/io/lock.c
index 8daf1aa57c3a51da63bf951333b6af2d21aba3f2..2208abdcddf54a95258b2f513a3cb6a3c6a08384 100644 (file)
--- a/libgfortran/io/lock.c
+++ b/libgfortran/io/lock.c
@@ -1,82 +1,66 @@
 /* Thread/recursion locking
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org> and Andy Vaught
 
-This file is part of the GNU Fortran 95 runtime library (libgfor).
+This file is part of the GNU Fortran runtime library (libgfortran).
 
-Libgfor is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+version 3 of the License, or (at your option) any later version.
 
-Libgfor is distributed in the hope that it will be useful,
+Libgfortran is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
+GNU General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with libgfor; see the file COPYING.LIB.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
 
-#include "config.h"
-#include <string.h>
-#include "libgfortran.h"
-#include "io.h"
-
-st_parameter ioparm;
-namelist_info * ionml;
-global_t g;
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
 
+#include "io.h"
+#include <string.h>
+#include <stdlib.h>
 
 /* library_start()-- Called with a library call is entered.  */
 
 void
-library_start (void)
+library_start (st_parameter_common *cmp)
 {
-  if (g.in_library)
-    internal_error ("Recursive library calls not allowed");
+  if ((cmp->flags & IOPARM_LIBRETURN_ERROR) != 0)
+    return;
 
-/* The in_library flag indicates whether we're currently processing a
- * library call.  Some calls leave immediately, but READ and WRITE
- * processing return control to the caller but are still considered to
- * stay within the library. */
-
-  g.in_library = 1;
-
-  if (ioparm.iostat != NULL && ioparm.library_return == LIBRARY_OK)
-    *ioparm.iostat = ERROR_OK;
-
-  ioparm.library_return = LIBRARY_OK;
+  cmp->flags &= ~IOPARM_LIBRETURN_MASK;
 }
 
 
-/* library_end()-- Called when a library call is complete in order to
- * clean up for the next call. */
-
 void
-library_end (void)
+free_ionml (st_parameter_dt *dtp)
 {
-  int t;
   namelist_info * t1, *t2;
 
-  g.in_library = 0;
-  filename = NULL;
-  line = 0;
+  /* Delete the namelist, if it exists.  */
 
-  t = ioparm.library_return;
-  if (ionml != NULL)
+  if (dtp->u.p.ionml != NULL)
     {
-      t1 = ionml;
+      t1 = dtp->u.p.ionml;
       while (t1 != NULL)
-       {
-         t2 = t1;
-         t1 = t1->next;
-         free_mem (t2);
-       }
+       {
+         t2 = t1;
+         t1 = t1->next;
+         free (t2->var_name);
+         if (t2->var_rank)
+           {
+            free (t2->dim);
+            free (t2->ls);
+           }
+         free (t2);
+       }
     }
-  
-  ionml = NULL;
-  memset (&ioparm, '\0', sizeof (ioparm));
-  ioparm.library_return = t;
+  dtp->u.p.ionml = NULL;
 }