This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
A libio patch for egcs 1.0.2
- To: egcs at cygnus dot com
- Subject: A libio patch for egcs 1.0.2
- From: hjl at lucon dot org (H.J. Lu)
- Date: Mon, 16 Feb 1998 19:55:49 -0800 (PST)
Hi,
Here is a libio patch for egcs 1.0.2 to fix the getline bug. We have
to keep _IO_getline since it is an internal function of the
shared glibc.
Thanks.
--
H.J. Lu (hjl@gnu.org)
----
Mon Feb 16 10:36:26 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.
Fri Feb 13 23:14:49 1998 Per Bothner <bothner@cygnus.com>
* iogetline.c (_IO_getline): Handle the case when there is no
buffer.
--- /home/work/misc/gnu/import/egcs/libio/config/linux.mt Thu Nov 27 00:34:23 1997
+++ config/linux.mt Thu Feb 12 07:53:21 1998
@@ -16,7 +16,7 @@
LIBIO_INCLUDE=
# We have those in libc.a.
-IO_OBJECTS=
+IO_OBJECTS= iogetline.o
STDIO_WRAP_OBJECTS=
OSPRIM_OBJECTS=
STDIO_OBJECTS=
--- /home/work/misc/gnu/import/egcs/libio/config/linuxlibc1.mt Wed Oct 22 18:17:58 1997
+++ config/linuxlibc1.mt Thu Feb 12 07:53:30 1998
@@ -11,7 +11,7 @@
# 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=
--- /home/work/misc/gnu/import/egcs/libio/iogetline.c Sat Sep 6 00:43:18 1997
+++ iogetline.c Mon Feb 16 10:48:18 1998
@@ -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 <string.h>
+#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 */
--- /home/work/misc/gnu/import/egcs/libio/isgetline.cc Thu Aug 21 15:58:19 1997
+++ isgetline.cc Mon Feb 16 10:48:27 1998
@@ -38,8 +38,9 @@
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 @@
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 *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) {
--- /home/work/misc/gnu/import/egcs/libio/sbgetline.cc Thu Aug 21 15:58:21 1997
+++ sbgetline.cc Mon Feb 16 10:48:38 1998
@@ -27,5 +27,5 @@
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);
}
--- /home/work/misc/gnu/import/egcs/libio/libioP.h Wed Nov 26 15:14:35 1997
+++ libioP.h Mon Feb 16 10:48:50 1998
@@ -377,6 +417,8 @@
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,