[PATCH 08/17] rev-parse: read parseopt spec with strbuf_gets()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 28, 2015, 22:25 UTC
- Message-ID
- <1446071161-15610-9-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1446071161-15610-1-git-send-email-gitster@pobox.com>
"rev-parse --parseopt" specification is clearly text and we should anticipate that we may be fed CRLF lines.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/rev-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 02d747d..5317389 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -386,7 +386,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) /* get the usage up to the first line with a -- on it */ for (;;) { - if (strbuf_getline(&sb, stdin, '\n') == EOF) + if (strbuf_gets(&sb, stdin) == EOF) die("premature end of input"); ALLOC_GROW(usage, unb + 1, usz); if (!strcmp("--", sb.buf)) { @@ -399,7 +399,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) } /* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */ - while (strbuf_getline(&sb, stdin, '\n') != EOF) { + while (strbuf_gets(&sb, stdin) != EOF) { const char *s; const char *help; struct option *o;
-- 2.6.2-423-g5314b62