From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 16 Sep 2003 20:00:38 +0000 (+0000)
Subject: linebuffer.c (readlinebuffer): Return NULL immediately upon input error.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73bb09bd0106d33ceeb47a5a6ede8501272ea957;p=pspp

linebuffer.c (readlinebuffer): Return NULL immediately upon input error.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9b8480dd7c..19b303996d 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,6 +1,12 @@
+2003-09-16  Paul Eggert  <eggert@twinsun.com>
+
+	* linebuffer.c (readlinebuffer): Return NULL immediately upon
+	input error, instead of returning NULL the next time we are called
+	(and therefore losing track of errno).
+
 2003-09-15  Paul Eggert  <eggert@twinsun.com>
 
-	* lib/getndelim2.c (getndelim2): Don't trash errno when a read
+	* getndelim2.c (getndelim2): Don't trash errno when a read
 	fails, so that the caller gets the proper errno.
 
 	* readutmp.c (read_utmp): Likewise.
diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index e169a989d5..434d6d8588 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -45,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)
@@ -55,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
@@ -63,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;