From: H.J. Lu Date: Tue, 17 Feb 1998 20:54:12 +0000 (+0000) Subject: linux.mt (IO_OBJECTS): Add iogetline.o. X-Git-Tag: prereleases/egcs-1.1-prerelease~2362 X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=3c1493a85535bab3da1ce892998c0355a8e56086;p=gcc.git linux.mt (IO_OBJECTS): Add iogetline.o. * 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. From-SVN: r18042 --- diff --git a/libio/ChangeLog b/libio/ChangeLog index d97d6fe21567..98dac951e524 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,21 @@ +Tue Feb 17 21:56:25 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. + Fri Feb 13 00:57:20 1998 Krister Walfridsson (cato@df.lth.se) * fileops.c: #include . diff --git a/libio/config/linux.mt b/libio/config/linux.mt index 10536f98b157..0585d90cd103 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 09c4c83804e9..90fa427225e3 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 bd1a7431f362..631db78d1276 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 index add26638b203..2a2cd0f58a77 100644 --- a/libio/isgetline.cc +++ b/libio/isgetline.cc @@ -38,8 +38,9 @@ istream& istream::getline(char* buf, int len, char delim) if (ipfx1()) { streambuf *sb = rdbuf(); - _gcount = _IO_getline(sb, buf, len - 1, delim, -1); - ch = sb->sbumpc(); + _gcount = _IO_getline_info(sb, buf, len - 1, delim, -1, &ch); + if (ch != EOF) + ch = sb->sbumpc(); if (ch == EOF) set (_gcount == 0 ? (ios::failbit|ios::eofbit) : ios::eofbit); else if (ch != (unsigned char) delim) @@ -67,8 +68,9 @@ istream& istream::get(char* buf, int len, char delim) if (ipfx1()) { streambuf *sbuf = rdbuf(); - long count = _IO_getline(sbuf, buf, len - 1, delim, -1); - if (count == 0 && sbuf->sgetc() == EOF) + int ch; + long count = _IO_getline_info(sbuf, buf, len - 1, delim, -1, &ch); + if (_gcount == 0 && ch == EOF) set(ios::failbit|ios::eofbit); else _gcount = count; @@ -92,8 +94,10 @@ char *_sb_readline (streambuf *sb, long& total, char terminator) char *ptr; int ch; - _IO_size_t count = _IO_getline(sb, buf, CHUNK_SIZE, terminator, -1); - ch = sb->sbumpc(); + _IO_size_t count = _IO_getline_info(sb, buf, CHUNK_SIZE, terminator, + -1, &ch); + if (ch != EOF) + ch = sb->sbumpc(); long old_total = total; total += count; if (ch != EOF && ch != terminator) { diff --git a/libio/libioP.h b/libio/libioP.h index 7a5ca9044e8e..3a138f0c077e 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 index 700e2ec7afc3..0475114c629e 100644 --- a/libio/sbgetline.cc +++ b/libio/sbgetline.cc @@ -27,5 +27,5 @@ the executable file might be covered by the GNU General Public License. */ 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); }