/* 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
GNU General Public License for more details.
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. */
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Written by Richard Stallman. */
\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <stdio.h>
#include "linebuffer.h"
/* Initialize linebuffer LINEBUFFER for use. */
void
-initbuffer (linebuffer)
- struct linebuffer *linebuffer;
+initbuffer (struct linebuffer *linebuffer)
{
linebuffer->length = 0;
linebuffer->size = 200;
/* 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)
- struct linebuffer *linebuffer;
- FILE *stream;
+readline (struct linebuffer *linebuffer, FILE *stream)
{
int c;
char *buffer = linebuffer->buffer;
char *p = linebuffer->buffer;
char *end = buffer + linebuffer->size; /* Sentinel. */
- if (feof (stream))
+ if (feof (stream) || ferror (stream))
{
linebuffer->length = 0;
return 0;
/* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
void
-freebuffer (linebuffer)
- struct linebuffer *linebuffer;
+freebuffer (struct linebuffer *linebuffer)
{
free (linebuffer->buffer);
free (linebuffer);