Merging upstream version 2.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
23e83cb1c3
commit
cc86d37eef
458 changed files with 7148 additions and 5151 deletions
|
@ -38,6 +38,7 @@
|
|||
#include <getopt.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
enum argconfig_types {
|
||||
CFG_FLAG,
|
||||
|
@ -62,7 +63,7 @@ enum argconfig_types {
|
|||
};
|
||||
|
||||
#define OPT_ARGS(n) \
|
||||
const struct argconfig_commandline_options n[]
|
||||
struct argconfig_commandline_options n[]
|
||||
|
||||
#define OPT_END() { NULL }
|
||||
|
||||
|
@ -109,6 +110,7 @@ struct argconfig_commandline_options {
|
|||
void *default_value;
|
||||
int argument_type;
|
||||
const char *help;
|
||||
bool seen;
|
||||
};
|
||||
|
||||
#define CFG_MAX_SUBOPTS 500
|
||||
|
@ -117,9 +119,9 @@ struct argconfig_commandline_options {
|
|||
typedef void argconfig_help_func();
|
||||
void argconfig_append_usage(const char *str);
|
||||
void argconfig_print_help(const char *program_desc,
|
||||
const struct argconfig_commandline_options *options);
|
||||
struct argconfig_commandline_options *options);
|
||||
int argconfig_parse(int argc, char *argv[], const char *program_desc,
|
||||
const struct argconfig_commandline_options *options);
|
||||
struct argconfig_commandline_options *options);
|
||||
int argconfig_parse_subopt_string(char *string, char **options,
|
||||
size_t max_options);
|
||||
int argconfig_parse_comma_sep_array(char *string, int *ret,
|
||||
|
@ -133,4 +135,7 @@ int argconfig_parse_byte(const char *opt, const char *str, unsigned char *val);
|
|||
void argconfig_register_help_func(argconfig_help_func * f);
|
||||
|
||||
void print_word_wrapped(const char *s, int indent, int start, FILE *stream);
|
||||
bool argconfig_parse_seen(struct argconfig_commandline_options *options,
|
||||
const char *option);
|
||||
bool argconfig_output_format_json(bool set);
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue