2018-09-09 19:36:29 +02:00
|
|
|
#include "test-tool.h"
|
2007-10-13 18:34:45 +02:00
|
|
|
#include "cache.h"
|
|
|
|
#include "parse-options.h"
|
2011-06-09 17:55:23 +02:00
|
|
|
#include "string-list.h"
|
2019-02-22 23:25:01 +01:00
|
|
|
#include "trace2.h"
|
2007-10-13 18:34:45 +02:00
|
|
|
|
|
|
|
static int boolean = 0;
|
2008-07-30 21:53:45 +02:00
|
|
|
static int integer = 0;
|
2015-06-21 20:25:44 +02:00
|
|
|
static unsigned long magnitude = 0;
|
2017-04-26 21:29:31 +02:00
|
|
|
static timestamp_t timestamp;
|
2008-06-22 17:04:26 +02:00
|
|
|
static int abbrev = 7;
|
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 11:50:00 +02:00
|
|
|
static int verbose = -1; /* unspecified */
|
|
|
|
static int dry_run = 0, quiet = 0;
|
2007-10-13 18:34:45 +02:00
|
|
|
static char *string = NULL;
|
2009-05-23 20:53:13 +02:00
|
|
|
static char *file = NULL;
|
2009-09-25 20:44:44 +02:00
|
|
|
static int ambiguous;
|
2016-06-13 12:04:20 +02:00
|
|
|
static struct string_list list = STRING_LIST_INIT_NODUP;
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2016-05-05 22:30:10 +02:00
|
|
|
static struct {
|
|
|
|
int called;
|
|
|
|
const char *arg;
|
|
|
|
int unset;
|
|
|
|
} length_cb;
|
|
|
|
|
2009-06-18 19:28:43 +02:00
|
|
|
static int length_callback(const struct option *opt, const char *arg, int unset)
|
2008-06-22 17:04:26 +02:00
|
|
|
{
|
2016-05-05 22:30:10 +02:00
|
|
|
length_cb.called = 1;
|
|
|
|
length_cb.arg = arg;
|
|
|
|
length_cb.unset = unset;
|
|
|
|
|
2008-06-22 17:04:26 +02:00
|
|
|
if (unset)
|
|
|
|
return 1; /* do not support unset */
|
|
|
|
|
2008-08-14 02:48:57 +02:00
|
|
|
*(int *)opt->value = strlen(arg);
|
2008-06-22 17:04:26 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-06-18 19:28:43 +02:00
|
|
|
static int number_callback(const struct option *opt, const char *arg, int unset)
|
2009-05-07 21:45:08 +02:00
|
|
|
{
|
assert NOARG/NONEG behavior of parse-options callbacks
When we define a parse-options callback, the flags we put in the option
struct must match what the callback expects. For example, a callback
which does not handle the "unset" parameter should only be used with
PARSE_OPT_NONEG. But since the callback and the option struct are not
defined next to each other, it's easy to get this wrong (as earlier
patches in this series show).
Fortunately, the compiler can help us here: compiling with
-Wunused-parameters can show us which callbacks ignore their "unset"
parameters (and likewise, ones that ignore "arg" expect to be triggered
with PARSE_OPT_NOARG).
But after we've inspected a callback and determined that all of its
callers use the right flags, what do we do next? We'd like to silence
the compiler warning, but do so in a way that will catch any wrong calls
in the future.
We can do that by actually checking those variables and asserting that
they match our expectations. Because this is such a common pattern,
we'll introduce some helper macros. The resulting messages aren't
as descriptive as we could make them, but the file/line information from
BUG() is enough to identify the problem (and anyway, the point is that
these should never be seen).
Each of the annotated callbacks in this patch triggers
-Wunused-parameters, and was manually inspected to make sure all callers
use the correct options (so none of these BUGs should be triggerable).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-11-05 07:45:42 +01:00
|
|
|
BUG_ON_OPT_NEG(unset);
|
2009-05-07 21:45:08 +02:00
|
|
|
*(int *)opt->value = strtol(arg, NULL, 10);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-05 23:36:55 +02:00
|
|
|
static int collect_expect(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct string_list *expect;
|
|
|
|
struct string_list_item *item;
|
|
|
|
struct strbuf label = STRBUF_INIT;
|
|
|
|
const char *colon;
|
|
|
|
|
|
|
|
if (!arg || unset)
|
|
|
|
die("malformed --expect option");
|
|
|
|
|
|
|
|
expect = (struct string_list *)opt->value;
|
|
|
|
colon = strchr(arg, ':');
|
|
|
|
if (!colon)
|
|
|
|
die("malformed --expect option, lacking a colon");
|
|
|
|
strbuf_add(&label, arg, colon - arg);
|
|
|
|
item = string_list_insert(expect, strbuf_detach(&label, NULL));
|
|
|
|
if (item->util)
|
|
|
|
die("malformed --expect option, duplicate %s", label.buf);
|
|
|
|
item->util = (void *)arg;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute__((format (printf,3,4)))
|
|
|
|
static void show(struct string_list *expect, int *status, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
struct string_list_item *item;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
strbuf_vaddf(&buf, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
if (!expect->nr)
|
|
|
|
printf("%s\n", buf.buf);
|
|
|
|
else {
|
|
|
|
char *colon = strchr(buf.buf, ':');
|
|
|
|
if (!colon)
|
|
|
|
die("malformed output format, output lacking colon: %s", fmt);
|
|
|
|
*colon = '\0';
|
|
|
|
item = string_list_lookup(expect, buf.buf);
|
|
|
|
*colon = ':';
|
|
|
|
if (!item)
|
|
|
|
; /* not among entries being checked */
|
|
|
|
else {
|
|
|
|
if (strcmp((const char *)item->util, buf.buf)) {
|
|
|
|
printf("-%s\n", (char *)item->util);
|
|
|
|
printf("+%s\n", buf.buf);
|
|
|
|
*status = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
|
2018-09-09 19:36:29 +02:00
|
|
|
int cmd__parse_options(int argc, const char **argv)
|
2007-10-13 18:34:45 +02:00
|
|
|
{
|
2009-05-23 20:53:13 +02:00
|
|
|
const char *prefix = "prefix/";
|
2007-10-13 18:34:45 +02:00
|
|
|
const char *usage[] = {
|
2018-09-09 19:36:29 +02:00
|
|
|
"test-tool parse-options <options>",
|
2017-09-25 06:08:03 +02:00
|
|
|
"",
|
|
|
|
"A helper function for the parse-options API.",
|
2007-10-13 18:34:45 +02:00
|
|
|
NULL
|
|
|
|
};
|
2016-05-05 23:36:55 +02:00
|
|
|
struct string_list expect = STRING_LIST_INIT_NODUP;
|
2007-10-13 18:34:45 +02:00
|
|
|
struct option options[] = {
|
2012-02-25 20:11:16 +01:00
|
|
|
OPT_BOOL(0, "yes", &boolean, "get a boolean"),
|
|
|
|
OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
|
|
|
|
{ OPTION_SET_INT, 'B', "no-fear", &boolean, NULL,
|
|
|
|
"be brave", PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
|
|
|
|
OPT_COUNTUP('b', "boolean", &boolean, "increment by one"),
|
2008-06-22 17:04:26 +02:00
|
|
|
OPT_BIT('4', "or4", &boolean,
|
|
|
|
"bitwise-or boolean with ...0100", 4),
|
2009-05-07 21:44:17 +02:00
|
|
|
OPT_NEGBIT(0, "neg-or4", &boolean, "same as --no-or4", 4),
|
2008-06-22 17:04:26 +02:00
|
|
|
OPT_GROUP(""),
|
2007-10-13 18:34:45 +02:00
|
|
|
OPT_INTEGER('i', "integer", &integer, "get a integer"),
|
|
|
|
OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
|
2015-06-21 20:25:44 +02:00
|
|
|
OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"),
|
2008-06-22 17:04:26 +02:00
|
|
|
OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
|
|
|
|
OPT_CALLBACK('L', "length", &integer, "str",
|
|
|
|
"get length of <str>", length_callback),
|
2011-02-15 14:09:13 +01:00
|
|
|
OPT_FILENAME('F', "file", &file, "set file to <file>"),
|
2008-06-22 17:04:26 +02:00
|
|
|
OPT_GROUP("String options"),
|
2007-10-13 18:34:45 +02:00
|
|
|
OPT_STRING('s', "string", &string, "string", "get a string"),
|
|
|
|
OPT_STRING(0, "string2", &string, "str", "get another string"),
|
2007-11-05 14:15:21 +01:00
|
|
|
OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
|
2008-01-26 12:26:57 +01:00
|
|
|
OPT_STRING('o', NULL, &string, "str", "get another string"),
|
2011-09-28 19:44:30 +02:00
|
|
|
OPT_NOOP_NOARG(0, "obsolete"),
|
2011-06-09 17:55:23 +02:00
|
|
|
OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
|
2008-06-22 17:04:26 +02:00
|
|
|
OPT_GROUP("Magic arguments"),
|
2019-03-14 12:25:04 +01:00
|
|
|
OPT_ARGUMENT("quux", NULL, "means --quux"),
|
2009-05-07 21:45:08 +02:00
|
|
|
OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
|
|
|
|
number_callback),
|
2012-02-25 20:11:16 +01:00
|
|
|
{ OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
|
2009-05-07 21:45:42 +02:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH },
|
2012-02-25 20:11:16 +01:00
|
|
|
{ OPTION_COUNTUP, 0, "ambiguous", &ambiguous, NULL,
|
2009-09-25 20:44:44 +02:00
|
|
|
"positive ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
|
2012-02-25 20:11:16 +01:00
|
|
|
{ OPTION_COUNTUP, 0, "no-ambiguous", &ambiguous, NULL,
|
2009-09-25 20:44:44 +02:00
|
|
|
"negative ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
|
2008-06-22 17:04:26 +02:00
|
|
|
OPT_GROUP("Standard options"),
|
|
|
|
OPT__ABBREV(&abbrev),
|
2010-11-08 18:56:39 +01:00
|
|
|
OPT__VERBOSE(&verbose, "be verbose"),
|
2010-11-08 18:58:51 +01:00
|
|
|
OPT__DRY_RUN(&dry_run, "dry run"),
|
2010-11-08 19:06:54 +01:00
|
|
|
OPT__QUIET(&quiet, "be quiet"),
|
2016-05-05 23:36:55 +02:00
|
|
|
OPT_CALLBACK(0, "expect", &expect, "string",
|
|
|
|
"expected output in the variable dump",
|
|
|
|
collect_expect),
|
2007-10-13 18:34:45 +02:00
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
int i;
|
2016-05-05 23:36:55 +02:00
|
|
|
int ret = 0;
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2019-02-22 23:25:01 +01:00
|
|
|
trace2_cmd_name("_parse_");
|
|
|
|
|
2013-04-27 21:19:47 +02:00
|
|
|
argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2016-05-05 22:30:10 +02:00
|
|
|
if (length_cb.called) {
|
|
|
|
const char *arg = length_cb.arg;
|
|
|
|
int unset = length_cb.unset;
|
2016-05-05 23:36:55 +02:00
|
|
|
show(&expect, &ret, "Callback: \"%s\", %d",
|
|
|
|
(arg ? arg : "not set"), unset);
|
2016-05-05 22:30:10 +02:00
|
|
|
}
|
2016-05-05 23:36:55 +02:00
|
|
|
show(&expect, &ret, "boolean: %d", boolean);
|
|
|
|
show(&expect, &ret, "integer: %d", integer);
|
|
|
|
show(&expect, &ret, "magnitude: %lu", magnitude);
|
2017-04-21 12:45:48 +02:00
|
|
|
show(&expect, &ret, "timestamp: %"PRItime, timestamp);
|
2016-05-05 23:36:55 +02:00
|
|
|
show(&expect, &ret, "string: %s", string ? string : "(not set)");
|
|
|
|
show(&expect, &ret, "abbrev: %d", abbrev);
|
|
|
|
show(&expect, &ret, "verbose: %d", verbose);
|
|
|
|
show(&expect, &ret, "quiet: %d", quiet);
|
|
|
|
show(&expect, &ret, "dry run: %s", dry_run ? "yes" : "no");
|
|
|
|
show(&expect, &ret, "file: %s", file ? file : "(not set)");
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2011-06-09 17:55:23 +02:00
|
|
|
for (i = 0; i < list.nr; i++)
|
2016-05-05 23:36:55 +02:00
|
|
|
show(&expect, &ret, "list: %s", list.items[i].string);
|
2011-06-09 17:55:23 +02:00
|
|
|
|
2007-10-13 18:34:45 +02:00
|
|
|
for (i = 0; i < argc; i++)
|
2016-05-05 23:36:55 +02:00
|
|
|
show(&expect, &ret, "arg %02d: %s", i, argv[i]);
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2016-05-05 23:36:55 +02:00
|
|
|
return ret;
|
2007-10-13 18:34:45 +02:00
|
|
|
}
|