X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=bed5d94fb889b8fd7716a4ed794558243a87b4b8;hb=22c1c15d0a29a1b7ea75456abe3f7062f835c887;hp=d129d307d65106f5363b1c23e6ceadb44020ebad;hpb=9d80c0d4947dfdded2428bf67a91f545888d39b7;p=gnulib.git

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index d129d307d..bed5d94fb 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,5 +1,7 @@
 /* linebuffer.c -- read arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003 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
@@ -22,11 +24,11 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
 #include "linebuffer.h"
-
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+#include "unlocked-io.h"
+#include "xalloc.h"
 
 /* Initialize linebuffer LINEBUFFER for use. */
 
@@ -35,33 +37,36 @@ initbuffer (struct linebuffer *linebuffer)
 {
   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 when stream is empty.  Return NULL and set errno upon
+   error; callers can distinguish this case from the empty case by
+   invoking ferror (stream).
+   Otherwise, return LINEBUFFER.  */
 struct linebuffer *
-readline (struct linebuffer *linebuffer, FILE *stream)
+readlinebuffer (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;
+  if (feof (stream))
+    return NULL;
 
   do
     {
       c = getc (stream);
       if (c == EOF)
 	{
-	  if (p == buffer)
-	    return 0;
+	  if (p == buffer || ferror (stream))
+	    return NULL;
 	  if (p[-1] == '\n')
 	    break;
 	  c = '\n';
@@ -69,10 +74,10 @@ readline (struct linebuffer *linebuffer, FILE *stream)
       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;
     }
@@ -82,11 +87,10 @@ readline (struct linebuffer *linebuffer, FILE *stream)
   return linebuffer;
 }
 
-/* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
+/* Free the buffer that was allocated for linebuffer LINEBUFFER.  */
 
 void
 freebuffer (struct linebuffer *linebuffer)
 {
   free (linebuffer->buffer);
-  free (linebuffer);
 }