/* linebuffer.c -- read arbitrarily long lines
- Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998, 1999, 2001 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
#include <stdio.h>
#include <sys/types.h>
#include "linebuffer.h"
+#include "unlocked-io.h"
+#include "xalloc.h"
-char *xmalloc ();
-char *xrealloc ();
void free ();
/* Initialize linebuffer LINEBUFFER for use. */
{
linebuffer->length = 0;
linebuffer->size = 200;
- linebuffer->buffer = (char *) xmalloc (linebuffer->size);
+ linebuffer->buffer = xmalloc (linebuffer->size);
}
/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
Keep the newline; append a newline if it's the last line of a file
- that ends in a non-newline character. Do not null terminate,
- but leave room for an extra byte after the newline.
- Return LINEBUFFER, except at end of file return 0. */
-
+ that ends in a non-newline character. Do not null terminate.
+ Therefore the stream can contain NUL bytes, and the length
+ (including the newline) is returned in linebuffer->length.
+ Return NULL upon error, or when STREAM is empty.
+ Otherwise, return LINEBUFFER. */
struct linebuffer *
readline (struct linebuffer *linebuffer, FILE *stream)
{
int c;
char *buffer = linebuffer->buffer;
char *p = linebuffer->buffer;
- char *end = buffer + linebuffer->size - 1; /* Sentinel. */
+ char *end = buffer + linebuffer->size; /* Sentinel. */
if (feof (stream) || ferror (stream))
- return 0;
+ return NULL;
do
{
if (c == EOF)
{
if (p == buffer)
- return 0;
+ return NULL;
if (p[-1] == '\n')
break;
c = '\n';
if (p == end)
{
linebuffer->size *= 2;
- buffer = (char *) xrealloc (buffer, linebuffer->size);
+ buffer = xrealloc (buffer, linebuffer->size);
p = p - linebuffer->buffer + buffer;
linebuffer->buffer = buffer;
- end = buffer + linebuffer->size - 1;
+ end = buffer + linebuffer->size;
}
*p++ = c;
}