зеркало из https://github.com/microsoft/git.git
rev-parse: read parseopt spec with strbuf_getline()
"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:
Родитель
6e8d46f9d4
Коммит
72e37b6ac8
|
@ -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 */
|
||||
for (;;) {
|
||||
if (strbuf_getline_lf(&sb, stdin) == EOF)
|
||||
if (strbuf_getline(&sb, stdin) == EOF)
|
||||
die("premature end of input");
|
||||
ALLOC_GROW(usage, unb + 1, usz);
|
||||
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> */
|
||||
while (strbuf_getline_lf(&sb, stdin) != EOF) {
|
||||
while (strbuf_getline(&sb, stdin) != EOF) {
|
||||
const char *s;
|
||||
const char *help;
|
||||
struct option *o;
|
||||
|
|
Загрузка…
Ссылка в новой задаче