PR 78534, 83704 Handle large formatted I/O

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

diff --git a/libgfortran/io/close.c b/libgfortran/io/close.c
index 63da0c420cd9b6fab84b519cd42e06b2ccf39a17..2117c40ac0d1f455ea6f123f6526e9d8492f672e 100644 (file)
--- a/libgfortran/io/close.c
+++ b/libgfortran/io/close.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2018 Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -46,7 +46,7 @@ st_close (st_parameter_close *clp)
   close_status status;
   gfc_unit *u;
 #if !HAVE_UNLINK_OPEN_FILE
-  char * path;
+  char *path;
 
   path = NULL;
 #endif
@@ -66,34 +66,43 @@ st_close (st_parameter_close *clp)
   u = find_unit (clp->common.unit);
   if (u != NULL)
     {
+      if (close_share (u) < 0)
+       generate_error (&clp->common, LIBERROR_OS, "Problem in CLOSE");
       if (u->flags.status == STATUS_SCRATCH)
        {
          if (status == CLOSE_KEEP)
            generate_error (&clp->common, LIBERROR_BAD_OPTION,
                            "Can't KEEP a scratch file on CLOSE");
 #if !HAVE_UNLINK_OPEN_FILE
-         path = (char *) gfc_alloca (u->file_len + 1);
-          unpack_filename (path, u->file, u->file_len);
+         path = strdup (u->filename);
 #endif
        }
       else
        {
          if (status == CLOSE_DELETE)
-            {
+           {
+             if (u->flags.readonly)
+               generate_warning (&clp->common, "STATUS set to DELETE on CLOSE"
+                                 " but file protected by READONLY specifier");
+             else
+               {
 #if HAVE_UNLINK_OPEN_FILE
-             delete_file (u);
+                 remove (u->filename);
 #else
-             path = (char *) gfc_alloca (u->file_len + 1);
-              unpack_filename (path, u->file, u->file_len);
+                 path = strdup (u->filename);
 #endif
-            }
+               }
+           }
        }
 
       close_unit (u);
 
 #if !HAVE_UNLINK_OPEN_FILE
       if (path != NULL)
-        unlink (path);
+       {
+         remove (path);
+         free (path);
+       }
 #endif
     }