diff options
author | Jim Meyering <jim@meyering.net> | 1998-08-03 03:02:04 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1998-08-03 03:02:04 +0000 |
commit | c3db9f982af80c18989677f09cd816fbe530d259 (patch) | |
tree | 2fbe995a795f6a742869a24de68aba0f75eeda99 /lib/linebuffer.c | |
parent | c01e767ceba88005faa716bca7a2861f25c6e493 (diff) | |
download | coreutils-c3db9f982af80c18989677f09cd816fbe530d259.tar.xz |
(readline): Return zero upon error as well as upon
end of file. From James Youngman.
Diffstat (limited to 'lib/linebuffer.c')
-rw-r--r-- | lib/linebuffer.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/linebuffer.c b/lib/linebuffer.c index 7f53aed70..d40168370 100644 --- a/lib/linebuffer.c +++ b/lib/linebuffer.c @@ -1,5 +1,5 @@ /* linebuffer.c -- read arbitrarily long lines - Copyright (C) 1986, 1991 Free Software Foundation, Inc. + Copyright (C) 1986, 1991, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,10 +13,14 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Written by Richard Stallman. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <stdio.h> #include "linebuffer.h" @@ -37,7 +41,8 @@ initbuffer (linebuffer) /* Read an arbitrarily long line of text from STREAM into LINEBUFFER. Remove any newline. Does not null terminate. - Return LINEBUFFER, except at end of file return 0. */ + Return zero upon error or upon end of file. + Otherwise, return LINEBUFFER. */ struct linebuffer * readline (linebuffer, stream) @@ -49,7 +54,7 @@ readline (linebuffer, stream) char *p = linebuffer->buffer; char *end = buffer + linebuffer->size; /* Sentinel. */ - if (feof (stream)) + if (feof (stream) || ferror (stream)) { linebuffer->length = 0; return 0; |