From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 May 2005 06:34:03 +0000 (-0700)
Subject: [PATCH] fix strbuf take #2
X-Git-Tag: v0.99~544
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9dc527adbc013b67cd85cce67bdccc3c10ed4792;p=git.git

[PATCH] fix strbuf take #2

I just remembered why I placed that bogus "sb->len ==0 implies
sb->eof" condition there.  We need at least something like this
to catch the normal EOF (that is, line termination immediately
followed by EOF) case.  "if (feof(fp))" fires when we have
already read the eof, not when we are about read it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/strbuf.c b/strbuf.c
index 65433084..672a1e40 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -37,6 +37,8 @@ void read_line(struct strbuf *sb, FILE *fp, int term) {
 			break;
 		strbuf_add(sb, ch);
 	}
+	if (ch == EOF && sb->len == 0)
+		sb->eof = 1;
 	strbuf_end(sb);
 }