X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=8374a8a880bd6ffa617347ec26fee181d4150d28;hb=2bf674b2395b6aff54eff7928d24f2995c37c28e;hp=c1a696acc9067ad9919ae71322a463d6f5b206da;hpb=04e03d50238a919e565b95c17fcff84f2061d2e0;p=gnulib.git

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index c1a696acc..8374a8a88 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,5 +1,5 @@
 /* linebuffer.c -- read arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998 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
@@ -22,10 +22,11 @@
 #endif
 
 #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. */
@@ -35,14 +36,16 @@ 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.
-   Remove any newline.  Does not null terminate.
-   Return zero upon error or upon end of file.
+   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.
+   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)
 {
@@ -52,33 +55,32 @@ readline (struct linebuffer *linebuffer, FILE *stream)
   char *end = buffer + linebuffer->size; /* Sentinel. */
 
   if (feof (stream) || ferror (stream))
-    {
-      linebuffer->length = 0;
-      return 0;
-    }
+    return NULL;
 
-  while (1)
+  do
     {
       c = getc (stream);
+      if (c == EOF)
+	{
+	  if (p == buffer)
+	    return NULL;
+	  if (p[-1] == '\n')
+	    break;
+	  c = '\n';
+	}
       if (p == end)
 	{
 	  linebuffer->size *= 2;
-	  buffer = (char *) xrealloc (buffer, linebuffer->size);
-	  p += buffer - linebuffer->buffer;
+	  buffer = xrealloc (buffer, linebuffer->size);
+	  p = p - linebuffer->buffer + buffer;
 	  linebuffer->buffer = buffer;
 	  end = buffer + linebuffer->size;
 	}
-      if (c == EOF || c == '\n')
-	break;
       *p++ = c;
     }
+  while (c != '\n');
 
-  if (feof (stream) && p == buffer)
-    {
-      linebuffer->length = 0;
-      return 0;
-    }
-  linebuffer->length = p - linebuffer->buffer;
+  linebuffer->length = p - buffer;
   return linebuffer;
 }