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

Commit ac697625 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Show single option when failed to parse 



Current option parser outputs whole option help string when it failed to
parse an option.  However this is not good for user if the command has
many option, she might feel hard which one is related easily.

Fix it by just showing the help message of the given option only.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Requested-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Enthusiastically-Supported-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1383291195-24386-2-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 42d88910

tools/perf/util/parse-options.c

+129 −88
Original line number Diff line number Diff line
@@ -339,10 +339,10 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, 
		if (arg[1] != '-') {

			ctx->opt = arg + 1;

			if (internal_help && *ctx->opt == 'h')

				return parse_options_usage(usagestr, options);

				return usage_with_options_internal(usagestr, options, 0);

			switch (parse_short_opt(ctx, options)) {

			case -1:

				return parse_options_usage(usagestr, options);

				return parse_options_usage(usagestr, options, arg + 1, 1);

			case -2:

				goto unknown;

			default:
@@ -352,10 +352,11 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, 
				check_typos(arg + 1, options);

			while (ctx->opt) {

				if (internal_help && *ctx->opt == 'h')

					return parse_options_usage(usagestr, options);

					return usage_with_options_internal(usagestr, options, 0);

				arg = ctx->opt;

				switch (parse_short_opt(ctx, options)) {

				case -1:

					return parse_options_usage(usagestr, options);

					return parse_options_usage(usagestr, options, arg, 1);

				case -2:

					/* fake a short option thing to hide the fact that we may have

					 * started to parse aggregated stuff
@@ -383,12 +384,12 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, 
		if (internal_help && !strcmp(arg + 2, "help-all"))

			return usage_with_options_internal(usagestr, options, 1);

		if (internal_help && !strcmp(arg + 2, "help"))

			return parse_options_usage(usagestr, options);

			return usage_with_options_internal(usagestr, options, 0);

		if (!strcmp(arg + 2, "list-opts"))

			return PARSE_OPT_LIST;

		switch (parse_long_opt(ctx, arg + 2, options)) {

		case -1:

			return parse_options_usage(usagestr, options);

			return parse_options_usage(usagestr, options, arg + 2, 0);

		case -2:

			goto unknown;

		default:
@@ -445,26 +446,8 @@ int parse_options(int argc, const char **argv, const struct option *options, 
#define USAGE_OPTS_WIDTH 24

#define USAGE_GAP         2



int usage_with_options_internal(const char * const *usagestr,

				const struct option *opts, int full)

static void print_option_help(const struct option *opts, int full)

{

	if (!usagestr)

		return PARSE_OPT_HELP;



	fprintf(stderr, "\n usage: %s\n", *usagestr++);

	while (*usagestr && **usagestr)

		fprintf(stderr, "    or: %s\n", *usagestr++);

	while (*usagestr) {

		fprintf(stderr, "%s%s\n",

				**usagestr ? "    " : "",

				*usagestr);

		usagestr++;

	}



	if (opts->type != OPTION_GROUP)

		fputc('\n', stderr);



	for (; opts->type != OPTION_END; opts++) {

	size_t pos;

	int pad;
@@ -472,10 +455,10 @@ int usage_with_options_internal(const char * const *usagestr, 
		fputc('\n', stderr);

		if (*opts->help)

			fprintf(stderr, "%s\n", opts->help);

			continue;

		return;

	}

	if (!full && (opts->flags & PARSE_OPT_HIDDEN))

			continue;

		return;



	pos = fprintf(stderr, "    ");

	if (opts->short_name)
@@ -545,6 +528,29 @@ int usage_with_options_internal(const char * const *usagestr, 
	}

	fprintf(stderr, "%*s%s\n", pad + USAGE_GAP, "", opts->help);

}



int usage_with_options_internal(const char * const *usagestr,

				const struct option *opts, int full)

{

	if (!usagestr)

		return PARSE_OPT_HELP;



	fprintf(stderr, "\n usage: %s\n", *usagestr++);

	while (*usagestr && **usagestr)

		fprintf(stderr, "    or: %s\n", *usagestr++);

	while (*usagestr) {

		fprintf(stderr, "%s%s\n",

				**usagestr ? "    " : "",

				*usagestr);

		usagestr++;

	}



	if (opts->type != OPTION_GROUP)

		fputc('\n', stderr);



	for (  ; opts->type != OPTION_END; opts++)

		print_option_help(opts, full);



	fputc('\n', stderr);



	return PARSE_OPT_HELP;
@@ -559,9 +565,44 @@ void usage_with_options(const char * const *usagestr, 
}



int parse_options_usage(const char * const *usagestr,

			const struct option *opts)

			const struct option *opts,

			const char *optstr, bool short_opt)

{

	return usage_with_options_internal(usagestr, opts, 0);

	if (!usagestr)

		return PARSE_OPT_HELP;



	fprintf(stderr, "\n usage: %s\n", *usagestr++);

	while (*usagestr && **usagestr)

		fprintf(stderr, "    or: %s\n", *usagestr++);

	while (*usagestr) {

		fprintf(stderr, "%s%s\n",

				**usagestr ? "    " : "",

				*usagestr);

		usagestr++;

	}

	fputc('\n', stderr);



	for (  ; opts->type != OPTION_END; opts++) {

		if (short_opt) {

			if (opts->short_name == *optstr)

				break;

			continue;

		}



		if (opts->long_name == NULL)

			continue;



		if (!prefixcmp(optstr, opts->long_name))

			break;

		if (!prefixcmp(optstr, "no-") &&

		    !prefixcmp(optstr + 3, opts->long_name))

			break;

	}



	if (opts->type != OPTION_END)

		print_option_help(opts, 0);



	return PARSE_OPT_HELP;

}

tools/perf/util/parse-options.h

+3 −1
Original line number Diff line number Diff line
@@ -158,7 +158,9 @@ struct parse_opt_ctx_t { 
};



extern int parse_options_usage(const char * const *usagestr,

			       const struct option *opts);

			       const struct option *opts,

			       const char *optstr,

			       bool short_opt);



extern void parse_options_start(struct parse_opt_ctx_t *ctx,

				int argc, const char **argv, int flags);