[PREVIEW v3 8/9] checkout-index: there are only two line terminators
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:07:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PREVIEW v3 8/9] checkout-index: there are only two line terminators · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PREVIEW v3 8/9] checkout-index: there are only two line terminators · Jeff King <hidden>
The program by default works on LF terminated lines, with an option
to use NUL terminated records. Instead of using line_termination
that happens to take LF or NUL to call strbuf_getline(), switch
between strbuf_getline_{lf,nul} based on the value of '-z' option.
Note that this still leaves the option open to use NUL-terminated
input mixed with LF-terminated output (and vice versa), and even
HT-terminated output is still left as a possibility, because this
series is only interested in tightening the overly broad interface
on the input side.
Signed-off-by: Junio C Hamano <redacted>
---
builtin/checkout-index.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 8028c37..0368e0d 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c@@ -12,6 +12,7 @@ #define CHECKOUT_ALL 4 static int line_termination = '\n'; +static strbuf_getline_fn getline_fn = strbuf_getline_lf; static int checkout_stage; /* default to checkout stage0 */ static int to_tempfile; static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
@@ -144,10 +145,13 @@ static int option_parse_u(const struct option *opt, static int option_parse_z(const struct option *opt, const char *arg, int unset) { - if (unset) + if (unset) { line_termination = '\n'; - else + getline_fn = strbuf_getline_lf; + } else { line_termination = 0; + getline_fn = strbuf_getline_nul; + } return 0; }
@@ -258,7 +262,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) if (all) die("git checkout-index: don't mix '--all' and '--stdin'"); - while (strbuf_getline(&buf, stdin, line_termination) != EOF) { + while (getline_fn(&buf, stdin) != EOF) { char *p; if (line_termination && buf.buf[0] == '"') { strbuf_reset(&nbuf);
--
2.7.0-242-gdd583c7