mirror of
https://gitlab.com/openconnect/ocserv.git
synced 2026-02-10 08:46:58 +08:00
updated libopts to 5.18
This commit is contained in:
Nikos Mavrogiannopoulos
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* DO NOT EDIT THIS FILE (options.h)
|
||||
*
|
||||
* It has been AutoGen-ed March 31, 2013 at 10:41:30 AM by AutoGen 5.17.3
|
||||
* It has been AutoGen-ed July 14, 2013 at 05:37:12 PM by AutoGen 5.18
|
||||
* From the definitions funcs.def
|
||||
* and the template file options_h
|
||||
*
|
||||
@@ -101,15 +101,15 @@
|
||||
* @{
|
||||
*/
|
||||
/// autoopts structure version
|
||||
#define OPTIONS_STRUCT_VERSION 155648
|
||||
#define OPTIONS_STRUCT_VERSION 163840
|
||||
/// autoopts structure version string
|
||||
#define OPTIONS_VERSION_STRING "38:0:13"
|
||||
#define OPTIONS_VERSION_STRING "40:0:15"
|
||||
/// minimum version the autoopts library supports
|
||||
#define OPTIONS_MINIMUM_VERSION 102400
|
||||
/// minimum version the autoopts library supports as a string
|
||||
#define OPTIONS_MIN_VER_STRING "25:0:0"
|
||||
/// the display version of the autoopts library, as a string
|
||||
#define OPTIONS_DOTTED_VERSION "38.0"
|
||||
#define OPTIONS_DOTTED_VERSION "40.0"
|
||||
/// convert a version/release number pair to an integer value
|
||||
#define OPTIONS_VER_TO_NUM(_v, _r) (((_v) * 4096) + (_r))
|
||||
/// @}
|
||||
@@ -375,13 +375,16 @@ typedef uint32_t proc_state_mask_t;
|
||||
#define OPTPROC_PRESETTING 0x080000U
|
||||
/** proc_state_mask_t - Ignore pzFullUsage, compute usage text */
|
||||
#define OPTPROC_COMPUTE 0x100000U
|
||||
/** proc_state_mask_t - Program outputs digested option state for shell scripts.
|
||||
Usage text always written to stderr */
|
||||
#define OPTPROC_SHELL_OUTPUT 0x200000U
|
||||
|
||||
/** bits in NO_XLAT mask:
|
||||
* nxlat_opt_cfg nxlat_opt */
|
||||
#define OPTPROC_NO_XLAT_MASK 0x030000U
|
||||
|
||||
/** all bits in proc_state_mask_t masks */
|
||||
#define OPTPROC_MASK_ALL 0x1FFFFFU
|
||||
#define OPTPROC_MASK_ALL 0x3FFFFFU
|
||||
|
||||
/** no bits in proc_state_mask_t */
|
||||
#define OPTPROC_NONE 0x000000U
|
||||
@@ -911,6 +914,19 @@ extern const tOptionValue* optionGetValue(const tOptionValue*, char const*);
|
||||
extern void optionLoadLine(tOptions*, char const*);
|
||||
|
||||
|
||||
/**
|
||||
* optionMemberList - Get the list of members of a bit mask set
|
||||
*
|
||||
* This converts the OPT_VALUE_name mask value to a allocated string.
|
||||
* It is the caller's responsibility to free the string.
|
||||
*
|
||||
* @param od the set membership option description
|
||||
*
|
||||
* @return char* - the names of the set bits
|
||||
*/
|
||||
extern char* optionMemberList(tOptDesc *);
|
||||
|
||||
|
||||
/**
|
||||
* optionNextValue - get the next value from a hierarchical list
|
||||
*
|
||||
@@ -1167,7 +1183,7 @@ extern void optionNestedVal(tOptions*, tOptDesc*);
|
||||
|
||||
extern void optionNumericVal(tOptions*, tOptDesc*);
|
||||
|
||||
extern void optionPagedUsage(tOptions*, tOptDesc*);
|
||||
extern void optionPagedUsage(tOptions *, tOptDesc *);
|
||||
|
||||
extern void optionParseShell(tOptions*);
|
||||
|
||||
|
||||
@@ -71,5 +71,7 @@ typedef int tSuccess;
|
||||
# define MODE extern
|
||||
#endif
|
||||
|
||||
#define parse_duration option_parse_duration
|
||||
|
||||
#endif /* AUTOGEN_PROJECT_H */
|
||||
/* end of project.h */
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* DO NOT EDIT THIS FILE (usage-txt.h)
|
||||
*
|
||||
* It has been AutoGen-ed March 31, 2013 at 10:41:28 AM by AutoGen 5.17.3
|
||||
* It has been AutoGen-ed July 14, 2013 at 05:37:10 PM by AutoGen 5.18
|
||||
* From the definitions usage-txt.def
|
||||
* and the template file usage-txt.tpl
|
||||
*
|
||||
@@ -362,51 +362,51 @@ do not compile this section.
|
||||
*/
|
||||
static void dummy_func(void) {
|
||||
/* LIBOPTS-MESSAGES: */
|
||||
#line 60 "../autoopts.c"
|
||||
#line 67 "../autoopts.c"
|
||||
puts(_("allocation of %d bytes failed\n"));
|
||||
#line 86 "../autoopts.c"
|
||||
#line 93 "../autoopts.c"
|
||||
puts(_("allocation of %d bytes failed\n"));
|
||||
#line 53 "../init.c"
|
||||
puts(_("AutoOpts function called without option descriptor\n"));
|
||||
#line 89 "../init.c"
|
||||
#line 90 "../init.c"
|
||||
puts(_("\tThis exceeds the compiled library version: "));
|
||||
#line 87 "../init.c"
|
||||
#line 88 "../init.c"
|
||||
puts(_("Automated Options Processing Error!\n"
|
||||
"\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
|
||||
#line 73 "../autoopts.c"
|
||||
#line 80 "../autoopts.c"
|
||||
puts(_("realloc of %d bytes at 0x%p failed\n"));
|
||||
#line 91 "../init.c"
|
||||
#line 92 "../init.c"
|
||||
puts(_("\tThis is less than the minimum library version: "));
|
||||
#line 121 "../version.c"
|
||||
puts(_("Automated Options version %s\n"
|
||||
"\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
|
||||
#line 310 "../usage.c"
|
||||
#line 82 "../makeshell.c"
|
||||
puts(_("(AutoOpts bug): %s.\n"));
|
||||
#line 90 "../reset.c"
|
||||
puts(_("optionResetOpt() called, but reset-option not configured"));
|
||||
#line 329 "../usage.c"
|
||||
#line 292 "../usage.c"
|
||||
puts(_("could not locate the 'help' option"));
|
||||
#line 351 "../autoopts.c"
|
||||
#line 336 "../autoopts.c"
|
||||
puts(_("optionProcess() was called with invalid data"));
|
||||
#line 783 "../usage.c"
|
||||
#line 747 "../usage.c"
|
||||
puts(_("invalid argument type specified"));
|
||||
#line 589 "../find.c"
|
||||
#line 598 "../find.c"
|
||||
puts(_("defaulted to option with optional arg"));
|
||||
#line 76 "../alias.c"
|
||||
puts(_("aliasing option is out of range."));
|
||||
#line 229 "../enum.c"
|
||||
#line 234 "../enum.c"
|
||||
puts(_("%s error: the keyword '%s' is ambiguous for %s\n"));
|
||||
#line 108 "../find.c"
|
||||
puts(_(" The following options match:\n"));
|
||||
#line 290 "../find.c"
|
||||
#line 293 "../find.c"
|
||||
puts(_("%s: ambiguous option name: %s (matches %d options)\n"));
|
||||
#line 161 "../check.c"
|
||||
puts(_("%s: Command line arguments required\n"));
|
||||
#line 43 "../alias.c"
|
||||
puts(_("%d %s%s options allowed\n"));
|
||||
#line 81 "../makeshell.c"
|
||||
#line 89 "../makeshell.c"
|
||||
puts(_("%s error %d (%s) calling %s for '%s'\n"));
|
||||
#line 293 "../makeshell.c"
|
||||
#line 301 "../makeshell.c"
|
||||
puts(_("interprocess pipe"));
|
||||
#line 168 "../version.c"
|
||||
puts(_("error: version option argument '%c' invalid. Use:\n"
|
||||
@@ -415,48 +415,48 @@ static void dummy_func(void) {
|
||||
"\t'n' - version and full copyright notice\n"));
|
||||
#line 58 "../check.c"
|
||||
puts(_("%s error: the '%s' and '%s' options conflict\n"));
|
||||
#line 214 "../find.c"
|
||||
#line 217 "../find.c"
|
||||
puts(_("%s: The '%s' option has been disabled."));
|
||||
#line 421 "../find.c"
|
||||
#line 430 "../find.c"
|
||||
puts(_("%s: The '%s' option has been disabled."));
|
||||
#line 38 "../alias.c"
|
||||
puts(_("-equivalence"));
|
||||
#line 460 "../find.c"
|
||||
#line 469 "../find.c"
|
||||
puts(_("%s: illegal option -- %c\n"));
|
||||
#line 110 "../reset.c"
|
||||
puts(_("%s: illegal option -- %c\n"));
|
||||
#line 268 "../find.c"
|
||||
#line 271 "../find.c"
|
||||
puts(_("%s: illegal option -- %s\n"));
|
||||
#line 746 "../find.c"
|
||||
#line 755 "../find.c"
|
||||
puts(_("%s: illegal option -- %s\n"));
|
||||
#line 118 "../reset.c"
|
||||
puts(_("%s: illegal option -- %s\n"));
|
||||
#line 332 "../find.c"
|
||||
#line 335 "../find.c"
|
||||
puts(_("%s: unknown vendor extension option -- %s\n"));
|
||||
#line 154 "../enum.c"
|
||||
#line 159 "../enum.c"
|
||||
puts(_(" or an integer from %d through %d\n"));
|
||||
#line 164 "../enum.c"
|
||||
#line 169 "../enum.c"
|
||||
puts(_(" or an integer from %d through %d\n"));
|
||||
#line 782 "../usage.c"
|
||||
#line 746 "../usage.c"
|
||||
puts(_("%s error: invalid option descriptor for %s\n"));
|
||||
#line 1110 "../usage.c"
|
||||
#line 1080 "../usage.c"
|
||||
puts(_("%s error: invalid option descriptor for %s\n"));
|
||||
#line 379 "../find.c"
|
||||
#line 385 "../find.c"
|
||||
puts(_("%s: invalid option name: %s\n"));
|
||||
#line 518 "../find.c"
|
||||
#line 527 "../find.c"
|
||||
puts(_("%s: The '%s' option requires an argument.\n"));
|
||||
#line 171 "../autoopts.c"
|
||||
#line 156 "../autoopts.c"
|
||||
puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n"
|
||||
"\t'%s' and '%s'."));
|
||||
#line 94 "../check.c"
|
||||
puts(_("%s error: The %s option is required\n"));
|
||||
#line 623 "../find.c"
|
||||
#line 632 "../find.c"
|
||||
puts(_("%s: The '%s' option cannot have an argument.\n"));
|
||||
#line 151 "../check.c"
|
||||
puts(_("%s: Command line arguments are not allowed.\n"));
|
||||
#line 531 "../save.c"
|
||||
#line 535 "../save.c"
|
||||
puts(_("error %d (%s) creating %s\n"));
|
||||
#line 229 "../enum.c"
|
||||
#line 234 "../enum.c"
|
||||
puts(_("%s error: '%s' does not match any %s keywords.\n"));
|
||||
#line 93 "../reset.c"
|
||||
puts(_("%s error: The '%s' option requires an argument.\n"));
|
||||
@@ -466,7 +466,7 @@ static void dummy_func(void) {
|
||||
puts(_("error %d (%s) stat-ing %s\n"));
|
||||
#line 143 "../restore.c"
|
||||
puts(_("%s error: no saved option state\n"));
|
||||
#line 246 "../autoopts.c"
|
||||
#line 231 "../autoopts.c"
|
||||
puts(_("'%s' is not a command line option.\n"));
|
||||
#line 114 "../time.c"
|
||||
puts(_("%s error: '%s' is not a recognizable date/time.\n"));
|
||||
@@ -478,41 +478,41 @@ static void dummy_func(void) {
|
||||
puts(_("%s error: The %s option must appear %d times.\n"));
|
||||
#line 157 "../numeric.c"
|
||||
puts(_("%s error: '%s' is not a recognizable number.\n"));
|
||||
#line 195 "../enum.c"
|
||||
#line 200 "../enum.c"
|
||||
puts(_("%s error: %s exceeds %s keyword count\n"));
|
||||
#line 366 "../usage.c"
|
||||
#line 329 "../usage.c"
|
||||
puts(_("Try '%s %s' for more information.\n"));
|
||||
#line 45 "../alias.c"
|
||||
puts(_("one %s%s option allowed\n"));
|
||||
#line 195 "../makeshell.c"
|
||||
#line 203 "../makeshell.c"
|
||||
puts(_("standard output"));
|
||||
#line 930 "../makeshell.c"
|
||||
#line 938 "../makeshell.c"
|
||||
puts(_("standard output"));
|
||||
#line 304 "../usage.c"
|
||||
#line 274 "../usage.c"
|
||||
puts(_("standard output"));
|
||||
#line 451 "../usage.c"
|
||||
#line 414 "../usage.c"
|
||||
puts(_("standard output"));
|
||||
#line 660 "../usage.c"
|
||||
#line 624 "../usage.c"
|
||||
puts(_("standard output"));
|
||||
#line 175 "../version.c"
|
||||
puts(_("standard output"));
|
||||
#line 304 "../usage.c"
|
||||
#line 274 "../usage.c"
|
||||
puts(_("standard error"));
|
||||
#line 451 "../usage.c"
|
||||
#line 414 "../usage.c"
|
||||
puts(_("standard error"));
|
||||
#line 660 "../usage.c"
|
||||
#line 624 "../usage.c"
|
||||
puts(_("standard error"));
|
||||
#line 175 "../version.c"
|
||||
puts(_("standard error"));
|
||||
#line 195 "../makeshell.c"
|
||||
#line 203 "../makeshell.c"
|
||||
puts(_("write"));
|
||||
#line 930 "../makeshell.c"
|
||||
#line 938 "../makeshell.c"
|
||||
puts(_("write"));
|
||||
#line 303 "../usage.c"
|
||||
#line 273 "../usage.c"
|
||||
puts(_("write"));
|
||||
#line 450 "../usage.c"
|
||||
#line 413 "../usage.c"
|
||||
puts(_("write"));
|
||||
#line 659 "../usage.c"
|
||||
#line 623 "../usage.c"
|
||||
puts(_("write"));
|
||||
#line 174 "../version.c"
|
||||
puts(_("write"));
|
||||
@@ -528,70 +528,70 @@ static void dummy_func(void) {
|
||||
puts(_("%s warning: cannot save options - %s not regular file\n"));
|
||||
#line 256 "../save.c"
|
||||
puts(_("%s warning: cannot save options - %s not regular file\n"));
|
||||
#line 530 "../save.c"
|
||||
#line 534 "../save.c"
|
||||
puts(_("%s warning: cannot save options - %s not regular file\n"));
|
||||
/* END-LIBOPTS-MESSAGES */
|
||||
|
||||
/* USAGE-TEXT: */
|
||||
#line 908 "../usage.c"
|
||||
puts(_("\t\t\t\t- an alternate for '%s'\n"));
|
||||
#line 1177 "../usage.c"
|
||||
puts(_("Version, usage and configuration options:"));
|
||||
#line 959 "../usage.c"
|
||||
puts(_("\t\t\t\t- default option for unnamed options\n"));
|
||||
#line 872 "../usage.c"
|
||||
puts(_("\t\t\t\t- an alternate for '%s'\n"));
|
||||
#line 1147 "../usage.c"
|
||||
puts(_("Version, usage and configuration options:"));
|
||||
#line 923 "../usage.c"
|
||||
puts(_("\t\t\t\t- default option for unnamed options\n"));
|
||||
#line 836 "../usage.c"
|
||||
puts(_("\t\t\t\t- disabled as '--%s'\n"));
|
||||
#line 1146 "../usage.c"
|
||||
#line 1116 "../usage.c"
|
||||
puts(_(" --- %-14s %s\n"));
|
||||
#line 1144 "../usage.c"
|
||||
#line 1114 "../usage.c"
|
||||
puts(_("This option has been disabled"));
|
||||
#line 899 "../usage.c"
|
||||
#line 863 "../usage.c"
|
||||
puts(_("\t\t\t\t- enabled by default\n"));
|
||||
#line 40 "../alias.c"
|
||||
puts(_("%s error: only "));
|
||||
#line 1221 "../usage.c"
|
||||
#line 1193 "../usage.c"
|
||||
puts(_(" - examining environment variables named %s_*\n"));
|
||||
#line 168 "../file.c"
|
||||
puts(_("\t\t\t\t- file must not pre-exist\n"));
|
||||
#line 172 "../file.c"
|
||||
puts(_("\t\t\t\t- file must pre-exist\n"));
|
||||
#line 416 "../usage.c"
|
||||
#line 379 "../usage.c"
|
||||
puts(_("Options are specified by doubled hyphens and their name or by a single\n"
|
||||
"hyphen and the flag character.\n"));
|
||||
#line 908 "../makeshell.c"
|
||||
#line 916 "../makeshell.c"
|
||||
puts(_("\n"
|
||||
"= = = = = = = =\n\n"
|
||||
"This incarnation of genshell will produce\n"
|
||||
"a shell script to parse the options for %s:\n\n"));
|
||||
#line 161 "../enum.c"
|
||||
#line 166 "../enum.c"
|
||||
puts(_(" or an integer mask with any of the lower %d bits set\n"));
|
||||
#line 932 "../usage.c"
|
||||
#line 896 "../usage.c"
|
||||
puts(_("\t\t\t\t- is a set membership option\n"));
|
||||
#line 953 "../usage.c"
|
||||
#line 917 "../usage.c"
|
||||
puts(_("\t\t\t\t- must appear between %d and %d times\n"));
|
||||
#line 418 "../usage.c"
|
||||
#line 381 "../usage.c"
|
||||
puts(_("Options are specified by single or double hyphens and their name.\n"));
|
||||
#line 939 "../usage.c"
|
||||
#line 903 "../usage.c"
|
||||
puts(_("\t\t\t\t- may appear multiple times\n"));
|
||||
#line 926 "../usage.c"
|
||||
#line 890 "../usage.c"
|
||||
puts(_("\t\t\t\t- may not be preset\n"));
|
||||
#line 1336 "../usage.c"
|
||||
#line 1308 "../usage.c"
|
||||
puts(_(" Arg Option-Name Description\n"));
|
||||
#line 1272 "../usage.c"
|
||||
#line 1244 "../usage.c"
|
||||
puts(_(" Flg Arg Option-Name Description\n"));
|
||||
#line 1330 "../usage.c"
|
||||
#line 1302 "../usage.c"
|
||||
puts(_(" Flg Arg Option-Name Description\n"));
|
||||
#line 1331 "../usage.c"
|
||||
#line 1303 "../usage.c"
|
||||
puts(_(" %3s %s"));
|
||||
#line 1337 "../usage.c"
|
||||
#line 1309 "../usage.c"
|
||||
puts(_(" %3s %s"));
|
||||
#line 423 "../usage.c"
|
||||
#line 386 "../usage.c"
|
||||
puts(_("The '-#<number>' option may omit the hash char\n"));
|
||||
#line 419 "../usage.c"
|
||||
#line 382 "../usage.c"
|
||||
puts(_("All arguments are named options.\n"));
|
||||
#line 1006 "../usage.c"
|
||||
#line 970 "../usage.c"
|
||||
puts(_(" - reading file %s"));
|
||||
#line 445 "../usage.c"
|
||||
#line 408 "../usage.c"
|
||||
puts(_("\n"
|
||||
"Please send bug reports to: <%s>\n"));
|
||||
#line 100 "../version.c"
|
||||
@@ -600,17 +600,17 @@ static void dummy_func(void) {
|
||||
#line 129 "../version.c"
|
||||
puts(_("\n"
|
||||
"Please send bug reports to: <%s>\n"));
|
||||
#line 938 "../usage.c"
|
||||
#line 902 "../usage.c"
|
||||
puts(_("\t\t\t\t- may NOT appear - preset only\n"));
|
||||
#line 978 "../usage.c"
|
||||
#line 943 "../usage.c"
|
||||
puts(_("\n"
|
||||
"The following option preset mechanisms are supported:\n"));
|
||||
#line 1219 "../usage.c"
|
||||
#line 1191 "../usage.c"
|
||||
puts(_("\n"
|
||||
"The following option preset mechanisms are supported:\n"));
|
||||
#line 717 "../usage.c"
|
||||
#line 681 "../usage.c"
|
||||
puts(_("prohibits these options:\n"));
|
||||
#line 712 "../usage.c"
|
||||
#line 676 "../usage.c"
|
||||
puts(_("prohibits the option '%s'\n"));
|
||||
#line 81 "../numeric.c"
|
||||
puts(_("%s%ld to %ld"));
|
||||
@@ -628,28 +628,28 @@ static void dummy_func(void) {
|
||||
puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
|
||||
#line 77 "../numeric.c"
|
||||
puts(_("%sless than or equal to %ld"));
|
||||
#line 426 "../usage.c"
|
||||
#line 389 "../usage.c"
|
||||
puts(_("Operands and options may be intermixed. They will be reordered.\n"));
|
||||
#line 687 "../usage.c"
|
||||
#line 651 "../usage.c"
|
||||
puts(_("requires the option '%s'\n"));
|
||||
#line 690 "../usage.c"
|
||||
#line 654 "../usage.c"
|
||||
puts(_("requires these options:\n"));
|
||||
#line 1348 "../usage.c"
|
||||
#line 1320 "../usage.c"
|
||||
puts(_(" Arg Option-Name Req? Description\n"));
|
||||
#line 1342 "../usage.c"
|
||||
#line 1314 "../usage.c"
|
||||
puts(_(" Flg Arg Option-Name Req? Description\n"));
|
||||
#line 162 "../enum.c"
|
||||
#line 167 "../enum.c"
|
||||
puts(_("or you may use a numeric representation. Preceding these with a '!'\n"
|
||||
"will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
|
||||
"will set them all. Multiple entries may be passed as an option\n"
|
||||
"argument list.\n"));
|
||||
#line 945 "../usage.c"
|
||||
#line 909 "../usage.c"
|
||||
puts(_("\t\t\t\t- may appear up to %d times\n"));
|
||||
#line 72 "../enum.c"
|
||||
#line 77 "../enum.c"
|
||||
puts(_("The valid \"%s\" option keywords are:\n"));
|
||||
#line 1181 "../usage.c"
|
||||
#line 1151 "../usage.c"
|
||||
puts(_("The next option supports vendor supported extra options:"));
|
||||
#line 808 "../usage.c"
|
||||
#line 772 "../usage.c"
|
||||
puts(_("These additional options are:"));
|
||||
/* END-USAGE-TEXT */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user