tools lib subcmd: Make it an error to pass a signed value to OPTION_UINTEGER
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: b98897166280c4cfb9bc5a6c1b5682528eb4abff Gitweb: http://git.kernel.org/tip/b98897166280c4cfb9bc5a6c1b5682528eb4abff Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 14 Feb 2017 13:55:40 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 14 Feb 2017 15:19:17 -0300
tools lib subcmd: Make it an error to pass a signed value to OPTION_UINTEGER
Options marked OPTION_UINTEGER or OPTION_U64 clearly indicates that an unsigned value is expected, so just error out when a negative value is passed, instead of returning something undesired to the tool.
E.g.:
# perf bench futex hash -t -4 # Running 'futex/hash' benchmark: Error: switch `t' expects an unsigned numerical value Usage: perf bench futex hash <options>
-t, --threads <n> Specify amount of threads
#
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Davidlohr Bueso <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/lib/subcmd/parse-options.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/lib/subcmd/parse-options.c +4 -0
@@ -270,6 +270,8 @@ static int get_value(struct parse_opt_ctx_t *p, }if (get_arg (p, opt, flags, &arg))return -1 ; +if (arg[0 ] =='-' ) +return opterror (opt,"expects an unsigned numerical value" , flags); *(unsigned int *)opt->value =strtol (arg, (char **)&s,10 );if (*s)return opterror (opt,"expects a numerical value" , flags);
@@ -302,6 +304,8 @@ static int get_value(struct parse_opt_ctx_t *p, }if (get_arg (p, opt, flags, &arg))return -1 ; +if (arg[0 ] =='-' ) +return opterror (opt,"expects an unsigned numerical value" , flags); *(u64 *)opt->value =strtoull (arg, (char **)&s,10 );if (*s)return opterror (opt,"expects a numerical value" , flags);