[gcc] GCC 4.5.0=>4.5.1

gcc/libgfortran/io/open.c

 /* Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009
    Free Software Foundation, Inc.
    Contributed by Andy Vaught
    F2003 I/O support contributed by Jerry DeLisle
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
 
 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 3, or (at your option)
 any later version.
 
 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 General Public License for more details.
 
 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.
 
 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 "fbuf.h"
+#include "unix.h"
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
 
 static const st_option access_opt[] = {
   {"sequential", ACCESS_SEQUENTIAL},
   {"direct", ACCESS_DIRECT},
   {"append", ACCESS_APPEND},
   {"stream", ACCESS_STREAM},
@@ skipping 730 matching lines @@
                  form_opt, "Bad FORM parameter in OPEN statement");
 
   flags.position = !(cf & IOPARM_OPEN_HAS_POSITION) ? POSITION_UNSPECIFIED :
     find_option (&opp->common, opp->position, opp->position_len,
                  position_opt, "Bad POSITION parameter in OPEN statement");
 
   flags.status = !(cf & IOPARM_OPEN_HAS_STATUS) ? STATUS_UNSPECIFIED :
     find_option (&opp->common, opp->status, opp->status_len,
                  status_opt, "Bad STATUS parameter in OPEN statement");
 
-  /* First, we check whether the convert flag has been set via environment
+  /* First, we check wether the convert flag has been set via environment
      variable.  This overrides the convert tag in the open statement.  */
 
   conv = get_unformatted_convert (opp->common.unit);
 
   if (conv == GFC_CONVERT_NONE)
     {
       /* Nothing has been set by environment variable, check the convert tag.  */
       if (cf & IOPARM_OPEN_HAS_CONVERT)
         conv = find_option (&opp->common, opp->convert, opp->convert_len,
                             convert_opt,
@@ skipping 18 matching lines @@
       conv = big_endian ? GFC_CONVERT_SWAP : GFC_CONVERT_NATIVE;
       break;
       
     default:
       internal_error (&opp->common, "Illegal value for CONVERT");
       break;
     }
 
   flags.convert = conv;
 
-  if (opp->common.unit < 0)
+  if (!(opp->common.flags & IOPARM_OPEN_HAS_NEWUNIT) && opp->common.unit < 0)
     generate_error (&opp->common, LIBERROR_BAD_OPTION,
                     "Bad unit number in OPEN statement");
 
   if (flags.position != POSITION_UNSPECIFIED
       && flags.access == ACCESS_DIRECT)
     generate_error (&opp->common, LIBERROR_BAD_OPTION,
                     "Cannot use POSITION with direct access files");
 
   if (flags.access == ACCESS_APPEND)
     {
       if (flags.position != POSITION_UNSPECIFIED
           && flags.position != POSITION_APPEND)
         generate_error (&opp->common, LIBERROR_BAD_OPTION,
                         "Conflicting ACCESS and POSITION flags in"
                         " OPEN statement");
 
       notify_std (&opp->common, GFC_STD_GNU,
                   "Extension: APPEND as a value for ACCESS in OPEN statement");
       flags.access = ACCESS_SEQUENTIAL;
       flags.position = POSITION_APPEND;
     }
 
   if (flags.position == POSITION_UNSPECIFIED)
     flags.position = POSITION_ASIS;
 
   if ((opp->common.flags & IOPARM_LIBRETURN_MASK) == IOPARM_LIBRETURN_OK)
     {
+      if ((opp->common.flags & IOPARM_OPEN_HAS_NEWUNIT))
+        {
+          *opp->newunit = get_unique_unit_number(opp);
+          opp->common.unit = *opp->newunit;
+        }
+
       u = find_or_create_unit (opp->common.unit);
-
       if (u->s == NULL)
         {
           u = new_unit (opp, u, &flags);
           if (u != NULL)
             unlock_unit (u);
         }
       else
         already_open (opp, u, &flags);
     }
 
   library_end ();
 }