From 03bd41b98b415e1c2e7c2db1a53bd029f9e6ccc6 Mon Sep 17 00:00:00 2001 From: law Date: Tue, 17 Feb 1998 20:53:03 +0000 Subject: [PATCH] * config/linux.mt (IO_OBJECTS): Add iogetline.o. * config/linuxlibc1.mt: Ditto. * iogetline.c (_IO_getline_info): Renamed from _IO_getline. (_IO_getline): Just call _IO_getline_info. * isgetline.cc (istream::getline, istream::get, _sb_readline): Call _IO_getline_info instead of _IO_getline and get the EOF information. * sbgetline.cc (streambuf::sgetline): Ditto. * libioP.h (_IO_getline_info): New declaration. * iogetline.c (_IO_getline): Handle the case when there is no buffer. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/egcs_1_00_branch@18041 138bc75d-0d04-0410-961f-82ee72b054a4 --- libio/ChangeLog | 16 +++++ libio/config/linux.mt | 2 +- libio/config/linuxlibc1.mt | 2 +- libio/iogetline.c | 80 +++++++++++++++++------- libio/isgetline.cc | 149 +++------------------------------------------ libio/libioP.h | 2 + libio/sbgetline.cc | 32 +--------- 7 files changed, 88 insertions(+), 195 deletions(-) rewrite libio/isgetline.cc (99%) rewrite libio/sbgetline.cc (100%) diff --git a/libio/ChangeLog b/libio/ChangeLog index e5da502862a..0e429191f68 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,5 +1,21 @@ Tue Feb 17 21:52:44 1998 H.J. Lu (hjl@gnu.org) + * config/linux.mt (IO_OBJECTS): Add iogetline.o. + * config/linuxlibc1.mt: Ditto. + + * iogetline.c (_IO_getline_info): Renamed from _IO_getline. + (_IO_getline): Just call _IO_getline_info. + + * isgetline.cc (istream::getline, istream::get, _sb_readline): + Call _IO_getline_info instead of _IO_getline and get the EOF + information. + * sbgetline.cc (streambuf::sgetline): Ditto. + + * libioP.h (_IO_getline_info): New declaration. + + * iogetline.c (_IO_getline): Handle the case when there is no + buffer. + * filebuf.cc (filebuf::open): Call _IO_file_open if _G_HAVE_IO_FILE_OPEN is 1. diff --git a/libio/config/linux.mt b/libio/config/linux.mt index 10536f98b15..0585d90cd10 100644 --- a/libio/config/linux.mt +++ b/libio/config/linux.mt @@ -16,7 +16,7 @@ _G_CONFIG_H= LIBIO_INCLUDE= # We have those in libc.a. -IO_OBJECTS= +IO_OBJECTS= iogetline.o STDIO_WRAP_OBJECTS= OSPRIM_OBJECTS= STDIO_OBJECTS= diff --git a/libio/config/linuxlibc1.mt b/libio/config/linuxlibc1.mt index 09c4c83804e..90fa427225e 100644 --- a/libio/config/linuxlibc1.mt +++ b/libio/config/linuxlibc1.mt @@ -11,7 +11,7 @@ LIBIO_INCLUDE= # We have those in libc.a. IO_OBJECTS=iogetc.o ioputc.o iofeof.o ioferror.o \ filedoalloc.o fileops.o genops.o iofclose.o \ - iovsprintf.o iovsscanf.o strops.o + iovsprintf.o iovsscanf.o strops.o iogetline.o STDIO_WRAP_OBJECTS= OSPRIM_OBJECTS= STDIO_OBJECTS= diff --git a/libio/iogetline.c b/libio/iogetline.c index bd1a7431f36..631db78d127 100644 --- a/libio/iogetline.c +++ b/libio/iogetline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -26,6 +26,19 @@ #include "libioP.h" #include +#if defined(_LIBC) || !_G_HAVE_IO_GETLINE_INFO + +_IO_size_t +_IO_getline (fp, buf, n, delim, extract_delim) + _IO_FILE *fp; + char *buf; + _IO_size_t n; + int delim; + int extract_delim; +{ + return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0); +} + /* Algorithm based on that used by Berkeley pre-4.4 fgets implementation. Read chars into buf (of size n), until delim is seen. @@ -35,44 +48,65 @@ If extract_delim > 0, insert delim in output. */ _IO_size_t -_IO_getline (fp, buf, n, delim, extract_delim) +_IO_getline_info (fp, buf, n, delim, extract_delim, eof) _IO_FILE *fp; char *buf; _IO_size_t n; int delim; int extract_delim; + int *eof; { char *ptr = buf; + if (eof) *eof = 0; do { _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr; - char *t; if (len <= 0) - if (__underflow (fp) == EOF) - break; - else - len = fp->_IO_read_end - fp->_IO_read_ptr; - if ((_IO_size_t) len >= n) - len = n; - t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); - if (t != NULL) { - _IO_size_t old_len = ptr-buf; - len = t - fp->_IO_read_ptr; - if (extract_delim >= 0) + int c = __uflow (fp); + if (c == EOF) + { + if (eof) *eof = c; + break; + } + if (c == delim) { - ++t; if (extract_delim > 0) - ++len; + *ptr++ = c; + else if (extract_delim < 0) + _IO_sputbackc (fp, c); + return ptr - buf; } - memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); - fp->_IO_read_ptr = t; - return old_len + len; + *ptr++ = c; + n--; } - memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); - fp->_IO_read_ptr += len; - ptr += len; - n -= len; + else + { + char *t; + if ((_IO_size_t) len >= n) + len = n; + t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); + if (t != NULL) + { + _IO_size_t old_len = ptr-buf; + len = t - fp->_IO_read_ptr; + if (extract_delim >= 0) + { + ++t; + if (extract_delim > 0) + ++len; + } + memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); + fp->_IO_read_ptr = t; + return old_len + len; + } + memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); + fp->_IO_read_ptr += len; + ptr += len; + n -= len; + } } while (n != 0); return ptr - buf; } + +#endif /* Defined(_LIBC) || !_G_HAVE_IO_GETLINE_INFO */ diff --git a/libio/isgetline.cc b/libio/isgetline.cc dissimilarity index 99% index add26638b20..228842f9530 100644 --- a/libio/isgetline.cc +++ b/libio/isgetline.cc @@ -1,139 +1,10 @@ -/* This is part of libio/iostream, providing -*- C++ -*- input/output. -Copyright (C) 1993 Free Software Foundation - -This file is part of the GNU IO Library. This library 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. - -This library 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 this library; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -As a special exception, if you link this library with files -compiled with a GNU compiler to produce an executable, this does not cause -the resulting executable to be covered by the GNU General Public License. -This exception does not however invalidate any other reasons why -the executable file might be covered by the GNU General Public License. */ - -#include -#include "iostream.h" -#include - -istream& istream::getline(char* buf, int len, char delim) -{ - _gcount = 0; - if (len <= 0) - { - set(ios::failbit); - return *this; - } - int ch; - if (ipfx1()) - { - streambuf *sb = rdbuf(); - _gcount = _IO_getline(sb, buf, len - 1, delim, -1); - ch = sb->sbumpc(); - if (ch == EOF) - set (_gcount == 0 ? (ios::failbit|ios::eofbit) : ios::eofbit); - else if (ch != (unsigned char) delim) - { - set(ios::failbit); - sb->sungetc(); // Leave delimiter unread. - } - } - else - ch = EOF; - buf[_gcount] = '\0'; - if (ch == (unsigned char)delim) - _gcount++; // The delimiter is counted in the gcount(). - return *this; -} - -istream& istream::get(char* buf, int len, char delim) -{ - _gcount = 0; - if (len <= 0) - { - set(ios::failbit); - return *this; - } - if (ipfx1()) - { - streambuf *sbuf = rdbuf(); - long count = _IO_getline(sbuf, buf, len - 1, delim, -1); - if (count == 0 && sbuf->sgetc() == EOF) - set(ios::failbit|ios::eofbit); - else - _gcount = count; - } - buf[_gcount] = '\0'; - return *this; -} - - -// from Doug Schmidt - -#define CHUNK_SIZE 512 - -/* Reads an arbitrarily long input line terminated by a user-specified - TERMINATOR. Super-nifty trick using recursion avoids unnecessary calls - to NEW! */ - -char *_sb_readline (streambuf *sb, long& total, char terminator) -{ - char buf[CHUNK_SIZE]; - char *ptr; - int ch; - - _IO_size_t count = _IO_getline(sb, buf, CHUNK_SIZE, terminator, -1); - ch = sb->sbumpc(); - long old_total = total; - total += count; - if (ch != EOF && ch != terminator) { - total++; // Include ch in total. - ptr = _sb_readline(sb, total, terminator); - if (ptr) { - memcpy(ptr + old_total, buf, count); - ptr[old_total+count] = ch; - } - return ptr; - } - - ptr = new char[total+1]; - if (ptr != NULL) { - ptr[total] = '\0'; - memcpy(ptr + total - count, buf, count); - } - return ptr; -} - -/* Reads an arbitrarily long input line terminated by TERMINATOR. - This routine allocates its own memory, so the user should - only supply the address of a (char *). */ - -istream& istream::gets(char **s, char delim /* = '\n' */) -{ - if (ipfx1()) { - long size = 0; - streambuf *sb = rdbuf(); - *s = _sb_readline (sb, size, delim); - _gcount = *s ? size : 0; - if (sb->_flags & _IO_EOF_SEEN) { - set(ios::eofbit); - if (_gcount == 0) - set(ios::failbit); - } - } - else { - _gcount = 0; - *s = NULL; - } - return *this; -} + _gcount = _IO_getline_info(sb, buf, len - 1, delim, -1, &ch); + if (ch != EOF) + ch = sb->sbumpc(); + int ch; + long count = _IO_getline_info(sbuf, buf, len - 1, delim, -1, &ch); + if (_gcount == 0 && ch == EOF) + _IO_size_t count = _IO_getline_info(sb, buf, CHUNK_SIZE, terminator, + -1, &ch); + if (ch != EOF) + ch = sb->sbumpc(); diff --git a/libio/libioP.h b/libio/libioP.h index 7a5ca9044e8..3a138f0c077 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -417,6 +417,8 @@ extern int _IO_vsnprintf __P ((char *string, _IO_size_t maxlen, extern _IO_size_t _IO_getline __P ((_IO_FILE *,char *, _IO_size_t, int, int)); +extern _IO_size_t _IO_getline_info __P ((_IO_FILE *,char *, _IO_size_t, + int, int, int *)); extern _IO_ssize_t _IO_getdelim __P ((char **, _IO_size_t *, int, _IO_FILE *)); extern double _IO_strtod __P ((const char *, char **)); extern char *_IO_dtoa __P ((double __d, int __mode, int __ndigits, diff --git a/libio/sbgetline.cc b/libio/sbgetline.cc dissimilarity index 100% index 700e2ec7afc..79beb0519b2 100644 --- a/libio/sbgetline.cc +++ b/libio/sbgetline.cc @@ -1,31 +1 @@ -/* -Copyright (C) 1993 Free Software Foundation - -This file is part of the GNU IO Library. This library 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. - -This library 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 this library; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -As a special exception, if you link this library with files -compiled with a GNU compiler to produce an executable, this does not cause -the resulting executable to be covered by the GNU General Public License. -This exception does not however invalidate any other reasons why -the executable file might be covered by the GNU General Public License. */ - -#include "libioP.h" -#include "streambuf.h" - -long streambuf::sgetline(char* buf, _IO_size_t n, char delim, int extract_delim) -{ - return _IO_getline(this, buf, n, delim, extract_delim); -} + return _IO_getline_info(this, buf, n, delim, extract_delim, (int *) 0); -- 2.11.4.GIT