Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b66fb1da authored Jan 03, 2017 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Jan 03, 2017

tools lib subcmd: Add OPT_STRING_OPTARG_SET option



To allow string options with a default argument and variable set when
the option is used.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Wang Nan <wangnan0@huawei.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1483431600-19887-2-git-send-email-jolsa@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 1f2ed153

tools/lib/subcmd/parse-options.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -213,6 +213,9 @@ static int get_value(struct parse_opt_ctx_t *p,
	else		else
	err = get_arg(p, opt, flags, (const char **)opt->value);		err = get_arg(p, opt, flags, (const char **)opt->value);

			if (opt->set)
			(bool )opt->set = true;

	/* PARSE_OPT_NOEMPTY: Allow NULL but disallow empty string. */		/* PARSE_OPT_NOEMPTY: Allow NULL but disallow empty string. */
	if (opt->flags & PARSE_OPT_NOEMPTY) {		if (opt->flags & PARSE_OPT_NOEMPTY) {
	const char val = (const char **)opt->value;		const char val = (const char **)opt->value;

tools/lib/subcmd/parse-options.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,11 @@ struct option {
	{ .type = OPTION_STRING, .short_name = (s), .long_name = (l), \		{ .type = OPTION_STRING, .short_name = (s), .long_name = (l), \
	.value = check_vtype(v, const char **), (a), .help = (h), \		.value = check_vtype(v, const char **), (a), .help = (h), \
	.flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d) }		.flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d) }
			#define OPT_STRING_OPTARG_SET(s, l, v, os, a, h, d) \
			{ .type = OPTION_STRING, .short_name = (s), .long_name = (l), \
			.value = check_vtype(v, const char **), (a), .help = (h), \
			.flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d), \
			.set = check_vtype(os, bool *)}
	#define OPT_STRING_NOEMPTY(s, l, v, a, h) { .type = OPTION_STRING, .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), (a), .help = (h), .flags = PARSE_OPT_NOEMPTY}		#define OPT_STRING_NOEMPTY(s, l, v, a, h) { .type = OPTION_STRING, .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), (a), .help = (h), .flags = PARSE_OPT_NOEMPTY}
	#define OPT_DATE(s, l, v, h) \		#define OPT_DATE(s, l, v, h) \
	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb }		{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb }