From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756748AbbJ2JkE (ORCPT ); Thu, 29 Oct 2015 05:40:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56047 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751488AbbJ2JkB (ORCPT ); Thu, 29 Oct 2015 05:40:01 -0400 Date: Thu, 29 Oct 2015 02:39:31 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, hpa@zytor.com Reply-To: tglx@linutronix.de, jolsa@redhat.com, hpa@zytor.com, a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <1445701767-12731-1-git-send-email-namhyung@kernel.org> References: <1445701767-12731-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Improve ambiguous option help message Git-Commit-ID: a5f4a6932ec2e1a53642e97a1be64bc7b169942f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a5f4a6932ec2e1a53642e97a1be64bc7b169942f Gitweb: http://git.kernel.org/tip/a5f4a6932ec2e1a53642e97a1be64bc7b169942f Author: Namhyung Kim AuthorDate: Sun, 25 Oct 2015 00:49:24 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 26 Oct 2015 13:59:06 -0300 perf tools: Improve ambiguous option help message Currently if an option name is ambiguous it only prints first two matched option names but no help. It'd be better it could show all possible names and help messages too. Before: $ perf report --show Error: Ambiguous option: show (could be --show-total-period or --show-ref-call-graph) Usage: perf report [] After: $ perf report --show Error: Ambiguous option: show (could be --show-total-period or --show-ref-call-graph) Usage: perf report [] -n, --show-nr-samples Show a column with the number of samples --showcpuutilization Show sample percentage for different cpu modes -I, --show-info Display extended information about perf.data file --show-total-period Show a column with the sum of periods --show-ref-call-graph Show callgraph from reference event Signed-off-by: Namhyung Kim Acked-by: Ingo Molnar Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1445701767-12731-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-options.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index 22c2806..b8d9822 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c @@ -770,24 +770,23 @@ int parse_options_usage(const char * const *usagestr, opt: for ( ; opts->type != OPTION_END; opts++) { if (short_opt) { - if (opts->short_name == *optstr) + if (opts->short_name == *optstr) { + print_option_help(opts, 0); 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 (!prefixcmp(opts->long_name, optstr)) + print_option_help(opts, 0); + if (!prefixcmp("no-", optstr) && + !prefixcmp(opts->long_name, optstr + 3)) + print_option_help(opts, 0); } - if (opts->type != OPTION_END) - print_option_help(opts, 0); - return PARSE_OPT_HELP; }