Re: [PATCH v2 03/17] update-index: read --index-info with strbuf_getline_crlf()
From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:07:37
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v2 03/17] update-index: read --index-info with strbuf_getline_crlf() · Junio C Hamano <hidden>
Hi Junio, On Wed, 16 Dec 2015, Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
diff --git a/builtin/update-index.c b/builtin/update-index.c index 7431938..a7a9a7e 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c@@ -473,7 +473,9 @@ static void read_index_info(int line_termination) struct strbuf buf = STRBUF_INIT; struct strbuf uq = STRBUF_INIT; - while (strbuf_getline(&buf, stdin, line_termination) != EOF) { + while ((line_termination + ? strbuf_getline_crlf(&buf, stdin) + : strbuf_getline(&buf, stdin, '\0')) != EOF) { char *ptr, *tab;
This is a problematic change because it does not safeguard for future introduction of a line_termination value other than LF or NUL. I believe the safest would be to change read_index_info() to take a `nul_delimited` parameter instead of the `line_termination` parameter first, and then introduce that change to use strbuf_getline_crlf if !nul_delimited. Ciao, Dscho