undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-options: allow callbacks to take no arguments at all.

Browse Source 
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Pierre Habouzit 2007-10-16 00:32:38 +02:00 committed by Junio C Hamano
parent 7f275b9152
commit f481e22a14
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parse-options.c
View File

@ -72,6 +72,11 @@ static int get_value(struct optparse_t *p,
case OPTION_CALLBACK: case OPTION_CALLBACK:
if (flags & OPT_UNSET) if (flags & OPT_UNSET)
return (*opt->callback)(opt, NULL, 1); return (*opt->callback)(opt, NULL, 1);
if (opt->flags & PARSE_OPT_NOARG) {
if (p->opt && !(flags & OPT_SHORT))
return opterror(opt, "takes no value", flags);
return (*opt->callback)(opt, NULL, 0);
}
if (opt->flags & PARSE_OPT_OPTARG && (!arg || *arg == '-')) if (opt->flags & PARSE_OPT_OPTARG && (!arg || *arg == '-'))
return (*opt->callback)(opt, NULL, 0); return (*opt->callback)(opt, NULL, 0);
if (!arg) if (!arg)
@ -261,8 +266,11 @@ void usage_with_options(const char * const *usagestr,
else else
pos += fprintf(stderr, " <n>"); pos += fprintf(stderr, " <n>");
break; break;
case OPTION_STRING:
case OPTION_CALLBACK: case OPTION_CALLBACK:
if (opts->flags & PARSE_OPT_NOARG)
break;
/* FALLTHROUGH */
case OPTION_STRING:
if (opts->argh) { if (opts->argh) {
if (opts->flags & PARSE_OPT_OPTARG) if (opts->flags & PARSE_OPT_OPTARG)
pos += fprintf(stderr, " [<%s>]", opts->argh); pos += fprintf(stderr, " [<%s>]", opts->argh);

1
parse-options.h
View File

@ -16,6 +16,7 @@ enum parse_opt_flags {
enum parse_opt_option_flags { enum parse_opt_option_flags {
PARSE_OPT_OPTARG = 1, PARSE_OPT_OPTARG = 1,
PARSE_OPT_NOARG = 2,
}; };
struct option; struct option;