updates from libc,automake

[gnulib.git] / lib / linebuffer.c

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index 770ad62..bed5d94 100644 (file)
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -24,13 +24,12 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include "linebuffer.h"
 #include "unlocked-io.h"
 #include "xalloc.h"
 
-void free ();
-
 /* Initialize linebuffer LINEBUFFER for use. */
 
 void
@@ -46,7 +45,9 @@ initbuffer (struct linebuffer *linebuffer)
    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.
+   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 *
 readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
@@ -56,7 +57,7 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
   char *p = linebuffer->buffer;
   char *end = buffer + linebuffer->size; /* Sentinel. */
 
-  if (feof (stream) || ferror (stream))
+  if (feof (stream))
     return NULL;
 
   do
@@ -64,7 +65,7 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
       c = getc (stream);
       if (c == EOF)
        {
-         if (p == buffer)
+         if (p == buffer || ferror (stream))
            return NULL;
          if (p[-1] == '\n')
            break;
@@ -86,11 +87,10 @@ readlinebuffer (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);
 }