diff options
| author |  SZEDER Gábor <szeder.dev@gmail.com> | 2017-06-09 20:17:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-12 13:39:46 -0700 |
| commit | dffc651ed191ff0eb3cfd0e8df83a423b4dae994 (patch) | |
| tree | 6a75b5f519418aed944883b558b0cba8f75d58f3 | |
| parent | revision.c: stricter parsing of '--no-{min,max}-parents' (diff) | |
| download | tgif-dffc651ed191ff0eb3cfd0e8df83a423b4dae994.tar.xz | |
revision.c: stricter parsing of '--early-output'
The parsing of '--early-output' with or without its optional integer
argument allowed bogus options like '--early-output-foobarbaz' to slip
through and be ignored.
Fix it by parsing '--early-output' in the same way as other options
with an optional argument are parsed. Furthermore, use strtoul_ui()
to parse the optional integer argument and to refuse negative numbers.
While at it, use skip_prefix() instead of starts_with() and magic
numbers.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/revision.c b/revision.c index 8a40cc7b34..b942fed748 100644 --- a/revision.c +++ b/revision.c @@ -1750,16 +1750,13 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--author-date-order")) { revs->sort_order = REV_SORT_BY_AUTHOR_DATE; revs->topo_order = 1; - } else if (starts_with(arg, "--early-output")) { - int count = 100; - switch (arg[14]) { - case '=': - count = atoi(arg+15); - /* Fallthrough */ - case 0: - revs->topo_order = 1; - revs->early_output = count; - } + } else if (!strcmp(arg, "--early-output")) { + revs->early_output = 100; + revs->topo_order = 1; + } else if (skip_prefix(arg, "--early-output=", &optarg)) { + if (strtoul_ui(optarg, 10, &revs->early_output) < 0) + die("'%s': not a non-negative integer", optarg); + revs->topo_order = 1; } else if (!strcmp(arg, "--parents")) { revs->rewrite_parents = 1; revs->print_parents = 1; |