forked from Minki/linux
c055564217
Parsing an option from the command line with OPT_BOOLEAN on a bool data type would not work on a big-endian machine due to the manner in which the boolean was being cast into an int and incremented. For example, running 'perf probe --list' on a PowerPC machine would fail to properly set the list_events bool and would therefore print out the usage information and terminate. This patch makes OPT_BOOLEAN work as expected with a bool datatype. For cases where the original OPT_BOOLEAN was intentionally being used to increment an int each time it was passed in on the command line, this patch introduces OPT_INCR with the old behaviour of OPT_BOOLEAN (the verbose variable is currently the only such example of this). I have reviewed every use of OPT_BOOLEAN to verify that a true C99 bool was passed. Where integers were used, I verified that they were only being used for boolean logic and changed them to bools to ensure that they would not be mistakenly used as ints. The major exception was the verbose variable which now uses OPT_INCR instead of OPT_BOOLEAN. Signed-off-by: Ian Munsie <imunsie@au.ibm.com> Acked-by: David S. Miller <davem@davemloft.net> Cc: <stable@kernel.org> # NOTE: wont apply to .3[34].x cleanly, please backport Cc: Git development list <git@vger.kernel.org> Cc: Ian Munsie <imunsie@au1.ibm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Eric B Munson <ebmunson@us.ibm.com> Cc: Valdis.Kletnieks@vt.edu Cc: WANG Cong <amwang@redhat.com> Cc: Thiago Farina <tfransosi@gmail.com> Cc: Masami Hiramatsu <mhiramat@redhat.com> Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Cc: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Mike Galbraith <efault@gmx.de> Cc: Tom Zanussi <tzanussi@gmail.com> Cc: Anton Blanchard <anton@samba.org> Cc: John Kacur <jkacur@redhat.com> Cc: Li Zefan <lizf@cn.fujitsu.com> Cc: Steven Rostedt <rostedt@goodmis.org> LKML-Reference: <1271147857-11604-1-git-send-email-imunsie@au.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
180 lines
6.6 KiB
C
180 lines
6.6 KiB
C
#ifndef __PERF_PARSE_OPTIONS_H
|
|
#define __PERF_PARSE_OPTIONS_H
|
|
|
|
enum parse_opt_type {
|
|
/* special types */
|
|
OPTION_END,
|
|
OPTION_ARGUMENT,
|
|
OPTION_GROUP,
|
|
/* options with no arguments */
|
|
OPTION_BIT,
|
|
OPTION_BOOLEAN,
|
|
OPTION_INCR,
|
|
OPTION_SET_INT,
|
|
OPTION_SET_PTR,
|
|
/* options with arguments (usually) */
|
|
OPTION_STRING,
|
|
OPTION_INTEGER,
|
|
OPTION_LONG,
|
|
OPTION_CALLBACK,
|
|
};
|
|
|
|
enum parse_opt_flags {
|
|
PARSE_OPT_KEEP_DASHDASH = 1,
|
|
PARSE_OPT_STOP_AT_NON_OPTION = 2,
|
|
PARSE_OPT_KEEP_ARGV0 = 4,
|
|
PARSE_OPT_KEEP_UNKNOWN = 8,
|
|
PARSE_OPT_NO_INTERNAL_HELP = 16,
|
|
};
|
|
|
|
enum parse_opt_option_flags {
|
|
PARSE_OPT_OPTARG = 1,
|
|
PARSE_OPT_NOARG = 2,
|
|
PARSE_OPT_NONEG = 4,
|
|
PARSE_OPT_HIDDEN = 8,
|
|
PARSE_OPT_LASTARG_DEFAULT = 16,
|
|
};
|
|
|
|
struct option;
|
|
typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
|
|
|
|
/*
|
|
* `type`::
|
|
* holds the type of the option, you must have an OPTION_END last in your
|
|
* array.
|
|
*
|
|
* `short_name`::
|
|
* the character to use as a short option name, '\0' if none.
|
|
*
|
|
* `long_name`::
|
|
* the long option name, without the leading dashes, NULL if none.
|
|
*
|
|
* `value`::
|
|
* stores pointers to the values to be filled.
|
|
*
|
|
* `argh`::
|
|
* token to explain the kind of argument this option wants. Keep it
|
|
* homogenous across the repository.
|
|
*
|
|
* `help`::
|
|
* the short help associated to what the option does.
|
|
* Must never be NULL (except for OPTION_END).
|
|
* OPTION_GROUP uses this pointer to store the group header.
|
|
*
|
|
* `flags`::
|
|
* mask of parse_opt_option_flags.
|
|
* PARSE_OPT_OPTARG: says that the argument is optionnal (not for BOOLEANs)
|
|
* PARSE_OPT_NOARG: says that this option takes no argument, for CALLBACKs
|
|
* PARSE_OPT_NONEG: says that this option cannot be negated
|
|
* PARSE_OPT_HIDDEN this option is skipped in the default usage, showed in
|
|
* the long one.
|
|
*
|
|
* `callback`::
|
|
* pointer to the callback to use for OPTION_CALLBACK.
|
|
*
|
|
* `defval`::
|
|
* default value to fill (*->value) with for PARSE_OPT_OPTARG.
|
|
* OPTION_{BIT,SET_INT,SET_PTR} store the {mask,integer,pointer} to put in
|
|
* the value when met.
|
|
* CALLBACKS can use it like they want.
|
|
*/
|
|
struct option {
|
|
enum parse_opt_type type;
|
|
int short_name;
|
|
const char *long_name;
|
|
void *value;
|
|
const char *argh;
|
|
const char *help;
|
|
|
|
int flags;
|
|
parse_opt_cb *callback;
|
|
intptr_t defval;
|
|
};
|
|
|
|
#define OPT_END() { .type = OPTION_END }
|
|
#define OPT_ARGUMENT(l, h) { .type = OPTION_ARGUMENT, .long_name = (l), .help = (h) }
|
|
#define OPT_GROUP(h) { .type = OPTION_GROUP, .help = (h) }
|
|
#define OPT_BIT(s, l, v, h, b) { .type = OPTION_BIT, .short_name = (s), .long_name = (l), .value = (v), .help = (h), .defval = (b) }
|
|
#define OPT_BOOLEAN(s, l, v, h) { .type = OPTION_BOOLEAN, .short_name = (s), .long_name = (l), .value = (v), .help = (h) }
|
|
#define OPT_INCR(s, l, v, h) { .type = OPTION_INCR, .short_name = (s), .long_name = (l), .value = (v), .help = (h) }
|
|
#define OPT_SET_INT(s, l, v, h, i) { .type = OPTION_SET_INT, .short_name = (s), .long_name = (l), .value = (v), .help = (h), .defval = (i) }
|
|
#define OPT_SET_PTR(s, l, v, h, p) { .type = OPTION_SET_PTR, .short_name = (s), .long_name = (l), .value = (v), .help = (h), .defval = (p) }
|
|
#define OPT_INTEGER(s, l, v, h) { .type = OPTION_INTEGER, .short_name = (s), .long_name = (l), .value = (v), .help = (h) }
|
|
#define OPT_LONG(s, l, v, h) { .type = OPTION_LONG, .short_name = (s), .long_name = (l), .value = (v), .help = (h) }
|
|
#define OPT_STRING(s, l, v, a, h) { .type = OPTION_STRING, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (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 }
|
|
#define OPT_CALLBACK(s, l, v, a, h, f) \
|
|
{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) }
|
|
#define OPT_CALLBACK_NOOPT(s, l, v, a, h, f) \
|
|
{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG }
|
|
#define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \
|
|
{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .defval = (intptr_t)d, .flags = PARSE_OPT_LASTARG_DEFAULT }
|
|
|
|
/* parse_options() will filter out the processed options and leave the
|
|
* non-option argments in argv[].
|
|
* Returns the number of arguments left in argv[].
|
|
*/
|
|
extern int parse_options(int argc, const char **argv,
|
|
const struct option *options,
|
|
const char * const usagestr[], int flags);
|
|
|
|
extern NORETURN void usage_with_options(const char * const *usagestr,
|
|
const struct option *options);
|
|
|
|
/*----- incremantal advanced APIs -----*/
|
|
|
|
enum {
|
|
PARSE_OPT_HELP = -1,
|
|
PARSE_OPT_DONE,
|
|
PARSE_OPT_UNKNOWN,
|
|
};
|
|
|
|
/*
|
|
* It's okay for the caller to consume argv/argc in the usual way.
|
|
* Other fields of that structure are private to parse-options and should not
|
|
* be modified in any way.
|
|
*/
|
|
struct parse_opt_ctx_t {
|
|
const char **argv;
|
|
const char **out;
|
|
int argc, cpidx;
|
|
const char *opt;
|
|
int flags;
|
|
};
|
|
|
|
extern int parse_options_usage(const char * const *usagestr,
|
|
const struct option *opts);
|
|
|
|
extern void parse_options_start(struct parse_opt_ctx_t *ctx,
|
|
int argc, const char **argv, int flags);
|
|
|
|
extern int parse_options_step(struct parse_opt_ctx_t *ctx,
|
|
const struct option *options,
|
|
const char * const usagestr[]);
|
|
|
|
extern int parse_options_end(struct parse_opt_ctx_t *ctx);
|
|
|
|
|
|
/*----- some often used options -----*/
|
|
extern int parse_opt_abbrev_cb(const struct option *, const char *, int);
|
|
extern int parse_opt_approxidate_cb(const struct option *, const char *, int);
|
|
extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
|
|
|
|
#define OPT__VERBOSE(var) OPT_BOOLEAN('v', "verbose", (var), "be verbose")
|
|
#define OPT__QUIET(var) OPT_BOOLEAN('q', "quiet", (var), "be quiet")
|
|
#define OPT__VERBOSITY(var) \
|
|
{ OPTION_CALLBACK, 'v', "verbose", (var), NULL, "be more verbose", \
|
|
PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }, \
|
|
{ OPTION_CALLBACK, 'q', "quiet", (var), NULL, "be more quiet", \
|
|
PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }
|
|
#define OPT__DRY_RUN(var) OPT_BOOLEAN('n', "dry-run", (var), "dry run")
|
|
#define OPT__ABBREV(var) \
|
|
{ OPTION_CALLBACK, 0, "abbrev", (var), "n", \
|
|
"use <n> digits to display SHA-1s", \
|
|
PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 }
|
|
|
|
extern const char *parse_options_fix_filename(const char *prefix, const char *file);
|
|
|
|
#endif /* __PERF_PARSE_OPTIONS_H */
|