summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-25 01:23:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-25 13:23:57 -0700
commitedc5594153d7246694c1ec5bdb8ccdaa97bf7daf (patch)
tree72dc051f3dd2e8288686d4936c85a62bcf780c95
parentmailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths (diff)
downloadtgif-edc5594153d7246694c1ec5bdb8ccdaa97bf7daf.tar.xz
mailsplit: minor clean-up in read_line_with_nul()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-mailsplit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index e4d977bafb..ae2b4cb21b 100644
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -52,13 +52,12 @@ int read_line_with_nul(char *buf, int size, FILE *in)
for (;;) {
c = getc(in);
+ if (c == EOF)
+ break;
buf[len++] = c;
- if (c == EOF || c == '\n' || len + 1 >= size)
+ if (c == '\n' || len + 1 >= size)
break;
}
-
- if (c == EOF)
- len--;
buf[len] = '\0';
return len;