undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev-parse: read parseopt spec with strbuf_getline()

Browse Source 
"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>
This commit is contained in:
Junio C Hamano 2015-10-28 13:59:44 -07:00
parent 6e8d46f9d4
commit 72e37b6ac8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/rev-parse.c
View File

@ -383,7 +383,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 */ /* get the usage up to the first line with a -- on it */
for (;;) { for (;;) {
if (strbuf_getline_lf(&sb, stdin) == EOF) if (strbuf_getline(&sb, stdin) == EOF)
die("premature end of input"); die("premature end of input");
ALLOC_GROW(usage, unb + 1, usz); ALLOC_GROW(usage, unb + 1, usz);
if (!strcmp("--", sb.buf)) { if (!strcmp("--", sb.buf)) {
@ -396,7 +396,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
} }
/* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */ /* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */
while (strbuf_getline_lf(&sb, stdin) != EOF) { while (strbuf_getline(&sb, stdin) != EOF) {
const char *s; const char *s;
const char *help; const char *help;
struct option *o; struct option *o;