07b3bbf200
2006-12-01 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/29568 * gfortran.dg/convert_implied_open.f90: Change to new default record length. * gfortran.dg/unf_short_record_1.f90: Adapt to new error message. * gfortran.dg/unformatted_subrecords_1.f90: New test. 2006-12-01 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/29568 * gfortran.h (gfc_option_t): Add max_subrecord_length. (top level): Define MAX_SUBRECORD_LENGTH. * lang.opt: Add option -fmax-subrecord-length=. * trans-decl.c: Add new function set_max_subrecord_length. (gfc_generate_function_code): If we are within the main program and max_subrecord_length has been set, call set_max_subrecord_length. * options.c (gfc_init_options): Add defaults for max_subrecord_lenght, convert and record_marker. (gfc_handle_option): Add handling for -fmax_subrecord_length. * invoke.texi: Document the new default for -frecord-marker=<n>. 2006-12-01 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/29568 * libgfortran/libgfortran.h (compile_options_t): Add record_marker. (top level): Define GFC_MAX_SUBRECORD_LENGTH. * runtime/compile_options.c (set_record_marker): Change default to four-byte record marker. (set_max_subrecord_length): New function. * runtime/error.c (translate_error): Change error message for short record on unformatted read. * io/io.h (gfc_unit): Add recl_subrecord, bytes_left_subrecord and continued. * io/file_pos.c (unformatted_backspace): Change default of record marker size to four bytes. Loop over subrecords. * io/open.c: Default recl is max_offset. If compile_options.max_subrecord_length has been set, set set u->recl_subrecord to its value, to the maximum value otherwise. * io/transfer.c (top level): Add prototypes for us_read, us_write, next_record_r_unf and next_record_w_unf. (read_block_direct): Separate codepaths for unformatted direct and unformatted sequential. If a recl has been set by the user, use the number of bytes left for the record if it is smaller than the read request. Loop over subrecords. Set an error if the user has set a recl and the read was short. (write_buf): Separate codepaths for unformatted direct and unformatted sequential. If a recl has been set by the user, use the number of bytes left for the record if it is smaller than the read request. Loop over subrecords. Set an error if the user has set a recl and the read was short. (us_read): Add parameter continued (to indicate that bytes_left should not be intialized). Change default of record marker size to four bytes. Use subrecord. If the subrecord length is smaller than zero, this indicates a continuation. (us_write): Add parameter continued (to indicate that the continued flag should be set). Use subrecord. (pre_position): Use 0 for continued on us_write and us_read calls. (skip_record): New function. (next_record_r_unf): New function. (next_record_r): Use next_record_r_unf. (write_us_marker): Default size for record markers is four bytes. (next_record_w_unf): New function. (next_record_w): Use next_record_w_unf. From-SVN: r119412
351 lines
7.9 KiB
C
351 lines
7.9 KiB
C
/* Copyright (C) 2002-2003, 2005, 2006 Free Software Foundation, Inc.
|
|
Contributed by Andy Vaught and Janne Blomqvist
|
|
|
|
This file is part of the GNU Fortran 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 2, or (at your option)
|
|
any later version.
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
compiled version of this file into combinations with other programs,
|
|
and to distribute those combinations without any restriction coming
|
|
from the use of this file. (The General Public License restrictions
|
|
do apply in other respects; for example, they cover modification of
|
|
the file, and distribution when not linked into a combine
|
|
executable.)
|
|
|
|
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.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with Libgfortran; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#include "config.h"
|
|
#include <string.h>
|
|
#include "libgfortran.h"
|
|
#include "io.h"
|
|
|
|
/* file_pos.c-- Implement the file positioning statements, i.e. BACKSPACE,
|
|
ENDFILE, and REWIND as well as the FLUSH statement. */
|
|
|
|
|
|
/* formatted_backspace(fpp, u)-- Move the file back one line. The
|
|
current position is after the newline that terminates the previous
|
|
record, and we have to sift backwards to find the newline before
|
|
that or the start of the file, whichever comes first. */
|
|
|
|
#define READ_CHUNK 4096
|
|
|
|
static void
|
|
formatted_backspace (st_parameter_filepos *fpp, gfc_unit *u)
|
|
{
|
|
gfc_offset base;
|
|
char *p;
|
|
int n;
|
|
|
|
base = file_position (u->s) - 1;
|
|
|
|
do
|
|
{
|
|
n = (base < READ_CHUNK) ? base : READ_CHUNK;
|
|
base -= n;
|
|
|
|
p = salloc_r_at (u->s, &n, base);
|
|
if (p == NULL)
|
|
goto io_error;
|
|
|
|
/* We have moved backwards from the current position, it should
|
|
not be possible to get a short read. Because it is not
|
|
clear what to do about such thing, we ignore the possibility. */
|
|
|
|
/* There is no memrchr() in the C library, so we have to do it
|
|
ourselves. */
|
|
|
|
n--;
|
|
while (n >= 0)
|
|
{
|
|
if (p[n] == '\n')
|
|
{
|
|
base += n + 1;
|
|
goto done;
|
|
}
|
|
n--;
|
|
}
|
|
|
|
}
|
|
while (base != 0);
|
|
|
|
/* base is the new pointer. Seek to it exactly. */
|
|
done:
|
|
if (sseek (u->s, base) == FAILURE)
|
|
goto io_error;
|
|
u->last_record--;
|
|
u->endfile = NO_ENDFILE;
|
|
|
|
return;
|
|
|
|
io_error:
|
|
generate_error (&fpp->common, ERROR_OS, NULL);
|
|
}
|
|
|
|
|
|
/* unformatted_backspace(fpp) -- Move the file backwards for an unformatted
|
|
sequential file. We are guaranteed to be between records on entry and
|
|
we have to shift to the previous record. Loop over subrecords. */
|
|
|
|
static void
|
|
unformatted_backspace (st_parameter_filepos *fpp, gfc_unit *u)
|
|
{
|
|
gfc_offset m, new;
|
|
GFC_INTEGER_4 m4;
|
|
GFC_INTEGER_8 m8;
|
|
int length, length_read;
|
|
int continued;
|
|
char *p;
|
|
|
|
if (compile_options.record_marker == 0)
|
|
length = sizeof (GFC_INTEGER_4);
|
|
else
|
|
length = compile_options.record_marker;
|
|
|
|
do
|
|
{
|
|
length_read = length;
|
|
|
|
p = salloc_r_at (u->s, &length_read,
|
|
file_position (u->s) - length);
|
|
if (p == NULL || length_read != length)
|
|
goto io_error;
|
|
|
|
/* Only CONVERT_NATIVE and CONVERT_SWAP are valid here. */
|
|
if (u->flags.convert == CONVERT_NATIVE)
|
|
{
|
|
switch (length)
|
|
{
|
|
case sizeof(GFC_INTEGER_4):
|
|
memcpy (&m4, p, sizeof (m4));
|
|
m = m4;
|
|
break;
|
|
|
|
case sizeof(GFC_INTEGER_8):
|
|
memcpy (&m8, p, sizeof (m8));
|
|
m = m8;
|
|
break;
|
|
|
|
default:
|
|
runtime_error ("Illegal value for record marker");
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
switch (length)
|
|
{
|
|
case sizeof(GFC_INTEGER_4):
|
|
reverse_memcpy (&m4, p, sizeof (m4));
|
|
m = m4;
|
|
break;
|
|
|
|
case sizeof(GFC_INTEGER_8):
|
|
reverse_memcpy (&m8, p, sizeof (m8));
|
|
m = m8;
|
|
break;
|
|
|
|
default:
|
|
runtime_error ("Illegal value for record marker");
|
|
break;
|
|
}
|
|
|
|
}
|
|
|
|
continued = m < 0;
|
|
if (continued)
|
|
m = -m;
|
|
|
|
if ((new = file_position (u->s) - m - 2*length) < 0)
|
|
new = 0;
|
|
|
|
if (sseek (u->s, new) == FAILURE)
|
|
goto io_error;
|
|
} while (continued);
|
|
|
|
u->last_record--;
|
|
return;
|
|
|
|
io_error:
|
|
generate_error (&fpp->common, ERROR_OS, NULL);
|
|
}
|
|
|
|
|
|
extern void st_backspace (st_parameter_filepos *);
|
|
export_proto(st_backspace);
|
|
|
|
void
|
|
st_backspace (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u == NULL)
|
|
{
|
|
generate_error (&fpp->common, ERROR_BAD_UNIT, NULL);
|
|
goto done;
|
|
}
|
|
|
|
/* Ignore direct access. Non-advancing I/O is only allowed for formatted
|
|
sequential I/O and the next direct access transfer repositions the file
|
|
anyway. */
|
|
|
|
if (u->flags.access == ACCESS_DIRECT || u->flags.access == ACCESS_STREAM)
|
|
goto done;
|
|
|
|
/* Check for special cases involving the ENDFILE record first. */
|
|
|
|
if (u->endfile == AFTER_ENDFILE)
|
|
{
|
|
u->endfile = AT_ENDFILE;
|
|
flush (u->s);
|
|
struncate (u->s);
|
|
}
|
|
else
|
|
{
|
|
if (file_position (u->s) == 0)
|
|
goto done; /* Common special case */
|
|
|
|
if (u->mode == WRITING)
|
|
{
|
|
flush (u->s);
|
|
struncate (u->s);
|
|
u->mode = READING;
|
|
}
|
|
|
|
if (u->flags.form == FORM_FORMATTED)
|
|
formatted_backspace (fpp, u);
|
|
else
|
|
unformatted_backspace (fpp, u);
|
|
|
|
u->endfile = NO_ENDFILE;
|
|
u->current_record = 0;
|
|
u->bytes_left = 0;
|
|
}
|
|
|
|
done:
|
|
if (u != NULL)
|
|
unlock_unit (u);
|
|
|
|
library_end ();
|
|
}
|
|
|
|
|
|
extern void st_endfile (st_parameter_filepos *);
|
|
export_proto(st_endfile);
|
|
|
|
void
|
|
st_endfile (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u != NULL)
|
|
{
|
|
if (u->current_record)
|
|
{
|
|
st_parameter_dt dtp;
|
|
dtp.common = fpp->common;
|
|
memset (&dtp.u.p, 0, sizeof (dtp.u.p));
|
|
dtp.u.p.current_unit = u;
|
|
next_record (&dtp, 1);
|
|
}
|
|
|
|
flush (u->s);
|
|
struncate (u->s);
|
|
u->endfile = AFTER_ENDFILE;
|
|
unlock_unit (u);
|
|
}
|
|
|
|
library_end ();
|
|
}
|
|
|
|
|
|
extern void st_rewind (st_parameter_filepos *);
|
|
export_proto(st_rewind);
|
|
|
|
void
|
|
st_rewind (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u != NULL)
|
|
{
|
|
if (u->flags.access == ACCESS_DIRECT)
|
|
generate_error (&fpp->common, ERROR_BAD_OPTION,
|
|
"Cannot REWIND a file opened for DIRECT access");
|
|
else
|
|
{
|
|
/* Flush the buffers. If we have been writing to the file, the last
|
|
written record is the last record in the file, so truncate the
|
|
file now. Reset to read mode so two consecutive rewind
|
|
statements do not delete the file contents. */
|
|
flush (u->s);
|
|
if (u->mode == WRITING && u->flags.access != ACCESS_STREAM)
|
|
struncate (u->s);
|
|
|
|
u->mode = READING;
|
|
u->last_record = 0;
|
|
if (sseek (u->s, 0) == FAILURE)
|
|
generate_error (&fpp->common, ERROR_OS, NULL);
|
|
|
|
u->endfile = NO_ENDFILE;
|
|
u->current_record = 0;
|
|
u->bytes_left = 0;
|
|
u->strm_pos = 1;
|
|
u->read_bad = 0;
|
|
test_endfile (u);
|
|
}
|
|
/* Update position for INQUIRE. */
|
|
u->flags.position = POSITION_REWIND;
|
|
unlock_unit (u);
|
|
}
|
|
|
|
library_end ();
|
|
}
|
|
|
|
|
|
extern void st_flush (st_parameter_filepos *);
|
|
export_proto(st_flush);
|
|
|
|
void
|
|
st_flush (st_parameter_filepos *fpp)
|
|
{
|
|
gfc_unit *u;
|
|
|
|
library_start (&fpp->common);
|
|
|
|
u = find_unit (fpp->common.unit);
|
|
if (u != NULL)
|
|
{
|
|
flush (u->s);
|
|
unlock_unit (u);
|
|
}
|
|
else
|
|
/* FLUSH on unconnected unit is illegal: F95 std., 9.3.5. */
|
|
generate_error (&fpp->common, ERROR_BAD_OPTION,
|
|
"Specified UNIT in FLUSH is not connected");
|
|
|
|
library_end ();
|
|
}
|