ea99ec5bd6
In order to handle large characters when doing formatted I/O, use size_t and ptrdiff_t for lengths. Compared to the previous patch, based on discussions on IRC use size_t for sizes that don't need to be negative rather than ptrdiff_t everywhere. Regtested on x86_64-pc-linux-gnu, approved as part of the PR 78534 approval, committed to trunk. libgfortran/ChangeLog: 2018-01-07 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/78534 PR fortran/83704 * io/fbuf.c (fbuf_init): Use size_t instead of int for length. (fbuf_debug): Convert debug output to unsigned long. (fbuf_reset): Use ptrdiff_t for return value. (fbuf_alloc): Use size_t for length argument. (fbuf_flush): Handle large buffers. (fbuf_flush_list): Likewise. (fbuf_seek): Use ptrdiff_t for offset and return value. (fbuf_read): Use size_t for length argument. (fbuf_getc_refill): Use size_t to match fbuf_read. * io/fbuf.h (struct fbuf): Use size_t for lengths. (fbuf_init): Use size_t instead of int for length. (fbuf_reset): Use ptrdiff_t for return value. (fbuf_alloc): Use size_t for length argument. (fbuf_seek): Use ptrdiff_t for offset and return value. (fbuf_read): Use size_t for length argument. * io/io.h (read_block_form): Likewise. (read_block_form4): Likewise. (write_block): Likewise. (read_a): Likewise. (read_a_char4): Likewise. (read_x): Likewise. (write_a): Likewise. (write_a_char4): Likewise. * io/list_read.c (list_formatted_read_scalar): Use size_t to handle large buffers. * io/read.c (read_l): Likewise. (read_utf8): Likewise. (read_utf8_char1): Likewise. (read_default_char1): Likewise. (read_utf8_char4): Likewise. (read_default_char4): Likewise. (read_a): Likewise. (read_a_char4): Likewise. (eat_leading_spaces): Likewise. (next_char): Likewise. (read_decimal): Likewise. (read_radix): Likewise. (read_f): Likewise. (read_x): Likewise. * io/transfer.c (read_sf_internal): Likewise. (read_sf): Likewise. (read_block_form): Likewise. (read_block_form4): Likewise. (write_block): Likewise. (formatted_transfer_scalar_write): Likewise. (next_record_w): Likewise. * io/unix.c (mem_alloc_r): Likewise. (mem_alloc_r4): Likewise. (mem_alloc_w): Likewise. (mem_alloc_w4): Likewise. (mem_read): Likewise. (mem_read4): Likewise. (mem_write): Likewise. (mem_write4): Likewise. (open_internal): Likewise. (open_internal4): Likewise. * io/unix.h (open_internal): Likewise. (open_internal4): Likewise. (mem_alloc_w): Likewise. (mem_alloc_r): Likewise. (mem_alloc_w4): Likewise. (mem_alloc_r4): Likewise. * io/write.c (write_check_cc): Likewise. (write_cc): Likewise. (write_a): Likewise. (write_a_char4): Likewise. From-SVN: r256322
90 lines
2.7 KiB
C
90 lines
2.7 KiB
C
/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
|
|
Contributed by 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 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/>. */
|
|
|
|
#ifndef GFOR_FBUF_H
|
|
#define GFOR_FBUF_H
|
|
|
|
#include "io.h"
|
|
|
|
|
|
/* Formatting buffer. This is a temporary scratch buffer used by
|
|
formatted read and writes. After every formatted I/O statement,
|
|
this buffer is flushed. This buffer is needed since not all devices
|
|
are seekable, and T or TL edit descriptors require moving backwards
|
|
in the record. However, advance='no' complicates the situation, so
|
|
the buffer must only be partially flushed from the end of the last
|
|
flush until the current position in the record. */
|
|
|
|
struct fbuf
|
|
{
|
|
char *buf; /* Start of buffer. */
|
|
size_t len; /* Length of buffer. */
|
|
size_t act; /* Active bytes in buffer. */
|
|
size_t pos; /* Current position in buffer. */
|
|
};
|
|
|
|
extern void fbuf_init (gfc_unit *, size_t);
|
|
internal_proto(fbuf_init);
|
|
|
|
extern void fbuf_destroy (gfc_unit *);
|
|
internal_proto(fbuf_destroy);
|
|
|
|
extern ptrdiff_t fbuf_reset (gfc_unit *);
|
|
internal_proto(fbuf_reset);
|
|
|
|
extern char *fbuf_alloc (gfc_unit *, size_t);
|
|
internal_proto(fbuf_alloc);
|
|
|
|
extern int fbuf_flush (gfc_unit *, unit_mode);
|
|
internal_proto(fbuf_flush);
|
|
|
|
extern int fbuf_flush_list (gfc_unit *, unit_mode);
|
|
internal_proto(fbuf_flush_list);
|
|
|
|
extern ptrdiff_t fbuf_seek (gfc_unit *, ptrdiff_t, int);
|
|
internal_proto(fbuf_seek);
|
|
|
|
extern char *fbuf_read (gfc_unit *, size_t *);
|
|
internal_proto(fbuf_read);
|
|
|
|
/* Never call this function, only use fbuf_getc(). */
|
|
extern int fbuf_getc_refill (gfc_unit *);
|
|
internal_proto(fbuf_getc_refill);
|
|
|
|
static inline int
|
|
fbuf_getc (gfc_unit *u)
|
|
{
|
|
if (u->fbuf->pos < u->fbuf->act)
|
|
return (unsigned char) u->fbuf->buf[u->fbuf->pos++];
|
|
return fbuf_getc_refill (u);
|
|
}
|
|
|
|
static inline char *
|
|
fbuf_getptr (gfc_unit *u)
|
|
{
|
|
return (char*) (u->fbuf->buf + u->fbuf->pos);
|
|
}
|
|
|
|
#endif
|