@matheusbsbs / matheus-bagliano / commits / 33e75122f4

rev-parse parseopt: interpret any whitespace as start of help text

Currently, rev-parse only interprets a space ' ' character as the delimiter between the option spec and the help text. So if a tab character is placed between the option spec and the help text, it will be interpreted as part of the long option name or as part of the arg hint. If it is interpreted as part of the long option name, then rev-parse will produce what will be interpreted as multiple arguments on the command line. For example, the following option spec (note: there is a <tab> between "frotz" and "enable"): frotz enable frotzing will produce the following set expression when --frotz is used: set -- --frotz -- instead of this: set -- --frotz enable -- Mark t1502.2 as fixed. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Brandon Casey committed Sep 17, 2017 at 15:28 UTC 33e75122f483f887d4db7ccec01f42dea7ee79fb

2 files changed +11 -3

builtin/rev-parse.c

+10 -2

@@ -387,6 +387,14 @@ static const char *skipspaces(const char *s)

387 return s;

388 }

389

390 +static char *findspace(const char *s)

391 +{

392 + for (; *s; s++)

393 + if (isspace(*s))

394 + return (char*)s;

395 + return NULL;

396 +}

397 +

398 static int cmd_parseopt(int argc, const char **argv, const char *prefix)

399 {

400 static int keep_dashdash = 0, stop_at_non_option = 0;

@@ -444,8 +452,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)

452 memset(opts + onb, 0, sizeof(opts[onb]));

453

454 o = &opts[onb++];

447 - help = strchr(sb.buf, ' ');

448 - if (!help || *sb.buf == ' ') {

455 + help = findspace(sb.buf);

456 + if (!help || sb.buf == help) {

457 o->type = OPTION_GROUP;

458 o->help = xstrdup(skipspaces(sb.buf));

459 continue;

t/t1502-rev-parse-parseopt.sh

+1 -1

@@ -38,7 +38,7 @@ test_expect_success 'setup optionspec' '

38 EOF

39 '

41 -test_expect_failure 'test --parseopt help output' '

41 +test_expect_success 'test --parseopt help output' '

42 sed -e "s/^|//" >expect <<\END_EXPECT &&

43 |cat <<\EOF

44 |usage: some-command [options] <args>...