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"
|
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;
|
2008-07-30 21:53:45 +02:00
|
|
|
static unsigned long 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
|
|
|
{
|
|
|
|
*(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);
|
|
|
|
}
|
|
|
|
|
add an extra level of indirection to main()
There are certain startup tasks that we expect every git
process to do. In some cases this is just to improve the
quality of the program (e.g., setting up gettext()). In
others it is a requirement for using certain functions in
libgit.a (e.g., system_path() expects that you have called
git_extract_argv0_path()).
Most commands are builtins and are covered by the git.c
version of main(). However, there are still a few external
commands that use their own main(). Each of these has to
remember to include the correct startup sequence, and we are
not always consistent.
Rather than just fix the inconsistencies, let's make this
harder to get wrong by providing a common main() that can
run this standard startup.
We basically have two options to do this:
- the compat/mingw.h file already does something like this by
adding a #define that replaces the definition of main with a
wrapper that calls mingw_startup().
The upside is that the code in each program doesn't need
to be changed at all; it's rewritten on the fly by the
preprocessor.
The downside is that it may make debugging of the startup
sequence a bit more confusing, as the preprocessor is
quietly inserting new code.
- the builtin functions are all of the form cmd_foo(),
and git.c's main() calls them.
This is much more explicit, which may make things more
obvious to somebody reading the code. It's also more
flexible (because of course we have to figure out _which_
cmd_foo() to call).
The downside is that each of the builtins must define
cmd_foo(), instead of just main().
This patch chooses the latter option, preferring the more
explicit approach, even though it is more invasive. We
introduce a new file common-main.c, with the "real" main. It
expects to call cmd_main() from whatever other objects it is
linked against.
We link common-main.o against anything that links against
libgit.a, since we know that such programs will need to do
this setup. Note that common-main.o can't actually go inside
libgit.a, as the linker would not pick up its main()
function automatically (it has no callers).
The rest of the patch is just adjusting all of the various
external programs (mostly in t/helper) to use cmd_main().
I've provided a global declaration for cmd_main(), which
means that all of the programs also need to match its
signature. In particular, many functions need to switch to
"const char **" instead of "char **" for argv. This effect
ripples out to a few other variables and functions, as well.
This makes the patch even more invasive, but the end result
is much better. We should be treating argv strings as const
anyway, and now all programs conform to the same signature
(which also matches the way builtins are defined).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-01 07:58:58 +02:00
|
|
|
int cmd_main(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[] = {
|
|
|
|
"test-parse-options <options>",
|
|
|
|
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),
|
2008-07-30 21:53:45 +02:00
|
|
|
OPT_DATE('t', NULL, ×tamp, "get timestamp of <time>"),
|
2008-06-22 17:04:26 +02:00
|
|
|
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"),
|
2008-03-02 11:35:56 +01:00
|
|
|
OPT_ARGUMENT("quux", "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
|
|
|
|
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);
|
|
|
|
show(&expect, &ret, "timestamp: %lu", timestamp);
|
|
|
|
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
|
|
|
}
|