提交 4bc43796 编写于 作者: A Adrian Hunter 提交者: Arnaldo Carvalho de Melo

perf tools: Allow '--inherit' as the negation of '--no-inherit'

Long options can be negated by prefixing them with 'no-'.  However
options that already start with 'no-', such as '--no-inherit' result in
ugly double 'no's.

Avoid that by accepting that the removal of 'no-' also negates the long
option.
Suggested-by: NPeter Zijlstra <peterz@infradead.org>
Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1384768557-23331-3-git-send-email-adrian.hunter@intel.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 3aa5939d
...@@ -224,6 +224,24 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, ...@@ -224,6 +224,24 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
return 0; return 0;
} }
if (!rest) { if (!rest) {
if (!prefixcmp(options->long_name, "no-")) {
/*
* The long name itself starts with "no-", so
* accept the option without "no-" so that users
* do not have to enter "no-no-" to get the
* negation.
*/
rest = skip_prefix(arg, options->long_name + 3);
if (rest) {
flags |= OPT_UNSET;
goto match;
}
/* Abbreviated case */
if (!prefixcmp(options->long_name + 3, arg)) {
flags |= OPT_UNSET;
goto is_abbreviated;
}
}
/* abbreviated? */ /* abbreviated? */
if (!strncmp(options->long_name, arg, arg_end - arg)) { if (!strncmp(options->long_name, arg, arg_end - arg)) {
is_abbreviated: is_abbreviated:
...@@ -259,6 +277,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, ...@@ -259,6 +277,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
if (!rest) if (!rest)
continue; continue;
} }
match:
if (*rest) { if (*rest) {
if (*rest != '=') if (*rest != '=')
continue; continue;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册