-/* -*- buffer-read-only: t -*- vi: set ro:
+/*
+ * EDIT THIS FILE WITH CAUTION (clktest-opts.c)
*
- * DO NOT EDIT THIS FILE (clktest-opts.c)
- *
- * It has been AutoGen-ed Thursday April 12, 2007 at 02:55:58 AM EDT
+ * It has been AutoGen-ed November 17, 2009 at 06:37:09 AM by AutoGen 5.10
* From the definitions clktest-opts.def
* and the template file options
*
- * Generated from AutoOpts 28:0:3 templates.
+ * Generated from AutoOpts 33:0:8 templates.
*/
/*
*
* This source file is copyrighted and licensed under the following terms:
*
- * clktest copyright 1970-2006 ntp.org - all rights reserved
+ * clktest copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
*
* see html/copyright.html
*/
-
+#include <sys/types.h>
#include <limits.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+extern FILE * option_usage_fp;
#define OPTION_CODE_COMPILE 1
#include "clktest-opts.h"
#ifdef __cplusplus
extern "C" {
#endif
+
+/* TRANSLATORS: choose the translation for option names wisely because you
+ cannot ever change your mind. */
tSCC zCopyright[] =
- "clktest copyright (c) 1970-2006 ntp.org, all rights reserved";
-tSCC zCopyrightNotice[] =
-
+ "clktest copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
+;
+tSCC zCopyrightNotice[24] =
"see html/copyright.html";
+
extern tUsageProc optionUsage;
/*
* global included definitions
*/
-#ifdef STREAM
-char magic[32] = "";
-#endif
extern int speed;
extern int ttflags;
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
-/*
- * Magic2 option description:
- */
-#ifdef CLKLDISC
-tSCC zMagic2Text[] =
- "The 'kill' character (default: '\\r')";
-tSCC zMagic2_NAME[] = "MAGIC2";
-tSCC zMagic2_Name[] = "magic2";
-#define MAGIC2_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-
-#else /* disable Magic2 */
-#define VALUE_OPT_MAGIC2 NO_EQUIVALENT
-#define MAGIC2_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
-#define zMagic2Text NULL
-#define zMagic2_NAME NULL
-#define zMagic2_Name NULL
-#endif /* CLKLDISC */
-
-/*
- * Magic1 option description:
- */
-#ifdef CLKLDISC
-tSCC zMagic1Text[] =
- "The 'erase' character (default: '\\r')";
-tSCC zMagic1_NAME[] = "MAGIC1";
-tSCC zMagic1_Name[] = "magic1";
-#define MAGIC1_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
-
-#else /* disable Magic1 */
-#define VALUE_OPT_MAGIC1 NO_EQUIVALENT
-#define MAGIC1_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
-#define zMagic1Text NULL
-#define zMagic1_NAME NULL
-#define zMagic1_Name NULL
-#endif /* CLKLDISC */
-
-/*
- * Magic1 option description:
- */
-#ifdef STREAM
-tSCC zMagic1Text[] =
- "Magic characters for streams";
-tSCC zMagic1_NAME[] = "MAGIC1";
-tSCC zMagic1_Name[] = "magic1";
-#define MAGIC1_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else /* disable Magic1 */
-#define VALUE_OPT_MAGIC1 NO_EQUIVALENT
-#define MAGIC1_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
-#define zMagic1Text NULL
-#define zMagic1_NAME NULL
-#define zMagic1_Name NULL
-#endif /* STREAM */
/*
* Speed option description:
/*
* Help/More_Help/Version option descriptions:
*/
-tSCC zHelpText[] = "Display usage information and exit";
-tSCC zHelp_Name[] = "help";
-
-tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
-tSCC zMore_Help_Name[] = "more-help";
-
-tSCC zVersionText[] = "Output version information and exit";
-tSCC zVersion_Name[] = "version";
+tSCC zHelpText[] = "Display extended usage information and exit";
+tSCC zHelp_Name[] = "help";
+#ifdef HAVE_WORKING_FORK
+#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
+tSCC zMore_Help_Name[] = "more-help";
+tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
+#else
+#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zMore_Help_Name NULL
+#define zMore_HelpText NULL
+#endif
+#ifdef NO_OPTIONAL_OPT_ARGS
+# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT
+#else
+# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
+ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
+#endif
-/*
- * Save/Load_Opts option description:
- */
+tSCC zVersionText[] = "Output version information and exit";
+tSCC zVersion_Name[] = "version";
tSCC zSave_OptsText[] = "Save the option state to a config file";
tSCC zSave_Opts_Name[] = "save-opts";
-
tSCC zLoad_OptsText[] = "Load options from a config file";
tSCC zLoad_Opts_NAME[] = "LOAD_OPTS";
-
tSCC zNotLoad_Opts_Name[] = "no-load-opts";
tSCC zNotLoad_Opts_Pfx[] = "no";
#define zLoad_Opts_Name (zNotLoad_Opts_Name + 3)
/*
* Declare option callback procedures
*/
-#ifdef CLKLDISC
- static tOptProc doOptMagic2;
-#else /* not CLKLDISC */
-# define doOptMagic2 NULL
-#endif /* def/not CLKLDISC */
-#ifdef CLKLDISC
- static tOptProc doOptMagic1;
-#else /* not CLKLDISC */
-# define doOptMagic1 NULL
-#endif /* def/not CLKLDISC */
-#ifdef STREAM
- static tOptProc doOptMagic1;
-#else /* not STREAM */
-# define doOptMagic1 NULL
-#endif /* def/not STREAM */
#if defined(TEST_CLKTEST_OPTS)
/*
* Under test, omit argument processing, or call optionStackArg,
extern tOptProc
optionPagedUsage, optionVersionStderr;
static tOptProc
- doOptMagic1, doOptMagic2, doOptTimeout, doUsageOpt;
+ doOptTimeout, doUsageOpt;
/*
* #define map the "normal" callout procs to the test ones...
* Define the Clktest Option Descriptions.
*/
static tOptDesc optDesc[ OPTION_CT ] = {
- { /* entry idx, value */ 0, VALUE_OPT_MAGIC2,
- /* equiv idx, value */ 0, VALUE_OPT_MAGIC2,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ MAGIC2_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ doOptMagic2,
- /* desc, NAME, name */ zMagic2Text, zMagic2_NAME, zMagic2_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 1, VALUE_OPT_MAGIC1,
- /* equiv idx, value */ 1, VALUE_OPT_MAGIC1,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ MAGIC1_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ doOptMagic1,
- /* desc, NAME, name */ zMagic1Text, zMagic1_NAME, zMagic1_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 2, VALUE_OPT_MAGIC1,
- /* equiv idx, value */ 2, VALUE_OPT_MAGIC1,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ MAGIC1_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ doOptMagic1,
- /* desc, NAME, name */ zMagic1Text, zMagic1_NAME, zMagic1_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 3, VALUE_OPT_SPEED,
- /* equiv idx, value */ 3, VALUE_OPT_SPEED,
+ { /* entry idx, value */ 0, VALUE_OPT_SPEED,
+ /* equiv idx, value */ 0, VALUE_OPT_SPEED,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SPEED_FLAGS, 0,
/* desc, NAME, name */ zSpeedText, zSpeed_NAME, zSpeed_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 4, VALUE_OPT_DEBUG,
- /* equiv idx, value */ 4, VALUE_OPT_DEBUG,
+ { /* entry idx, value */ 1, VALUE_OPT_DEBUG,
+ /* equiv idx, value */ 1, VALUE_OPT_DEBUG,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ DEBUG_FLAGS, 0,
/* desc, NAME, name */ zDebugText, zDebug_NAME, zDebug_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 5, VALUE_OPT_CRMOD,
- /* equiv idx, value */ 5, VALUE_OPT_CRMOD,
+ { /* entry idx, value */ 2, VALUE_OPT_CRMOD,
+ /* equiv idx, value */ 2, VALUE_OPT_CRMOD,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ CRMOD_FLAGS, 0,
/* desc, NAME, name */ zCrmodText, zCrmod_NAME, zCrmod_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 6, VALUE_OPT_COMMAND,
- /* equiv idx, value */ 6, VALUE_OPT_COMMAND,
+ { /* entry idx, value */ 3, VALUE_OPT_COMMAND,
+ /* equiv idx, value */ 3, VALUE_OPT_COMMAND,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ COMMAND_FLAGS, 0,
/* desc, NAME, name */ zCommandText, zCommand_NAME, zCommand_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 7, VALUE_OPT_TIMEOUT,
- /* equiv idx, value */ 7, VALUE_OPT_TIMEOUT,
+ { /* entry idx, value */ 4, VALUE_OPT_TIMEOUT,
+ /* equiv idx, value */ 4, VALUE_OPT_TIMEOUT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ TIMEOUT_FLAGS, 0,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
- | OPTST_ARG_OPTIONAL | OPTST_IMM, 0,
+ /* opt state flags */ OPTST_VERSION_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* desc, NAME, name */ zVersionText, NULL, zVersion_Name,
/* disablement strs */ NULL, NULL },
+
+
{ /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_IMM, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_IMM, 0,
+ /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
- | OPTST_ARG_OPTIONAL, 0,
+ | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
- /* opt state flags */ OPTST_DISABLE_IMM | \
- OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0,
+ /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
+ | OPTST_DISABLE_IMM, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
*/
tSCC zPROGNAME[] = "CLKTEST";
tSCC zUsageTitle[] =
-"clktest - test the clock line discipline - Ver. 4.2.5p20\n\
+"clktest - test the clock line discipline - Ver. 4.2.5p245-RC\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... <tty_device>\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
".",
NULL };
-tSCC zBugsAddr[] = "http://bugs.ntp.isc.org, bugs@ntp.org";
+tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org";
#define zExplain NULL
tSCC zDetail[] = "\n\
Clktest can be used to test the clock line discipline (CLKLDISC,\n\
it must be available), and to take a look at radio clocks attached\n\
to a serial port.\n";
tSCC zFullVersion[] = CLKTEST_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 378 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
+
+#define clktest_full_usage NULL
+#define clktest_short_usage NULL
tOptions clktestOptions = {
OPTIONS_STRUCT_VERSION,
0, NULL, /* original argc + argv */
+ OPTPROC_LONGOPT
+ OPTPROC_NO_REQ_OPT
+ OPTPROC_ENVIRON
- + OPTPROC_ARGS_REQ
- + OPTPROC_HAS_IMMED ),
+ + OPTPROC_ARGS_REQ ),
0, NULL, /* current option index, current option */
NULL, NULL, zPROGNAME,
zRcName, zCopyright, zCopyrightNotice,
/*
* Indexes to special options
*/
- { INDEX_OPT_MORE_HELP,
- INDEX_OPT_SAVE_OPTS,
- NO_EQUIVALENT /* index of '-#' option */,
+ { INDEX_OPT_MORE_HELP, /* more-help option index */
+ INDEX_OPT_SAVE_OPTS, /* save option index */
+ NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
- OPTION_CT, 8 /* user option count */
+ 10 /* full option count */, 5 /* user option count */,
+ clktest_full_usage, clktest_short_usage,
+ NULL, NULL
};
/*
tOptions* pOptions,
tOptDesc* pOptDesc )
{
+ (void)pOptions;
USAGE( EXIT_SUCCESS );
}
-/* * * * * * *
- *
- * For the magic2 option, when CLKLDISC is #define-d.
- */
-#ifdef CLKLDISC
-static void
-doOptMagic2(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
-{
- static const struct {const int rmin, rmax;} rng[ 1 ] = {
- { 0, 255 } };
- int val;
- int ix;
- char const* pzIndent = "\t\t\t\t ";
- extern FILE* option_usage_fp;
-
- if (pOptDesc == NULL) /* usage is requesting range list
- option_usage_fp has already been set */
- goto emit_ranges;
-
- val = atoi( pOptDesc->optArg.argString );
- for (ix = 0; ix < 1; ix++) {
- if (val < rng[ix].rmin)
- continue; /* ranges need not be ordered. */
- if (val == rng[ix].rmin)
- goto valid_return;
- if (rng[ix].rmax == INT_MIN)
- continue;
- if (val <= rng[ix].rmax)
- goto valid_return;
- }
-
- option_usage_fp = stderr;
- fprintf(stderr, _("%s error: %s option value ``%s''is out of range.\n"),
- pOptions->pzProgName, pOptDesc->pz_Name, pOptDesc->optArg.argString);
- pzIndent = "\t";
-
- emit_ranges:
- fprintf( option_usage_fp, _("%sit must lie in the range: %d to %d\n"),
- pzIndent, rng[0].rmin, rng[0].rmax );
- if (pOptDesc == NULL)
- return;
-
- USAGE( EXIT_FAILURE );
- /* NOTREACHED */
- return;
-
- valid_return:
- pOptDesc->optArg.argInt = val;
-}
-#endif /* defined CLKLDISC */
-
-/* * * * * * *
- *
- * For the magic1 option, when CLKLDISC is #define-d.
- */
-#ifdef CLKLDISC
-static void
-doOptMagic1(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
-{
- static const struct {const int rmin, rmax;} rng[ 1 ] = {
- { 0, 255 } };
- int val;
- int ix;
- char const* pzIndent = "\t\t\t\t ";
- extern FILE* option_usage_fp;
-
- if (pOptDesc == NULL) /* usage is requesting range list
- option_usage_fp has already been set */
- goto emit_ranges;
-
- val = atoi( pOptDesc->optArg.argString );
- for (ix = 0; ix < 1; ix++) {
- if (val < rng[ix].rmin)
- continue; /* ranges need not be ordered. */
- if (val == rng[ix].rmin)
- goto valid_return;
- if (rng[ix].rmax == INT_MIN)
- continue;
- if (val <= rng[ix].rmax)
- goto valid_return;
- }
-
- option_usage_fp = stderr;
- fprintf(stderr, _("%s error: %s option value ``%s''is out of range.\n"),
- pOptions->pzProgName, pOptDesc->pz_Name, pOptDesc->optArg.argString);
- pzIndent = "\t";
-
- emit_ranges:
- fprintf( option_usage_fp, _("%sit must lie in the range: %d to %d\n"),
- pzIndent, rng[0].rmin, rng[0].rmax );
- if (pOptDesc == NULL)
- return;
-
- USAGE( EXIT_FAILURE );
- /* NOTREACHED */
- return;
-
- valid_return:
- pOptDesc->optArg.argInt = val;
-}
-#endif /* defined CLKLDISC */
-
-#if ! defined(TEST_CLKTEST_OPTS)
-
-/* * * * * * *
- *
- * For the magic1 option, when STREAM is #define-d.
- */
-#ifdef STREAM
-static void
-doOptMagic1(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
-{
- /* extracted from clktest-opts.def, line 102 */
- unsigned long tmp;
-
- if (!atouint(pOptDesc->pzLastArg, &tmp)) {
- fprintf(stderr, "%s error: not a number: ``%s''\n",
- pOptions->pzProgName, pOptDesc->pzLastArg );
- USAGE( EXIT_FAILURE );
- }
-}
-#endif /* defined STREAM */
-
-#endif /* defined(TEST_CLKTEST_OPTS) */
-
#if ! defined(TEST_CLKTEST_OPTS)
-/* * * * * * *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* For the speed option.
*/
static void
-doOptSpeed(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
+doOptSpeed(tOptions* pOptions, tOptDesc* pOptDesc)
{
- /* extracted from clktest-opts.def, line 125 */
+ /* extracted from clktest-opts.def, line 130 */
/*
* speed table
*/
speed = spd->rate;
}
-
#endif /* defined(TEST_CLKTEST_OPTS) */
#if ! defined(TEST_CLKTEST_OPTS)
-/* * * * * * *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* For the crmod option.
*/
static void
-doOptCrmod(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
+doOptCrmod(tOptions* pOptions, tOptDesc* pOptDesc)
{
- /* extracted from clktest-opts.def, line 179 */
+ /* extracted from clktest-opts.def, line 184 */
ttflags |= CRMOD;
}
-
#endif /* defined(TEST_CLKTEST_OPTS) */
-/* * * * * * *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* For the timeout option.
*/
static void
-doOptTimeout(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
+doOptTimeout(tOptions* pOptions, tOptDesc* pOptDesc)
{
- static const struct {const int rmin, rmax;} rng[ 1 ] = {
+ static const struct {long const rmin, rmax;} rng[1] = {
{ 1, 600 } };
- int val;
- int ix;
- char const* pzIndent = "\t\t\t\t ";
- extern FILE* option_usage_fp;
+ long val;
+ int ix;
+ char * pzEnd;
- if (pOptDesc == NULL) /* usage is requesting range list
- option_usage_fp has already been set */
+ if (pOptions <= OPTPROC_EMIT_LIMIT)
goto emit_ranges;
- val = atoi( pOptDesc->optArg.argString );
+ errno = 0;
+ val = strtol(pOptDesc->optArg.argString, &pzEnd, 0);
+ if ((pOptDesc->optArg.argString == pzEnd) || (errno != 0))
+ goto bad_value;
+
+ if (*pzEnd != '\0')
+ goto bad_value;
for (ix = 0; ix < 1; ix++) {
if (val < rng[ix].rmin)
continue; /* ranges need not be ordered. */
if (val == rng[ix].rmin)
goto valid_return;
- if (rng[ix].rmax == INT_MIN)
+ if (rng[ix].rmax == LONG_MIN)
continue;
if (val <= rng[ix].rmax)
goto valid_return;
}
+ bad_value:
+
option_usage_fp = stderr;
- fprintf(stderr, _("%s error: %s option value ``%s''is out of range.\n"),
- pOptions->pzProgName, pOptDesc->pz_Name, pOptDesc->optArg.argString);
- pzIndent = "\t";
emit_ranges:
- fprintf( option_usage_fp, _("%sit must lie in the range: %d to %d\n"),
- pzIndent, rng[0].rmin, rng[0].rmax );
- if (pOptDesc == NULL)
- return;
-
- USAGE( EXIT_FAILURE );
- /* NOTREACHED */
+ optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
return;
valid_return:
+ if ((pOptDesc->fOptState & OPTST_ALLOC_ARG) != 0) {
+ free((void *)pOptDesc->optArg.argString);
+ pOptDesc->fOptState &= ~OPTST_ALLOC_ARG;
+ }
pOptDesc->optArg.argInt = val;
}
-
-/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
#if defined(TEST_CLKTEST_OPTS) /* TEST MAIN PROCEDURE: */
+extern void optionPutShell( tOptions* );
+
int
-main( int argc, char** argv )
+main(int argc, char** argv)
{
int res = EXIT_SUCCESS;
(void)optionProcess( &clktestOptions, argc, argv );
- {
- void optionPutShell( tOptions* );
- optionPutShell( &clktestOptions );
- }
+ optionPutShell( &clktestOptions );
return res;
}
#endif /* defined TEST_CLKTEST_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
#if ENABLE_NLS
#include <stdio.h>
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct == 0)
- return;
- /*
- * Do the translations. The first pointer follows the field count field.
- * The field count field is the size of a pointer.
- */
- {
- char** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ if (option_usage_text.field_ct != 0) {
+
+ /*
+ * Do the translations. The first pointer follows the field count
+ * field. The field count field is the size of a pointer.
+ */
+ tOptDesc* pOD = clktestOptions.pOptDesc;
+ char** ppz = (char**)(void*)&(option_usage_text);
+ int ix = option_usage_text.field_ct;
do {
ppz++;
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
+
+ COERSION(pzCopyright);
+ COERSION(pzCopyNotice);
+ COERSION(pzFullVersion);
+ COERSION(pzUsageTitle);
+ COERSION(pzExplain);
+ COERSION(pzDetail);
+ option_usage_text.field_ct = 0;
+
+ for (ix = clktestOptions.optCt; ix > 0; ix--, pOD++)
+ coerce_it((void*)&(pOD->pzText));
}
- option_usage_text.field_ct = 0;
- {
+ if ((clktestOptions.fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
tOptDesc* pOD = clktestOptions.pOptDesc;
- int ix = clktestOptions.optCt;
-
- for (;;) {
- pOD->pzText = AO_gettext(pOD->pzText);
- pOD->pz_NAME = AO_gettext(pOD->pz_NAME);
- pOD->pz_Name = AO_gettext(pOD->pz_Name);
- pOD->pz_DisableName = AO_gettext(pOD->pz_DisableName);
- pOD->pz_DisablePfx = AO_gettext(pOD->pz_DisablePfx);
- if (--ix <= 0)
- break;
- pOD++;
+ int ix;
+
+ for (ix = clktestOptions.optCt; ix > 0; ix--, pOD++) {
+ coerce_it((void*)&(pOD->pz_Name));
+ coerce_it((void*)&(pOD->pz_DisableName));
+ coerce_it((void*)&(pOD->pz_DisablePfx));
}
+ /* prevent re-translation */
+ clktestOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
- COERSION(pzCopyright);
- COERSION(pzCopyNotice);
- COERSION(pzFullVersion);
- COERSION(pzUsageTitle);
- COERSION(pzExplain);
- COERSION(pzDetail);
}
#endif /* ENABLE_NLS */
-/* -*- buffer-read-only: t -*- vi: set ro:
+/*
+ * EDIT THIS FILE WITH CAUTION (clktest-opts.h)
*
- * DO NOT EDIT THIS FILE (clktest-opts.h)
- *
- * It has been AutoGen-ed Thursday April 12, 2007 at 02:55:57 AM EDT
+ * It has been AutoGen-ed November 17, 2009 at 06:37:09 AM by AutoGen 5.10
* From the definitions clktest-opts.def
* and the template file options
*
- * Generated from AutoOpts 28:0:3 templates.
+ * Generated from AutoOpts 33:0:8 templates.
*/
/*
*
* This source file is copyrighted and licensed under the following terms:
*
- * clktest copyright 1970-2006 ntp.org - all rights reserved
+ * clktest copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
*
* see html/copyright.html
*/
* "AutoOpts" chapter. Please refer to that doc for usage help.
*/
#ifndef AUTOOPTS_CLKTEST_OPTS_H_GUARD
-#define AUTOOPTS_CLKTEST_OPTS_H_GUARD
+#define AUTOOPTS_CLKTEST_OPTS_H_GUARD 1
#include "config.h"
#include <autoopts/options.h>
* tolerable version is at least as old as what was current when the header
* template was released.
*/
-#define AO_TEMPLATE_VERSION 114688
+#define AO_TEMPLATE_VERSION 135168
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
* Enumeration of each option:
*/
typedef enum {
- INDEX_OPT_MAGIC2 = 0,
- INDEX_OPT_MAGIC1 = 1,
- INDEX_OPT_MAGIC1 = 2,
- INDEX_OPT_SPEED = 3,
- INDEX_OPT_DEBUG = 4,
- INDEX_OPT_CRMOD = 5,
- INDEX_OPT_COMMAND = 6,
- INDEX_OPT_TIMEOUT = 7,
- INDEX_OPT_VERSION = 8,
- INDEX_OPT_HELP = 9,
- INDEX_OPT_MORE_HELP = 10,
- INDEX_OPT_SAVE_OPTS = 11,
- INDEX_OPT_LOAD_OPTS = 12
+ INDEX_OPT_SPEED = 0,
+ INDEX_OPT_DEBUG = 1,
+ INDEX_OPT_CRMOD = 2,
+ INDEX_OPT_COMMAND = 3,
+ INDEX_OPT_TIMEOUT = 4,
+ INDEX_OPT_VERSION = 5,
+ INDEX_OPT_HELP = 6,
+ INDEX_OPT_MORE_HELP = 7,
+ INDEX_OPT_SAVE_OPTS = 8,
+ INDEX_OPT_LOAD_OPTS = 9
} teOptIndex;
-#define OPTION_CT 13
-#define CLKTEST_VERSION "4.2.5p20"
-#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.5p20"
+#define OPTION_CT 10
+#define CLKTEST_VERSION "4.2.5p245-RC"
+#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.5p245-RC"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
* option name (as in the teOptIndex enumeration above).
- * e.g. HAVE_OPT( MAGIC2 )
+ * e.g. HAVE_OPT( SPEED )
*/
#define DESC(n) (clktestOptions.pOptDesc[INDEX_OPT_## n])
#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
DESC(n).fOptState |= OPTST_DISABLED; \
DESC(n).optCookie = NULL )
+/* * * * * *
+ *
+ * Globals exported from the test the clock line discipline option definitions
+ */
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/file.h>
+#include <sgtty.h>
+
+#include "../include/ntp_fp.h"
+#include "../include/ntp.h"
+#include "../include/ntp_unixtime.h"
+
+#ifdef CLKLDISC
+# define DEFMAGIC '\r'
+#endif
+
+#ifdef CLKLDISC
+# ifdef STREAM
+# include <stropts.h>
+# ifdef HAVE_SYS_CLKDEFS_H
+# include <sys/clkdefs.h>
+# endif
+# undef DEFMAGIC
+# define DEFMAGIC "\r"
+# endif
+#endif
+
/*
* Make sure there are no #define name conflicts with the option names
*/
#ifndef NO_OPTION_NAME_WARNINGS
-# ifdef MAGIC2
-# warning undefining MAGIC2 due to option name conflict
-# undef MAGIC2
-# endif
-# ifdef MAGIC1
-# warning undefining MAGIC1 due to option name conflict
-# undef MAGIC1
-# endif
-# ifdef MAGIC1
-# warning undefining MAGIC1 due to option name conflict
-# undef MAGIC1
-# endif
# ifdef SPEED
# warning undefining SPEED due to option name conflict
# undef SPEED
# undef TIMEOUT
# endif
#else /* NO_OPTION_NAME_WARNINGS */
-# undef MAGIC2
-# undef MAGIC1
-# undef MAGIC1
# undef SPEED
# undef DEBUG
# undef CRMOD
# undef TIMEOUT
#endif /* NO_OPTION_NAME_WARNINGS */
-/*
+/* * * * * *
+ *
* Interface defines for specific options.
*/
-#ifdef CLKLDISC
-#define VALUE_OPT_MAGIC2 'a'
-#define OPT_VALUE_MAGIC2 (DESC(MAGIC2).optArg.argInt)
-#endif /* CLKLDISC */
-#ifdef CLKLDISC
-#define VALUE_OPT_MAGIC1 'c'
-#define OPT_VALUE_MAGIC1 (DESC(MAGIC1).optArg.argInt)
-#endif /* CLKLDISC */
-#ifdef STREAM
-#define VALUE_OPT_MAGIC1 'c'
-#endif /* STREAM */
#define VALUE_OPT_SPEED 'b'
#define VALUE_OPT_DEBUG 'd'
#define VALUE_OPT_CRMOD 'f'
#define VALUE_OPT_COMMAND 's'
#define VALUE_OPT_TIMEOUT 't'
-#define OPT_VALUE_TIMEOUT (DESC(TIMEOUT).optArg.argInt)
-#define VALUE_OPT_VERSION 'v'
-#define VALUE_OPT_SAVE_OPTS '>'
-#define VALUE_OPT_LOAD_OPTS '<'
+#define OPT_VALUE_TIMEOUT (DESC(TIMEOUT).optArg.argInt)
#define VALUE_OPT_HELP '?'
#define VALUE_OPT_MORE_HELP '!'
+#define VALUE_OPT_VERSION INDEX_OPT_VERSION
+#define VALUE_OPT_SAVE_OPTS '>'
+#define VALUE_OPT_LOAD_OPTS '<'
#define SET_OPT_SAVE_OPTS(a) STMTS( \
DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \
DESC(SAVE_OPTS).fOptState |= OPTST_SET; \
clktestOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*clktestOptions.pUsageProc)( &clktestOptions, c )
-/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 345 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
/* * * * * *
*
extern tOptions clktestOptions;
-/* * * * * *
- *
- * Globals exported from the test the clock line discipline option definitions
- */
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include <sgtty.h>
-
-#include "../include/ntp_fp.h"
-#include "../include/ntp.h"
-#include "../include/ntp_unixtime.h"
-
-#ifdef CLKLDISC
-# define DEFMAGIC '\r'
-#endif
-
-#ifdef CLKLDISC
-# ifdef STREAM
-# include <stropts.h>
-# ifdef HAVE_SYS_CLKDEFS_H
-# include <sys/clkdefs.h>
-# endif
-# undef DEFMAGIC
-# define DEFMAGIC "\r"
+#if defined(ENABLE_NLS)
+# ifndef _
+# include <stdio.h>
+ static inline char* aoGetsText( char const* pz ) {
+ if (pz == NULL) return NULL;
+ return (char*)gettext( pz );
+ }
+# define _(s) aoGetsText(s)
+# endif /* _() */
+
+# define OPT_NO_XLAT_CFG_NAMES STMTS(clktestOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT_CFG;)
+# define OPT_NO_XLAT_OPT_NAMES STMTS(clktestOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG;)
+
+# define OPT_XLAT_CFG_NAMES STMTS(clktestOptions.fOptSet &= \
+ ~(OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG);)
+# define OPT_XLAT_OPT_NAMES STMTS(clktestOptions.fOptSet &= \
+ ~OPTPROC_NXLAT_OPT;)
+
+#else /* ENABLE_NLS */
+# define OPT_NO_XLAT_CFG_NAMES
+# define OPT_NO_XLAT_OPT_NAMES
+
+# define OPT_XLAT_CFG_NAMES
+# define OPT_XLAT_OPT_NAMES
+
+# ifndef _
+# define _(_s) _s
# endif
-#endif
-
-#ifndef _
-# if ENABLE_NLS
-# include <stdio.h>
- static inline char* aoGetsText( char const* pz ) {
- if (pz == NULL) return NULL;
- return (char*)gettext( pz );
- }
-# define _(s) aoGetsText(s)
-# else /* ENABLE_NLS */
-# define _(s) s
-# endif /* ENABLE_NLS */
-#endif
+#endif /* ENABLE_NLS */
#ifdef __cplusplus
}
*
* DO NOT EDIT THIS FILE (options.h)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:08 AM by AutoGen 5.9.10pre13
* From the definitions funcs.def
* and the template file options_h
*
* values for "opt_name" are available.
*/
-#define OPTIONS_STRUCT_VERSION 131073
-#define OPTIONS_VERSION_STRING "32:1:7"
+#define OPTIONS_STRUCT_VERSION 135168
+#define OPTIONS_VERSION_STRING "33:0:8"
#define OPTIONS_MINIMUM_VERSION 102400
#define OPTIONS_MIN_VER_STRING "25:0:0"
* The usage procedure will never return. It calls "exit(2)"
* with the "exitCode" argument passed to it.
*/
+// coverity[+kill]
typedef void (tUsageProc)(tOptions* pOpts, int exitCode);
typedef tUsageProc* tpUsageProc;
void* pExtensions;
void* pSavedState;
+ // coverity[+kill]
tpUsageProc pUsageProc;
tOptionXlateProc* pTransProc;
extern void optionOnlyUsage(tOptions*, int);
-/* From: autoopts.c line 1041
+/* From: autoopts.c line 1058
*
* optionProcess - this is the main option processing routine
*
extern char const* optionVersion(void);
-/* From: ../compat/pathfind.c line 33
+/* From: ../compat/pathfind.c line 32
*
* pathfind - fild a file in a list of directories
*
*
* DO NOT EDIT THIS FILE (usage-txt.h)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:10 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:07 AM by AutoGen 5.9.10pre13
* From the definitions usage-txt.def
* and the template file usage-txt.tpl
*
* This file handles all the bookkeeping required for tracking all the little
- * tiny strings used by the AutoOpts library. There are 130
+ * tiny strings used by the AutoOpts library. There are 134
* of them. This is not versioned because it is entirely internal to the
* library and accessed by client code only in a very well-controlled way:
* they may substitute translated strings using a procedure that steps through
char* utpz_GnuTimeArg;
char* utpz_GnuNumArg;
char* utpz_GnuStrArg;
- cch_t* apz_str[ 123 ];
+ cch_t* apz_str[ 127 ];
} usage_text_t;
/*
#define zAO_Sml (option_usage_text.apz_str[ 3])
#define zAO_Ver (option_usage_text.apz_str[ 4])
#define zAO_Woops (option_usage_text.apz_str[ 5])
-#define zAll (option_usage_text.apz_str[ 6])
-#define zAlt (option_usage_text.apz_str[ 7])
-#define zAmbigKey (option_usage_text.apz_str[ 8])
-#define zAmbigOptStr (option_usage_text.apz_str[ 9])
-#define zArgsMust (option_usage_text.apz_str[ 10])
-#define zAtMost (option_usage_text.apz_str[ 11])
-#define zAuto (option_usage_text.apz_str[ 12])
-#define zBadPipe (option_usage_text.apz_str[ 13])
-#define zBadVerArg (option_usage_text.apz_str[ 14])
-#define zCantFmt (option_usage_text.apz_str[ 15])
-#define zCantSave (option_usage_text.apz_str[ 16])
-#define zDefaultOpt (option_usage_text.apz_str[ 17])
-#define zDis (option_usage_text.apz_str[ 18])
-#define zEnab (option_usage_text.apz_str[ 19])
-#define zEquiv (option_usage_text.apz_str[ 20])
-#define zErrOnly (option_usage_text.apz_str[ 21])
-#define zExamineFmt (option_usage_text.apz_str[ 22])
-#define zFiveSpaces (option_usage_text.apz_str[ 23])
-#define zFlagOkay (option_usage_text.apz_str[ 24])
-#define zFmtFmt (option_usage_text.apz_str[ 25])
-#define zForkFail (option_usage_text.apz_str[ 26])
-#define zFSErrOptLoad (option_usage_text.apz_str[ 27])
-#define zFSErrReadFile (option_usage_text.apz_str[ 28])
-#define zFSOptError (option_usage_text.apz_str[ 29])
-#define zFSOptErrMayExist (option_usage_text.apz_str[ 30])
-#define zFSOptErrMustExist (option_usage_text.apz_str[ 31])
-#define zFSOptErrNoExist (option_usage_text.apz_str[ 32])
-#define zFSOptErrOpen (option_usage_text.apz_str[ 33])
-#define zFSOptErrFopen (option_usage_text.apz_str[ 34])
-#define zFileCannotExist (option_usage_text.apz_str[ 35])
-#define zFileMustExist (option_usage_text.apz_str[ 36])
-#define zGenshell (option_usage_text.apz_str[ 37])
+#define zAliasRange (option_usage_text.apz_str[ 6])
+#define zAll (option_usage_text.apz_str[ 7])
+#define zAlt (option_usage_text.apz_str[ 8])
+#define zAmbigKey (option_usage_text.apz_str[ 9])
+#define zAmbigOptStr (option_usage_text.apz_str[ 10])
+#define zArgsMust (option_usage_text.apz_str[ 11])
+#define zAtMost (option_usage_text.apz_str[ 12])
+#define zAuto (option_usage_text.apz_str[ 13])
+#define zBadPipe (option_usage_text.apz_str[ 14])
+#define zBadVerArg (option_usage_text.apz_str[ 15])
+#define zCantFmt (option_usage_text.apz_str[ 16])
+#define zCantSave (option_usage_text.apz_str[ 17])
+#define zDefaultOpt (option_usage_text.apz_str[ 18])
+#define zDis (option_usage_text.apz_str[ 19])
+#define zDisabledErr (option_usage_text.apz_str[ 20])
+#define zDisabledOpt (option_usage_text.apz_str[ 21])
+#define zDisabledWhy (option_usage_text.apz_str[ 22])
+#define zEnab (option_usage_text.apz_str[ 23])
+#define zEquiv (option_usage_text.apz_str[ 24])
+#define zErrOnly (option_usage_text.apz_str[ 25])
+#define zExamineFmt (option_usage_text.apz_str[ 26])
+#define zFiveSpaces (option_usage_text.apz_str[ 27])
+#define zFlagOkay (option_usage_text.apz_str[ 28])
+#define zFmtFmt (option_usage_text.apz_str[ 29])
+#define zForkFail (option_usage_text.apz_str[ 30])
+#define zFSErrOptLoad (option_usage_text.apz_str[ 31])
+#define zFSErrReadFile (option_usage_text.apz_str[ 32])
+#define zFSOptError (option_usage_text.apz_str[ 33])
+#define zFSOptErrMayExist (option_usage_text.apz_str[ 34])
+#define zFSOptErrMustExist (option_usage_text.apz_str[ 35])
+#define zFSOptErrNoExist (option_usage_text.apz_str[ 36])
+#define zFSOptErrOpen (option_usage_text.apz_str[ 37])
+#define zFSOptErrFopen (option_usage_text.apz_str[ 38])
+#define zFileCannotExist (option_usage_text.apz_str[ 39])
+#define zFileMustExist (option_usage_text.apz_str[ 40])
+#define zGenshell (option_usage_text.apz_str[ 41])
#define zGnuBoolArg (option_usage_text.utpz_GnuBoolArg)
-#define zGnuBreak (option_usage_text.apz_str[ 38])
+#define zGnuBreak (option_usage_text.apz_str[ 42])
#define zGnuKeyArg (option_usage_text.utpz_GnuKeyArg)
#define zGnuFileArg (option_usage_text.utpz_GnuFileArg)
#define zGnuKeyLArg (option_usage_text.utpz_GnuKeyLArg)
#define zGnuTimeArg (option_usage_text.utpz_GnuTimeArg)
-#define zGnuNestArg (option_usage_text.apz_str[ 39])
+#define zGnuNestArg (option_usage_text.apz_str[ 43])
#define zGnuNumArg (option_usage_text.utpz_GnuNumArg)
-#define zGnuOptArg (option_usage_text.apz_str[ 40])
-#define zGnuOptFmt (option_usage_text.apz_str[ 41])
+#define zGnuOptArg (option_usage_text.apz_str[ 44])
+#define zGnuOptFmt (option_usage_text.apz_str[ 45])
#define zGnuStrArg (option_usage_text.utpz_GnuStrArg)
-#define zIllOptChr (option_usage_text.apz_str[ 42])
-#define zIllOptStr (option_usage_text.apz_str[ 43])
-#define zIllegal (option_usage_text.apz_str[ 44])
-#define zIntRange (option_usage_text.apz_str[ 45])
-#define zInvalOptDesc (option_usage_text.apz_str[ 46])
-#define zLowerBits (option_usage_text.apz_str[ 47])
-#define zMembers (option_usage_text.apz_str[ 48])
-#define zMisArg (option_usage_text.apz_str[ 49])
-#define zMultiEquiv (option_usage_text.apz_str[ 50])
-#define zMust (option_usage_text.apz_str[ 51])
-#define zNeedOne (option_usage_text.apz_str[ 52])
-#define zNoArg (option_usage_text.apz_str[ 53])
-#define zNoArgs (option_usage_text.apz_str[ 54])
-#define zNoCreat (option_usage_text.apz_str[ 55])
-#define zNoFlags (option_usage_text.apz_str[ 56])
-#define zNoKey (option_usage_text.apz_str[ 57])
-#define zNoLim (option_usage_text.apz_str[ 58])
-#define zNoPreset (option_usage_text.apz_str[ 59])
-#define zNoResetArg (option_usage_text.apz_str[ 60])
-#define zNoRq_NoShrtTtl (option_usage_text.apz_str[ 61])
-#define zNoRq_ShrtTtl (option_usage_text.apz_str[ 62])
-#define zNoStat (option_usage_text.apz_str[ 63])
-#define zNoState (option_usage_text.apz_str[ 64])
-#define zNone (option_usage_text.apz_str[ 65])
-#define zNotDef (option_usage_text.apz_str[ 66])
-#define zNotCmdOpt (option_usage_text.apz_str[ 67])
-#define zNotEnough (option_usage_text.apz_str[ 68])
-#define zNotFile (option_usage_text.apz_str[ 69])
-#define zNotNumber (option_usage_text.apz_str[ 70])
-#define zNrmOptFmt (option_usage_text.apz_str[ 71])
-#define zNumberOpt (option_usage_text.apz_str[ 72])
-#define zOneSpace (option_usage_text.apz_str[ 73])
-#define zOnlyOne (option_usage_text.apz_str[ 74])
-#define zOptsOnly (option_usage_text.apz_str[ 75])
-#define zPathFmt (option_usage_text.apz_str[ 76])
-#define zPlsSendBugs (option_usage_text.apz_str[ 77])
-#define zPreset (option_usage_text.apz_str[ 78])
-#define zPresetFile (option_usage_text.apz_str[ 79])
-#define zPresetIntro (option_usage_text.apz_str[ 80])
-#define zProg (option_usage_text.apz_str[ 81])
-#define zProhib (option_usage_text.apz_str[ 82])
-#define zReorder (option_usage_text.apz_str[ 83])
-#define zRange (option_usage_text.apz_str[ 84])
-#define zRangeAbove (option_usage_text.apz_str[ 85])
-#define zRangeLie (option_usage_text.apz_str[ 86])
-#define zRangeBadLie (option_usage_text.apz_str[ 87])
-#define zRangeOnly (option_usage_text.apz_str[ 88])
-#define zRangeOr (option_usage_text.apz_str[ 89])
-#define zRangeErr (option_usage_text.apz_str[ 90])
-#define zRangeExact (option_usage_text.apz_str[ 91])
-#define zRangeScaled (option_usage_text.apz_str[ 92])
-#define zRangeUpto (option_usage_text.apz_str[ 93])
-#define zResetNotConfig (option_usage_text.apz_str[ 94])
-#define zReqFmt (option_usage_text.apz_str[ 95])
-#define zReqOptFmt (option_usage_text.apz_str[ 96])
-#define zReqThese (option_usage_text.apz_str[ 97])
-#define zReq_NoShrtTtl (option_usage_text.apz_str[ 98])
-#define zReq_ShrtTtl (option_usage_text.apz_str[ 99])
-#define zSepChars (option_usage_text.apz_str[100])
-#define zSetMemberSettings (option_usage_text.apz_str[101])
-#define zShrtGnuOptFmt (option_usage_text.apz_str[102])
-#define zSixSpaces (option_usage_text.apz_str[103])
-#define zStdBoolArg (option_usage_text.apz_str[104])
-#define zStdBreak (option_usage_text.apz_str[105])
-#define zStdFileArg (option_usage_text.apz_str[106])
-#define zStdKeyArg (option_usage_text.apz_str[107])
-#define zStdKeyLArg (option_usage_text.apz_str[108])
-#define zStdTimeArg (option_usage_text.apz_str[109])
-#define zStdNestArg (option_usage_text.apz_str[110])
-#define zStdNoArg (option_usage_text.apz_str[111])
-#define zStdNumArg (option_usage_text.apz_str[112])
-#define zStdOptArg (option_usage_text.apz_str[113])
-#define zStdReqArg (option_usage_text.apz_str[114])
-#define zStdStrArg (option_usage_text.apz_str[115])
-#define zTabHyp (option_usage_text.apz_str[116])
-#define zTabHypAnd (option_usage_text.apz_str[117])
-#define zTabout (option_usage_text.apz_str[118])
-#define zThreeSpaces (option_usage_text.apz_str[119])
-#define zTwoSpaces (option_usage_text.apz_str[120])
-#define zUpTo (option_usage_text.apz_str[121])
-#define zValidKeys (option_usage_text.apz_str[122])
+#define zIllOptChr (option_usage_text.apz_str[ 46])
+#define zIllOptStr (option_usage_text.apz_str[ 47])
+#define zIllegal (option_usage_text.apz_str[ 48])
+#define zIntRange (option_usage_text.apz_str[ 49])
+#define zInvalOptDesc (option_usage_text.apz_str[ 50])
+#define zLowerBits (option_usage_text.apz_str[ 51])
+#define zMembers (option_usage_text.apz_str[ 52])
+#define zMisArg (option_usage_text.apz_str[ 53])
+#define zMultiEquiv (option_usage_text.apz_str[ 54])
+#define zMust (option_usage_text.apz_str[ 55])
+#define zNeedOne (option_usage_text.apz_str[ 56])
+#define zNoArg (option_usage_text.apz_str[ 57])
+#define zNoArgs (option_usage_text.apz_str[ 58])
+#define zNoCreat (option_usage_text.apz_str[ 59])
+#define zNoFlags (option_usage_text.apz_str[ 60])
+#define zNoKey (option_usage_text.apz_str[ 61])
+#define zNoLim (option_usage_text.apz_str[ 62])
+#define zNoPreset (option_usage_text.apz_str[ 63])
+#define zNoResetArg (option_usage_text.apz_str[ 64])
+#define zNoRq_NoShrtTtl (option_usage_text.apz_str[ 65])
+#define zNoRq_ShrtTtl (option_usage_text.apz_str[ 66])
+#define zNoStat (option_usage_text.apz_str[ 67])
+#define zNoState (option_usage_text.apz_str[ 68])
+#define zNone (option_usage_text.apz_str[ 69])
+#define zNotDef (option_usage_text.apz_str[ 70])
+#define zNotCmdOpt (option_usage_text.apz_str[ 71])
+#define zNotEnough (option_usage_text.apz_str[ 72])
+#define zNotFile (option_usage_text.apz_str[ 73])
+#define zNotNumber (option_usage_text.apz_str[ 74])
+#define zNrmOptFmt (option_usage_text.apz_str[ 75])
+#define zNumberOpt (option_usage_text.apz_str[ 76])
+#define zOneSpace (option_usage_text.apz_str[ 77])
+#define zOnlyOne (option_usage_text.apz_str[ 78])
+#define zOptsOnly (option_usage_text.apz_str[ 79])
+#define zPathFmt (option_usage_text.apz_str[ 80])
+#define zPlsSendBugs (option_usage_text.apz_str[ 81])
+#define zPreset (option_usage_text.apz_str[ 82])
+#define zPresetFile (option_usage_text.apz_str[ 83])
+#define zPresetIntro (option_usage_text.apz_str[ 84])
+#define zProg (option_usage_text.apz_str[ 85])
+#define zProhib (option_usage_text.apz_str[ 86])
+#define zReorder (option_usage_text.apz_str[ 87])
+#define zRange (option_usage_text.apz_str[ 88])
+#define zRangeAbove (option_usage_text.apz_str[ 89])
+#define zRangeLie (option_usage_text.apz_str[ 90])
+#define zRangeBadLie (option_usage_text.apz_str[ 91])
+#define zRangeOnly (option_usage_text.apz_str[ 92])
+#define zRangeOr (option_usage_text.apz_str[ 93])
+#define zRangeErr (option_usage_text.apz_str[ 94])
+#define zRangeExact (option_usage_text.apz_str[ 95])
+#define zRangeScaled (option_usage_text.apz_str[ 96])
+#define zRangeUpto (option_usage_text.apz_str[ 97])
+#define zResetNotConfig (option_usage_text.apz_str[ 98])
+#define zReqFmt (option_usage_text.apz_str[ 99])
+#define zReqOptFmt (option_usage_text.apz_str[100])
+#define zReqThese (option_usage_text.apz_str[101])
+#define zReq_NoShrtTtl (option_usage_text.apz_str[102])
+#define zReq_ShrtTtl (option_usage_text.apz_str[103])
+#define zSepChars (option_usage_text.apz_str[104])
+#define zSetMemberSettings (option_usage_text.apz_str[105])
+#define zShrtGnuOptFmt (option_usage_text.apz_str[106])
+#define zSixSpaces (option_usage_text.apz_str[107])
+#define zStdBoolArg (option_usage_text.apz_str[108])
+#define zStdBreak (option_usage_text.apz_str[109])
+#define zStdFileArg (option_usage_text.apz_str[110])
+#define zStdKeyArg (option_usage_text.apz_str[111])
+#define zStdKeyLArg (option_usage_text.apz_str[112])
+#define zStdTimeArg (option_usage_text.apz_str[113])
+#define zStdNestArg (option_usage_text.apz_str[114])
+#define zStdNoArg (option_usage_text.apz_str[115])
+#define zStdNumArg (option_usage_text.apz_str[116])
+#define zStdOptArg (option_usage_text.apz_str[117])
+#define zStdReqArg (option_usage_text.apz_str[118])
+#define zStdStrArg (option_usage_text.apz_str[119])
+#define zTabHyp (option_usage_text.apz_str[120])
+#define zTabHypAnd (option_usage_text.apz_str[121])
+#define zTabout (option_usage_text.apz_str[122])
+#define zThreeSpaces (option_usage_text.apz_str[123])
+#define zTwoSpaces (option_usage_text.apz_str[124])
+#define zUpTo (option_usage_text.apz_str[125])
+#define zValidKeys (option_usage_text.apz_str[126])
/*
* First, set up the strings. Some of these are writable. These are all in
static char eng_zGnuTimeArg[] = "=Tim";
static char eng_zGnuNumArg[] = "=num";
static char eng_zGnuStrArg[] = "=str";
-static char const usage_txt[4024] =
+static char const usage_txt[4159] =
"AutoOpts function called without option descriptor\n\0"
"\tThis exceeds the compiled library version: \0"
"Automated Options Processing Error!\n"
"Automated Options version %s\n"
"\tcopyright (c) 1999-2009 by Bruce Korb - all rights reserved\n\0"
"AutoOpts lib error: defaulted to option with optional arg\n\0"
+ "(AutoOpts bug): Aliasing option is out of range.\0"
"all\0"
"\t\t\t\t- an alternate for %s\n\0"
"%s error: the keyword `%s' is ambiguous for %s\n\0"
"%s(optionSaveState): error: cannot allocate %d bytes\n\0"
"\t\t\t\t- default option for unnamed options\n\0"
"\t\t\t\t- disabled as --%s\n\0"
+ "%s: The ``%s'' option has been disabled\0"
+ " --- %-14s %s\n\0"
+ "This option has been disabled\0"
"\t\t\t\t- enabled by default\n\0"
"-equivalence\0"
"ERROR: only \0"
* Aren't you glad you don't maintain this by hand?
*/
usage_text_t option_usage_text = {
- 130,
+ 134,
eng_zGnuBoolArg, eng_zGnuKeyArg, eng_zGnuFileArg, eng_zGnuKeyLArg,
eng_zGnuTimeArg, eng_zGnuNumArg, eng_zGnuStrArg,
{
usage_txt + 0, usage_txt + 52, usage_txt + 98, usage_txt + 197,
- usage_txt + 247, usage_txt + 338, usage_txt + 397, usage_txt + 401,
- usage_txt + 428, usage_txt + 477, usage_txt + 505, usage_txt + 542,
- usage_txt + 567, usage_txt + 593, usage_txt + 633, usage_txt + 770,
- usage_txt + 818, usage_txt + 872, usage_txt + 914, usage_txt + 938,
- usage_txt + 964, usage_txt + 977, usage_txt + 991, usage_txt +1038,
- usage_txt +1044, usage_txt +1147, usage_txt +1159, usage_txt +1210,
- usage_txt +1261, usage_txt +1295, usage_txt +1336, usage_txt +1359,
- usage_txt +1385, usage_txt +1416, usage_txt +1430, usage_txt +1445,
- usage_txt +1476, usage_txt +1503, usage_txt +1609, usage_txt +1615,
- usage_txt +1621, usage_txt +1628, usage_txt +1639, usage_txt +1665,
- usage_txt +1691, usage_txt +1699, usage_txt +1735, usage_txt +1786,
- usage_txt +1842, usage_txt +1876, usage_txt +1914, usage_txt +1979,
- usage_txt +2022, usage_txt +2057, usage_txt +2098, usage_txt +2138,
- usage_txt +2165, usage_txt +2232, usage_txt +2280, usage_txt +2313,
- usage_txt +2338, usage_txt +2386, usage_txt +2421, usage_txt +2459,
- usage_txt +2486, usage_txt +2535, usage_txt +2540, usage_txt +2558,
- usage_txt +2593, usage_txt +2637, usage_txt +2691, usage_txt +2737,
- usage_txt +2745, usage_txt +2793, usage_txt +2795, usage_txt +2820,
- usage_txt +2854, usage_txt +2873, usage_txt +2907, usage_txt +2943,
- usage_txt +2981, usage_txt +3037, usage_txt +3045, usage_txt +3071,
- usage_txt +3137, usage_txt +3150, usage_txt +3181, usage_txt +3218,
- usage_txt +3264, usage_txt +3280, usage_txt +3286, usage_txt +3338,
- usage_txt +3352, usage_txt +3398, usage_txt +3426, usage_txt +3471,
- usage_txt +3513, usage_txt +3527, usage_txt +3552, usage_txt +3592,
- usage_txt +3635, usage_txt +3639, usage_txt +3858, usage_txt +3861,
- usage_txt +3868, usage_txt +3872, usage_txt +3880, usage_txt +3884,
- usage_txt +3888, usage_txt +3892, usage_txt +3896, usage_txt +3900,
- usage_txt +3904, usage_txt +3908, usage_txt +3912, usage_txt +3916,
- usage_txt +3920, usage_txt +3927, usage_txt +3939, usage_txt +3947,
- usage_txt +3951, usage_txt +3954, usage_txt +3987
+ usage_txt + 247, usage_txt + 338, usage_txt + 397, usage_txt + 447,
+ usage_txt + 451, usage_txt + 478, usage_txt + 527, usage_txt + 555,
+ usage_txt + 592, usage_txt + 617, usage_txt + 643, usage_txt + 683,
+ usage_txt + 820, usage_txt + 868, usage_txt + 922, usage_txt + 964,
+ usage_txt + 988, usage_txt +1028, usage_txt +1043, usage_txt +1073,
+ usage_txt +1099, usage_txt +1112, usage_txt +1126, usage_txt +1173,
+ usage_txt +1179, usage_txt +1282, usage_txt +1294, usage_txt +1345,
+ usage_txt +1396, usage_txt +1430, usage_txt +1471, usage_txt +1494,
+ usage_txt +1520, usage_txt +1551, usage_txt +1565, usage_txt +1580,
+ usage_txt +1611, usage_txt +1638, usage_txt +1744, usage_txt +1750,
+ usage_txt +1756, usage_txt +1763, usage_txt +1774, usage_txt +1800,
+ usage_txt +1826, usage_txt +1834, usage_txt +1870, usage_txt +1921,
+ usage_txt +1977, usage_txt +2011, usage_txt +2049, usage_txt +2114,
+ usage_txt +2157, usage_txt +2192, usage_txt +2233, usage_txt +2273,
+ usage_txt +2300, usage_txt +2367, usage_txt +2415, usage_txt +2448,
+ usage_txt +2473, usage_txt +2521, usage_txt +2556, usage_txt +2594,
+ usage_txt +2621, usage_txt +2670, usage_txt +2675, usage_txt +2693,
+ usage_txt +2728, usage_txt +2772, usage_txt +2826, usage_txt +2872,
+ usage_txt +2880, usage_txt +2928, usage_txt +2930, usage_txt +2955,
+ usage_txt +2989, usage_txt +3008, usage_txt +3042, usage_txt +3078,
+ usage_txt +3116, usage_txt +3172, usage_txt +3180, usage_txt +3206,
+ usage_txt +3272, usage_txt +3285, usage_txt +3316, usage_txt +3353,
+ usage_txt +3399, usage_txt +3415, usage_txt +3421, usage_txt +3473,
+ usage_txt +3487, usage_txt +3533, usage_txt +3561, usage_txt +3606,
+ usage_txt +3648, usage_txt +3662, usage_txt +3687, usage_txt +3727,
+ usage_txt +3770, usage_txt +3774, usage_txt +3993, usage_txt +3996,
+ usage_txt +4003, usage_txt +4007, usage_txt +4015, usage_txt +4019,
+ usage_txt +4023, usage_txt +4027, usage_txt +4031, usage_txt +4035,
+ usage_txt +4039, usage_txt +4043, usage_txt +4047, usage_txt +4051,
+ usage_txt +4055, usage_txt +4062, usage_txt +4074, usage_txt +4082,
+ usage_txt +4086, usage_txt +4089, usage_txt +4122
}
};
*
* DO NOT EDIT THIS FILE (genshell.c)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:09 AM by AutoGen 5.9.10pre13
* From the definitions genshell.def
* and the template file options
*
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
+
/*
* Script option description:
*/
/*
* Help/More_Help/Version option descriptions:
*/
-tSCC zHelpText[] = "Display usage information and exit";
+tSCC zHelpText[] = "Display extended usage information and exit";
tSCC zHelp_Name[] = "help";
-tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
+#ifdef HAVE_WORKING_FORK
+#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
tSCC zMore_Help_Name[] = "more-help";
+tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
+#else
+#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zMore_Help_Name NULL
+#define zMore_HelpText NULL
+#endif
+#ifdef NO_OPTIONAL_OPT_ARGS
+# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT
+#else
+# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
+ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
+#endif
+
tSCC zVersionText[] = "Output version information and exit";
tSCC zVersion_Name[] = "version";
/*
/* desc, NAME, name */ zShellText, zShell_NAME, zShell_Name,
/* disablement strs */ zNotShell_Name, zNotShell_Pfx },
-#ifdef NO_OPTIONAL_OPT_ARGS
-# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT
-#else
-# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
- OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
-#endif
-
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ VERSION_OPT_FLAGS, 0,
+ /* opt state flags */ OPTST_VERSION_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* desc, NAME, name */ zVersionText, NULL, zVersion_Name,
/* disablement strs */ NULL, NULL },
-#undef VERSION_OPT_FLAGS
{ /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0,
+ /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
text, the second line of the file through the ending tag will be replaced\n\
by the newly generated text. The first `#!' line will be regenerated.\n";
tSCC zFullVersion[] = GENSHELLOPT_FULL_VERSION;
-/* extracted from optcode.tpl near line 501 */
+/* extracted from optcode.tpl near line 495 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE
(void)pOptions;
USAGE( EXIT_SUCCESS );
}
-/* extracted from optcode.tpl near line 633 */
+/* extracted from optcode.tpl near line 627 */
#if ENABLE_NLS
#include <stdio.h>
*
* DO NOT EDIT THIS FILE (genshell.h)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:09 AM by AutoGen 5.9.10pre13
* From the definitions genshell.def
* and the template file options
*
* tolerable version is at least as old as what was current when the header
* template was released.
*/
-#define AO_TEMPLATE_VERSION 131073
+#define AO_TEMPLATE_VERSION 135168
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
-/* -*- buffer-read-only: t -*- vi: set ro:
+/*
+ * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c)
*
- * DO NOT EDIT THIS FILE (ntpdsim-opts.c)
- *
- * It has been AutoGen-ed Wednesday May 9, 2007 at 07:34:01 AM EDT
+ * It has been AutoGen-ed November 17, 2009 at 06:37:12 AM by AutoGen 5.10
* From the definitions ntpdsim-opts.def
* and the template file options
*
- * Generated from AutoOpts 28:0:3 templates.
+ * Generated from AutoOpts 33:0:8 templates.
*/
/*
*
* This source file is copyrighted and licensed under the following terms:
*
- * ntpdsim copyright 1970-2006 ntp.org - all rights reserved
+ * ntpdsim copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
*
* see html/copyright.html
*/
-
+#include <sys/types.h>
#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
#define OPTION_CODE_COMPILE 1
#include "ntpdsim-opts.h"
#ifdef __cplusplus
extern "C" {
#endif
+
+/* TRANSLATORS: choose the translation for option names wisely because you
+ cannot ever change your mind. */
tSCC zCopyright[] =
- "ntpdsim copyright (c) 1970-2006 ntp.org, all rights reserved";
-tSCC zCopyrightNotice[] =
-
-/* extracted from ../include/copyright.def near line 8 */
+ "ntpdsim copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
+;
+tSCC zCopyrightNotice[24] =
"see html/copyright.html";
+
extern tUsageProc optionUsage;
/*
* global included definitions
*/
#ifdef __windows
- extern int atoi(const char*);
+ extern int atoi(const char *);
#else
# include <stdlib.h>
#endif
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
+
/*
* Ipv4 option description:
*/
tSCC zBcastsync_Name[] = "bcastsync";
#define BCASTSYNC_FLAGS (OPTST_DISABLED)
-/*
- * Simbroadcastdelay option description:
- */
-tSCC zSimbroadcastdelayText[] =
- "Simulator broadcast delay";
-tSCC zSimbroadcastdelay_NAME[] = "SIMBROADCASTDELAY";
-tSCC zSimbroadcastdelay_Name[] = "simbroadcastdelay";
-#define SIMBROADCASTDELAY_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
/*
* Configfile option description:
*/
#define CONFIGFILE_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
- * Phasenoise option description:
- */
-tSCC zPhasenoiseText[] =
- "Phase noise level";
-tSCC zPhasenoise_NAME[] = "PHASENOISE";
-tSCC zPhasenoise_Name[] = "phasenoise";
-#define PHASENOISE_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
/*
* Debug_Level option description:
*/
#define DEBUG_LEVEL_FLAGS (OPTST_DISABLED)
#else /* disable Debug_Level */
-#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT
#define DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
-#define zDebug_LevelText NULL
#define zDebug_Level_NAME NULL
+#define zDebug_LevelText NULL
#define zDebug_Level_Name NULL
#endif /* DEBUG */
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
#else /* disable Set_Debug_Level */
-#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
#define SET_DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
-#define zSet_Debug_LevelText NULL
#define zSet_Debug_Level_NAME NULL
+#define zSet_Debug_LevelText NULL
#define zSet_Debug_Level_Name NULL
#endif /* DEBUG */
tSCC zPanicgate_Name[] = "panicgate";
#define PANICGATE_FLAGS (OPTST_DISABLED)
-/*
- * Simslew option description:
- */
-tSCC zSimslewText[] =
- "Simuator slew";
-tSCC zSimslew_NAME[] = "SIMSLEW";
-tSCC zSimslew_Name[] = "simslew";
-#define SIMSLEW_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
/*
* Jaildir option description:
*/
+#ifdef HAVE_DROPROOT
tSCC zJaildirText[] =
"Jail directory";
tSCC zJaildir_NAME[] = "JAILDIR";
#define JAILDIR_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+#else /* disable Jaildir */
+#define JAILDIR_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zJaildir_NAME NULL
+#define zJaildirText NULL
+#define zJaildir_Name NULL
+#endif /* HAVE_DROPROOT */
+
/*
* Interface option description:
*/
tSCC zInterfaceText[] =
- "Listen on interface";
+ "Listen on an interface name or address";
tSCC zInterface_NAME[] = "INTERFACE";
tSCC zInterface_Name[] = "interface";
#define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \
* Novirtualips option description:
*/
tSCC zNovirtualipsText[] =
- "Do not listen to virtual IPs";
+ "Do not listen to virtual interfaces";
tSCC zNovirtualips_NAME[] = "NOVIRTUALIPS";
tSCC zNovirtualips_Name[] = "novirtualips";
#define NOVIRTUALIPS_FLAGS (OPTST_DISABLED)
#define MODIFYMMTIMER_FLAGS (OPTST_DISABLED)
#else /* disable Modifymmtimer */
-#define VALUE_OPT_MODIFYMMTIMER NO_EQUIVALENT
#define MODIFYMMTIMER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
-#define zModifymmtimerText NULL
#define zModifymmtimer_NAME NULL
+#define zModifymmtimerText NULL
#define zModifymmtimer_Name NULL
#endif /* SYS_WINNT */
tSCC zNice_Name[] = "nice";
#define NICE_FLAGS (OPTST_DISABLED)
-/*
- * Servertime option description:
- */
-tSCC zServertimeText[] =
- "Server time";
-tSCC zServertime_NAME[] = "SERVERTIME";
-tSCC zServertime_Name[] = "servertime";
-#define SERVERTIME_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
/*
* Pidfile option description:
*/
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
/*
- * Updateinterval option description:
+ * Saveconfigquit option description:
*/
-tSCC zUpdateintervalText[] =
- "interval in seconds between scans for new or dropped interfaces";
-tSCC zUpdateinterval_NAME[] = "UPDATEINTERVAL";
-tSCC zUpdateinterval_Name[] = "updateinterval";
-#define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
+#ifdef SAVECONFIG
+tSCC zSaveconfigquitText[] =
+ "Save parsed configuration and quit";
+tSCC zSaveconfigquit_NAME[] = "SAVECONFIGQUIT";
+tSCC zSaveconfigquit_Name[] = "saveconfigquit";
+#define SAVECONFIGQUIT_FLAGS (OPTST_DISABLED \
+ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else /* disable Saveconfigquit */
+#define SAVECONFIGQUIT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSaveconfigquit_NAME NULL
+#define zSaveconfigquitText NULL
+#define zSaveconfigquit_Name NULL
+#endif /* SAVECONFIG */
/*
* Statsdir option description:
#define STATSDIR_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
- * Endsimtime option description:
- */
-tSCC zEndsimtimeText[] =
- "Simulation end time";
-tSCC zEndsimtime_NAME[] = "ENDSIMTIME";
-tSCC zEndsimtime_Name[] = "endsimtime";
-#define ENDSIMTIME_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
/*
* Trustedkey option description:
*/
#define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-/*
- * Freqerr option description:
- */
-tSCC zFreqerrText[] =
- "Simulation frequency error";
-tSCC zFreqerr_NAME[] = "FREQERR";
-tSCC zFreqerr_Name[] = "freqerr";
-#define FREQERR_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-/*
- * Walknoise option description:
- */
-tSCC zWalknoiseText[] =
- "Simulation random walk noise";
-tSCC zWalknoise_NAME[] = "WALKNOISE";
-tSCC zWalknoise_Name[] = "walknoise";
-#define WALKNOISE_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
/*
* User option description:
*/
+#ifdef HAVE_DROPROOT
tSCC zUserText[] =
"Run as userid (or userid:groupid)";
tSCC zUser_NAME[] = "USER";
#define USER_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+#else /* disable User */
+#define USER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zUser_NAME NULL
+#define zUserText NULL
+#define zUser_Name NULL
+#endif /* HAVE_DROPROOT */
+
+/*
+ * Updateinterval option description:
+ */
+tSCC zUpdateintervalText[] =
+ "interval in seconds between scans for new or dropped interfaces";
+tSCC zUpdateinterval_NAME[] = "UPDATEINTERVAL";
+tSCC zUpdateinterval_Name[] = "updateinterval";
+#define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \
+ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
+
/*
* Var option description:
*/
#define SLEW_FLAGS (OPTST_DISABLED)
/*
- * Ndelay option description:
+ * Usepcc option description:
*/
-tSCC zNdelayText[] =
- "Simulation network delay";
-tSCC zNdelay_NAME[] = "NDELAY";
-tSCC zNdelay_Name[] = "ndelay";
-#define NDELAY_FLAGS (OPTST_DISABLED \
- | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+#ifdef SYS_WINNT
+tSCC zUsepccText[] =
+ "Use CPU cycle counter (Windows only)";
+tSCC zUsepcc_NAME[] = "USEPCC";
+tSCC zUsepcc_Name[] = "usepcc";
+#define USEPCC_FLAGS (OPTST_DISABLED)
+
+#else /* disable Usepcc */
+#define USEPCC_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zUsepcc_NAME NULL
+#define zUsepccText NULL
+#define zUsepcc_Name NULL
+#endif /* SYS_WINNT */
/*
- * Pdelay option description:
+ * Pccfreq option description:
*/
-tSCC zPdelayText[] =
- "Simulation processing delay";
-tSCC zPdelay_NAME[] = "PDELAY";
-tSCC zPdelay_Name[] = "pdelay";
-#define PDELAY_FLAGS (OPTST_DISABLED \
+#ifdef SYS_WINNT
+tSCC zPccfreqText[] =
+ "Force CPU cycle counter use (Windows only)";
+tSCC zPccfreq_NAME[] = "PCCFREQ";
+tSCC zPccfreq_Name[] = "pccfreq";
+#define PCCFREQ_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+#else /* disable Pccfreq */
+#define PCCFREQ_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zPccfreq_NAME NULL
+#define zPccfreqText NULL
+#define zPccfreq_Name NULL
+#endif /* SYS_WINNT */
+
/*
* Help/More_Help/Version option descriptions:
*/
-tSCC zHelpText[] = "Display usage information and exit";
-tSCC zHelp_Name[] = "help";
-
-tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
-tSCC zMore_Help_Name[] = "more-help";
-
-tSCC zVersionText[] = "Output version information and exit";
-tSCC zVersion_Name[] = "version";
+tSCC zHelpText[] = "Display extended usage information and exit";
+tSCC zHelp_Name[] = "help";
+#ifdef HAVE_WORKING_FORK
+#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
+tSCC zMore_Help_Name[] = "more-help";
+tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
+#else
+#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zMore_Help_Name NULL
+#define zMore_HelpText NULL
+#endif
+#ifdef NO_OPTIONAL_OPT_ARGS
+# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT
+#else
+# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
+ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
+#endif
-/*
- * Save/Load_Opts option description:
- */
+tSCC zVersionText[] = "Output version information and exit";
+tSCC zVersion_Name[] = "version";
tSCC zSave_OptsText[] = "Save the option state to a config file";
tSCC zSave_Opts_Name[] = "save-opts";
-
tSCC zLoad_OptsText[] = "Load options from a config file";
tSCC zLoad_Opts_NAME[] = "LOAD_OPTS";
-
tSCC zNotLoad_Opts_Name[] = "no-load-opts";
tSCC zNotLoad_Opts_Pfx[] = "no";
#define zLoad_Opts_Name (zNotLoad_Opts_Name + 3)
/* desc, NAME, name */ zBcastsyncText, zBcastsync_NAME, zBcastsync_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 5, VALUE_OPT_SIMBROADCASTDELAY,
- /* equiv idx, value */ 5, VALUE_OPT_SIMBROADCASTDELAY,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ SIMBROADCASTDELAY_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zSimbroadcastdelayText, zSimbroadcastdelay_NAME, zSimbroadcastdelay_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 6, VALUE_OPT_CONFIGFILE,
- /* equiv idx, value */ 6, VALUE_OPT_CONFIGFILE,
+ { /* entry idx, value */ 5, VALUE_OPT_CONFIGFILE,
+ /* equiv idx, value */ 5, VALUE_OPT_CONFIGFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ CONFIGFILE_FLAGS, 0,
/* desc, NAME, name */ zConfigfileText, zConfigfile_NAME, zConfigfile_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 7, VALUE_OPT_PHASENOISE,
- /* equiv idx, value */ 7, VALUE_OPT_PHASENOISE,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ PHASENOISE_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zPhasenoiseText, zPhasenoise_NAME, zPhasenoise_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 8, VALUE_OPT_DEBUG_LEVEL,
- /* equiv idx, value */ 8, VALUE_OPT_DEBUG_LEVEL,
+ { /* entry idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
+ /* equiv idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ DEBUG_LEVEL_FLAGS, 0,
/* desc, NAME, name */ zDebug_LevelText, zDebug_Level_NAME, zDebug_Level_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 9, VALUE_OPT_SET_DEBUG_LEVEL,
- /* equiv idx, value */ 9, VALUE_OPT_SET_DEBUG_LEVEL,
+ { /* entry idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL,
+ /* equiv idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ SET_DEBUG_LEVEL_FLAGS, 0,
/* desc, NAME, name */ zSet_Debug_LevelText, zSet_Debug_Level_NAME, zSet_Debug_Level_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 10, VALUE_OPT_DRIFTFILE,
- /* equiv idx, value */ 10, VALUE_OPT_DRIFTFILE,
+ { /* entry idx, value */ 8, VALUE_OPT_DRIFTFILE,
+ /* equiv idx, value */ 8, VALUE_OPT_DRIFTFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ DRIFTFILE_FLAGS, 0,
/* desc, NAME, name */ zDriftfileText, zDriftfile_NAME, zDriftfile_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 11, VALUE_OPT_PANICGATE,
- /* equiv idx, value */ 11, VALUE_OPT_PANICGATE,
+ { /* entry idx, value */ 9, VALUE_OPT_PANICGATE,
+ /* equiv idx, value */ 9, VALUE_OPT_PANICGATE,
/* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
+ /* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ PANICGATE_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* desc, NAME, name */ zPanicgateText, zPanicgate_NAME, zPanicgate_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 12, VALUE_OPT_SIMSLEW,
- /* equiv idx, value */ 12, VALUE_OPT_SIMSLEW,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ SIMSLEW_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zSimslewText, zSimslew_NAME, zSimslew_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 13, VALUE_OPT_JAILDIR,
- /* equiv idx, value */ 13, VALUE_OPT_JAILDIR,
+ { /* entry idx, value */ 10, VALUE_OPT_JAILDIR,
+ /* equiv idx, value */ 10, VALUE_OPT_JAILDIR,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ JAILDIR_FLAGS, 0,
/* desc, NAME, name */ zJaildirText, zJaildir_NAME, zJaildir_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 14, VALUE_OPT_INTERFACE,
- /* equiv idx, value */ 14, VALUE_OPT_INTERFACE,
+ { /* entry idx, value */ 11, VALUE_OPT_INTERFACE,
+ /* equiv idx, value */ 11, VALUE_OPT_INTERFACE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ INTERFACE_FLAGS, 0,
/* desc, NAME, name */ zInterfaceText, zInterface_NAME, zInterface_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 15, VALUE_OPT_KEYFILE,
- /* equiv idx, value */ 15, VALUE_OPT_KEYFILE,
+ { /* entry idx, value */ 12, VALUE_OPT_KEYFILE,
+ /* equiv idx, value */ 12, VALUE_OPT_KEYFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ KEYFILE_FLAGS, 0,
/* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 16, VALUE_OPT_LOGFILE,
- /* equiv idx, value */ 16, VALUE_OPT_LOGFILE,
+ { /* entry idx, value */ 13, VALUE_OPT_LOGFILE,
+ /* equiv idx, value */ 13, VALUE_OPT_LOGFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ LOGFILE_FLAGS, 0,
/* desc, NAME, name */ zLogfileText, zLogfile_NAME, zLogfile_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 17, VALUE_OPT_NOVIRTUALIPS,
- /* equiv idx, value */ 17, VALUE_OPT_NOVIRTUALIPS,
+ { /* entry idx, value */ 14, VALUE_OPT_NOVIRTUALIPS,
+ /* equiv idx, value */ 14, VALUE_OPT_NOVIRTUALIPS,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ NOVIRTUALIPS_FLAGS, 0,
/* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 18, VALUE_OPT_MODIFYMMTIMER,
- /* equiv idx, value */ 18, VALUE_OPT_MODIFYMMTIMER,
+ { /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
+ /* equiv idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ MODIFYMMTIMER_FLAGS, 0,
/* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 19, VALUE_OPT_NOFORK,
- /* equiv idx, value */ 19, VALUE_OPT_NOFORK,
+ { /* entry idx, value */ 16, VALUE_OPT_NOFORK,
+ /* equiv idx, value */ 16, VALUE_OPT_NOFORK,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ NOFORK_FLAGS, 0,
/* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 20, VALUE_OPT_NICE,
- /* equiv idx, value */ 20, VALUE_OPT_NICE,
+ { /* entry idx, value */ 17, VALUE_OPT_NICE,
+ /* equiv idx, value */ 17, VALUE_OPT_NICE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ NICE_FLAGS, 0,
/* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 21, VALUE_OPT_SERVERTIME,
- /* equiv idx, value */ 21, VALUE_OPT_SERVERTIME,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ SERVERTIME_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zServertimeText, zServertime_NAME, zServertime_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 22, VALUE_OPT_PIDFILE,
- /* equiv idx, value */ 22, VALUE_OPT_PIDFILE,
+ { /* entry idx, value */ 18, VALUE_OPT_PIDFILE,
+ /* equiv idx, value */ 18, VALUE_OPT_PIDFILE,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PIDFILE_FLAGS, 0,
/* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 23, VALUE_OPT_PRIORITY,
- /* equiv idx, value */ 23, VALUE_OPT_PRIORITY,
+ { /* entry idx, value */ 19, VALUE_OPT_PRIORITY,
+ /* equiv idx, value */ 19, VALUE_OPT_PRIORITY,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PRIORITY_FLAGS, 0,
/* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 24, VALUE_OPT_QUIT,
- /* equiv idx, value */ 24, VALUE_OPT_QUIT,
+ { /* entry idx, value */ 20, VALUE_OPT_QUIT,
+ /* equiv idx, value */ 20, VALUE_OPT_QUIT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ QUIT_FLAGS, 0,
/* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 25, VALUE_OPT_PROPAGATIONDELAY,
- /* equiv idx, value */ 25, VALUE_OPT_PROPAGATIONDELAY,
+ { /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
+ /* equiv idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ PROPAGATIONDELAY_FLAGS, 0,
/* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL,
- /* equiv idx, value */ 26, VALUE_OPT_UPDATEINTERVAL,
+ { /* entry idx, value */ 22, VALUE_OPT_SAVECONFIGQUIT,
+ /* equiv idx, value */ 22, VALUE_OPT_SAVECONFIGQUIT,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ UPDATEINTERVAL_FLAGS, 0,
+ /* opt state flags */ SAVECONFIGQUIT_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
- /* option proc */ optionNumericVal,
- /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name,
+ /* option proc */ NULL,
+ /* desc, NAME, name */ zSaveconfigquitText, zSaveconfigquit_NAME, zSaveconfigquit_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 27, VALUE_OPT_STATSDIR,
- /* equiv idx, value */ 27, VALUE_OPT_STATSDIR,
+ { /* entry idx, value */ 23, VALUE_OPT_STATSDIR,
+ /* equiv idx, value */ 23, VALUE_OPT_STATSDIR,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ STATSDIR_FLAGS, 0,
/* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 28, VALUE_OPT_ENDSIMTIME,
- /* equiv idx, value */ 28, VALUE_OPT_ENDSIMTIME,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ ENDSIMTIME_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zEndsimtimeText, zEndsimtime_NAME, zEndsimtime_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 29, VALUE_OPT_TRUSTEDKEY,
- /* equiv idx, value */ 29, VALUE_OPT_TRUSTEDKEY,
+ { /* entry idx, value */ 24, VALUE_OPT_TRUSTEDKEY,
+ /* equiv idx, value */ 24, VALUE_OPT_TRUSTEDKEY,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ TRUSTEDKEY_FLAGS, 0,
/* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 30, VALUE_OPT_FREQERR,
- /* equiv idx, value */ 30, VALUE_OPT_FREQERR,
- /* equivalenced to */ NO_EQUIVALENT,
- /* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ FREQERR_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
- /* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zFreqerrText, zFreqerr_NAME, zFreqerr_Name,
- /* disablement strs */ NULL, NULL },
-
- { /* entry idx, value */ 31, VALUE_OPT_WALKNOISE,
- /* equiv idx, value */ 31, VALUE_OPT_WALKNOISE,
+ { /* entry idx, value */ 25, VALUE_OPT_USER,
+ /* equiv idx, value */ 25, VALUE_OPT_USER,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ WALKNOISE_FLAGS, 0,
+ /* opt state flags */ USER_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* option proc */ NULL,
- /* desc, NAME, name */ zWalknoiseText, zWalknoise_NAME, zWalknoise_Name,
+ /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 32, VALUE_OPT_USER,
- /* equiv idx, value */ 32, VALUE_OPT_USER,
+ { /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL,
+ /* equiv idx, value */ 26, VALUE_OPT_UPDATEINTERVAL,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ USER_FLAGS, 0,
+ /* opt state flags */ UPDATEINTERVAL_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
- /* option proc */ NULL,
- /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name,
+ /* option proc */ optionNumericVal,
+ /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 33, VALUE_OPT_VAR,
- /* equiv idx, value */ 33, VALUE_OPT_VAR,
+ { /* entry idx, value */ 27, VALUE_OPT_VAR,
+ /* equiv idx, value */ 27, VALUE_OPT_VAR,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ VAR_FLAGS, 0,
/* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 34, VALUE_OPT_DVAR,
- /* equiv idx, value */ 34, VALUE_OPT_DVAR,
+ { /* entry idx, value */ 28, VALUE_OPT_DVAR,
+ /* equiv idx, value */ 28, VALUE_OPT_DVAR,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
/* opt state flags */ DVAR_FLAGS, 0,
/* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 35, VALUE_OPT_SLEW,
- /* equiv idx, value */ 35, VALUE_OPT_SLEW,
+ { /* entry idx, value */ 29, VALUE_OPT_SLEW,
+ /* equiv idx, value */ 29, VALUE_OPT_SLEW,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ SLEW_FLAGS, 0,
/* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 36, VALUE_OPT_NDELAY,
- /* equiv idx, value */ 36, VALUE_OPT_NDELAY,
+ { /* entry idx, value */ 30, VALUE_OPT_USEPCC,
+ /* equiv idx, value */ 30, VALUE_OPT_USEPCC,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ NDELAY_FLAGS, 0,
+ /* opt state flags */ USEPCC_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* option proc */ NULL,
- /* desc, NAME, name */ zNdelayText, zNdelay_NAME, zNdelay_Name,
+ /* desc, NAME, name */ zUsepccText, zUsepcc_NAME, zUsepcc_Name,
/* disablement strs */ NULL, NULL },
- { /* entry idx, value */ 37, VALUE_OPT_PDELAY,
- /* equiv idx, value */ 37, VALUE_OPT_PDELAY,
+ { /* entry idx, value */ 31, VALUE_OPT_PCCFREQ,
+ /* equiv idx, value */ 31, VALUE_OPT_PCCFREQ,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ PDELAY_FLAGS, 0,
+ /* opt state flags */ PCCFREQ_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* option proc */ NULL,
- /* desc, NAME, name */ zPdelayText, zPdelay_NAME, zPdelay_Name,
+ /* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_Name,
/* disablement strs */ NULL, NULL },
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
- | OPTST_ARG_OPTIONAL | OPTST_IMM, 0,
+ /* opt state flags */ OPTST_VERSION_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* desc, NAME, name */ zVersionText, NULL, zVersion_Name,
/* disablement strs */ NULL, NULL },
+
+
{ /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_IMM, 0,
+ /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_IMM, 0,
+ /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
- | OPTST_ARG_OPTIONAL, 0,
+ | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
- /* opt state flags */ OPTST_DISABLE_IMM | \
- OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0,
+ /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
+ | OPTST_DISABLE_IMM, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
*/
tSCC zPROGNAME[] = "NTPDSIM";
tSCC zUsageTitle[] =
-"ntpdsim - NTP daemon simulation program - Ver. 4.2.5p29\n\
+"ntpdsim - NTP daemon simulation program - Ver. 4.2.5p245-RC\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
".",
NULL };
-tSCC zBugsAddr[] = "http://bugs.ntp.isc.org, bugs@ntp.org";
+tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org";
#define zExplain NULL
tSCC zDetail[] = "\n\n";
tSCC zFullVersion[] = NTPDSIM_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 378 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
+
+#define ntpdsim_full_usage NULL
+#define ntpdsim_short_usage NULL
tOptions ntpdsimOptions = {
OPTIONS_STRUCT_VERSION,
0, NULL, /* original argc + argv */
+ OPTPROC_LONGOPT
+ OPTPROC_NO_REQ_OPT
+ OPTPROC_ENVIRON
- + OPTPROC_NO_ARGS
- + OPTPROC_HAS_IMMED ),
+ + OPTPROC_NO_ARGS ),
0, NULL, /* current option index, current option */
NULL, NULL, zPROGNAME,
zRcName, zCopyright, zCopyrightNotice,
/*
* Indexes to special options
*/
- { INDEX_OPT_MORE_HELP,
- INDEX_OPT_SAVE_OPTS,
- NO_EQUIVALENT /* index of '-#' option */,
+ { INDEX_OPT_MORE_HELP, /* more-help option index */
+ INDEX_OPT_SAVE_OPTS, /* save option index */
+ NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
- OPTION_CT, 38 /* user option count */
+ 37 /* full option count */, 32 /* user option count */,
+ ntpdsim_full_usage, ntpdsim_short_usage,
+ NULL, NULL
};
/*
tOptions* pOptions,
tOptDesc* pOptDesc )
{
+ (void)pOptions;
USAGE( EXIT_SUCCESS );
}
#if ! defined(TEST_NTPDSIM_OPTS)
-/* * * * * * *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* For the set-debug-level option, when DEBUG is #define-d.
*/
#ifdef DEBUG
static void
-doOptSet_Debug_Level(
- tOptions* pOptions,
- tOptDesc* pOptDesc )
+doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
{
- /* extracted from ../include/debug-opt.def, line 29 */
+ /* extracted from ntpdbase-opts.def, line 98 */
DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
}
#endif /* defined DEBUG */
-
#endif /* defined(TEST_NTPDSIM_OPTS) */
-
-/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */
+/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */
#if defined(TEST_NTPDSIM_OPTS) /* TEST MAIN PROCEDURE: */
+extern void optionPutShell( tOptions* );
+
int
-main( int argc, char** argv )
+main(int argc, char** argv)
{
int res = EXIT_SUCCESS;
(void)optionProcess( &ntpdsimOptions, argc, argv );
- {
- void optionPutShell( tOptions* );
- optionPutShell( &ntpdsimOptions );
- }
+ optionPutShell( &ntpdsimOptions );
return res;
}
#endif /* defined TEST_NTPDSIM_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */
#if ENABLE_NLS
#include <stdio.h>
* Guard against re-translation. It won't work. The strings will have
* been changed by the first pass through this code. One shot only.
*/
- if (option_usage_text.field_ct == 0)
- return;
- /*
- * Do the translations. The first pointer follows the field count field.
- * The field count field is the size of a pointer.
- */
- {
- char** ppz = (char**)(void*)&(option_usage_text);
- int ix = option_usage_text.field_ct;
+ if (option_usage_text.field_ct != 0) {
+
+ /*
+ * Do the translations. The first pointer follows the field count
+ * field. The field count field is the size of a pointer.
+ */
+ tOptDesc* pOD = ntpdsimOptions.pOptDesc;
+ char** ppz = (char**)(void*)&(option_usage_text);
+ int ix = option_usage_text.field_ct;
do {
ppz++;
*ppz = AO_gettext(*ppz);
} while (--ix > 0);
+
+ COERSION(pzCopyright);
+ COERSION(pzCopyNotice);
+ COERSION(pzFullVersion);
+ COERSION(pzUsageTitle);
+ COERSION(pzExplain);
+ COERSION(pzDetail);
+ option_usage_text.field_ct = 0;
+
+ for (ix = ntpdsimOptions.optCt; ix > 0; ix--, pOD++)
+ coerce_it((void*)&(pOD->pzText));
}
- option_usage_text.field_ct = 0;
- {
+ if ((ntpdsimOptions.fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
tOptDesc* pOD = ntpdsimOptions.pOptDesc;
- int ix = ntpdsimOptions.optCt;
-
- for (;;) {
- pOD->pzText = AO_gettext(pOD->pzText);
- pOD->pz_NAME = AO_gettext(pOD->pz_NAME);
- pOD->pz_Name = AO_gettext(pOD->pz_Name);
- pOD->pz_DisableName = AO_gettext(pOD->pz_DisableName);
- pOD->pz_DisablePfx = AO_gettext(pOD->pz_DisablePfx);
- if (--ix <= 0)
- break;
- pOD++;
+ int ix;
+
+ for (ix = ntpdsimOptions.optCt; ix > 0; ix--, pOD++) {
+ coerce_it((void*)&(pOD->pz_Name));
+ coerce_it((void*)&(pOD->pz_DisableName));
+ coerce_it((void*)&(pOD->pz_DisablePfx));
}
+ /* prevent re-translation */
+ ntpdsimOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
- COERSION(pzCopyright);
- COERSION(pzCopyNotice);
- COERSION(pzFullVersion);
- COERSION(pzUsageTitle);
- COERSION(pzExplain);
- COERSION(pzDetail);
}
#endif /* ENABLE_NLS */
-/* -*- buffer-read-only: t -*- vi: set ro:
+/*
+ * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h)
*
- * DO NOT EDIT THIS FILE (ntpdsim-opts.h)
- *
- * It has been AutoGen-ed Wednesday May 9, 2007 at 07:34:00 AM EDT
+ * It has been AutoGen-ed November 17, 2009 at 06:37:12 AM by AutoGen 5.10
* From the definitions ntpdsim-opts.def
* and the template file options
*
- * Generated from AutoOpts 28:0:3 templates.
+ * Generated from AutoOpts 33:0:8 templates.
*/
/*
*
* This source file is copyrighted and licensed under the following terms:
*
- * ntpdsim copyright 1970-2006 ntp.org - all rights reserved
+ * ntpdsim copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved
*
* see html/copyright.html
*/
* "AutoOpts" chapter. Please refer to that doc for usage help.
*/
#ifndef AUTOOPTS_NTPDSIM_OPTS_H_GUARD
-#define AUTOOPTS_NTPDSIM_OPTS_H_GUARD
+#define AUTOOPTS_NTPDSIM_OPTS_H_GUARD 1
#include "config.h"
#include <autoopts/options.h>
* tolerable version is at least as old as what was current when the header
* template was released.
*/
-#define AO_TEMPLATE_VERSION 114688
+#define AO_TEMPLATE_VERSION 135168
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
* Enumeration of each option:
*/
typedef enum {
- INDEX_OPT_IPV4 = 0,
- INDEX_OPT_IPV6 = 1,
- INDEX_OPT_AUTHREQ = 2,
- INDEX_OPT_AUTHNOREQ = 3,
- INDEX_OPT_BCASTSYNC = 4,
- INDEX_OPT_SIMBROADCASTDELAY = 5,
- INDEX_OPT_CONFIGFILE = 6,
- INDEX_OPT_PHASENOISE = 7,
- INDEX_OPT_DEBUG_LEVEL = 8,
- INDEX_OPT_SET_DEBUG_LEVEL = 9,
- INDEX_OPT_DRIFTFILE = 10,
- INDEX_OPT_PANICGATE = 11,
- INDEX_OPT_SIMSLEW = 12,
- INDEX_OPT_JAILDIR = 13,
- INDEX_OPT_INTERFACE = 14,
- INDEX_OPT_KEYFILE = 15,
- INDEX_OPT_LOGFILE = 16,
- INDEX_OPT_NOVIRTUALIPS = 17,
- INDEX_OPT_MODIFYMMTIMER = 18,
- INDEX_OPT_NOFORK = 19,
- INDEX_OPT_NICE = 20,
- INDEX_OPT_SERVERTIME = 21,
- INDEX_OPT_PIDFILE = 22,
- INDEX_OPT_PRIORITY = 23,
- INDEX_OPT_QUIT = 24,
- INDEX_OPT_PROPAGATIONDELAY = 25,
- INDEX_OPT_UPDATEINTERVAL = 26,
- INDEX_OPT_STATSDIR = 27,
- INDEX_OPT_ENDSIMTIME = 28,
- INDEX_OPT_TRUSTEDKEY = 29,
- INDEX_OPT_FREQERR = 30,
- INDEX_OPT_WALKNOISE = 31,
- INDEX_OPT_USER = 32,
- INDEX_OPT_VAR = 33,
- INDEX_OPT_DVAR = 34,
- INDEX_OPT_SLEW = 35,
- INDEX_OPT_NDELAY = 36,
- INDEX_OPT_PDELAY = 37,
- INDEX_OPT_VERSION = 38,
- INDEX_OPT_HELP = 39,
- INDEX_OPT_MORE_HELP = 40,
- INDEX_OPT_SAVE_OPTS = 41,
- INDEX_OPT_LOAD_OPTS = 42
+ INDEX_OPT_IPV4 = 0,
+ INDEX_OPT_IPV6 = 1,
+ INDEX_OPT_AUTHREQ = 2,
+ INDEX_OPT_AUTHNOREQ = 3,
+ INDEX_OPT_BCASTSYNC = 4,
+ INDEX_OPT_CONFIGFILE = 5,
+ INDEX_OPT_DEBUG_LEVEL = 6,
+ INDEX_OPT_SET_DEBUG_LEVEL = 7,
+ INDEX_OPT_DRIFTFILE = 8,
+ INDEX_OPT_PANICGATE = 9,
+ INDEX_OPT_JAILDIR = 10,
+ INDEX_OPT_INTERFACE = 11,
+ INDEX_OPT_KEYFILE = 12,
+ INDEX_OPT_LOGFILE = 13,
+ INDEX_OPT_NOVIRTUALIPS = 14,
+ INDEX_OPT_MODIFYMMTIMER = 15,
+ INDEX_OPT_NOFORK = 16,
+ INDEX_OPT_NICE = 17,
+ INDEX_OPT_PIDFILE = 18,
+ INDEX_OPT_PRIORITY = 19,
+ INDEX_OPT_QUIT = 20,
+ INDEX_OPT_PROPAGATIONDELAY = 21,
+ INDEX_OPT_SAVECONFIGQUIT = 22,
+ INDEX_OPT_STATSDIR = 23,
+ INDEX_OPT_TRUSTEDKEY = 24,
+ INDEX_OPT_USER = 25,
+ INDEX_OPT_UPDATEINTERVAL = 26,
+ INDEX_OPT_VAR = 27,
+ INDEX_OPT_DVAR = 28,
+ INDEX_OPT_SLEW = 29,
+ INDEX_OPT_USEPCC = 30,
+ INDEX_OPT_PCCFREQ = 31,
+ INDEX_OPT_VERSION = 32,
+ INDEX_OPT_HELP = 33,
+ INDEX_OPT_MORE_HELP = 34,
+ INDEX_OPT_SAVE_OPTS = 35,
+ INDEX_OPT_LOAD_OPTS = 36
} teOptIndex;
-#define OPTION_CT 43
-#define NTPDSIM_VERSION "4.2.5p29"
-#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.5p29"
+#define OPTION_CT 37
+#define NTPDSIM_VERSION "4.2.5p245-RC"
+#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.5p245-RC"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
# warning undefining BCASTSYNC due to option name conflict
# undef BCASTSYNC
# endif
-# ifdef SIMBROADCASTDELAY
-# warning undefining SIMBROADCASTDELAY due to option name conflict
-# undef SIMBROADCASTDELAY
-# endif
# ifdef CONFIGFILE
# warning undefining CONFIGFILE due to option name conflict
# undef CONFIGFILE
# endif
-# ifdef PHASENOISE
-# warning undefining PHASENOISE due to option name conflict
-# undef PHASENOISE
-# endif
# ifdef DEBUG_LEVEL
# warning undefining DEBUG_LEVEL due to option name conflict
# undef DEBUG_LEVEL
# warning undefining PANICGATE due to option name conflict
# undef PANICGATE
# endif
-# ifdef SIMSLEW
-# warning undefining SIMSLEW due to option name conflict
-# undef SIMSLEW
-# endif
# ifdef JAILDIR
# warning undefining JAILDIR due to option name conflict
# undef JAILDIR
# warning undefining NICE due to option name conflict
# undef NICE
# endif
-# ifdef SERVERTIME
-# warning undefining SERVERTIME due to option name conflict
-# undef SERVERTIME
-# endif
# ifdef PIDFILE
# warning undefining PIDFILE due to option name conflict
# undef PIDFILE
# warning undefining PROPAGATIONDELAY due to option name conflict
# undef PROPAGATIONDELAY
# endif
-# ifdef UPDATEINTERVAL
-# warning undefining UPDATEINTERVAL due to option name conflict
-# undef UPDATEINTERVAL
+# ifdef SAVECONFIGQUIT
+# warning undefining SAVECONFIGQUIT due to option name conflict
+# undef SAVECONFIGQUIT
# endif
# ifdef STATSDIR
# warning undefining STATSDIR due to option name conflict
# undef STATSDIR
# endif
-# ifdef ENDSIMTIME
-# warning undefining ENDSIMTIME due to option name conflict
-# undef ENDSIMTIME
-# endif
# ifdef TRUSTEDKEY
# warning undefining TRUSTEDKEY due to option name conflict
# undef TRUSTEDKEY
# endif
-# ifdef FREQERR
-# warning undefining FREQERR due to option name conflict
-# undef FREQERR
-# endif
-# ifdef WALKNOISE
-# warning undefining WALKNOISE due to option name conflict
-# undef WALKNOISE
-# endif
# ifdef USER
# warning undefining USER due to option name conflict
# undef USER
# endif
+# ifdef UPDATEINTERVAL
+# warning undefining UPDATEINTERVAL due to option name conflict
+# undef UPDATEINTERVAL
+# endif
# ifdef VAR
# warning undefining VAR due to option name conflict
# undef VAR
# warning undefining SLEW due to option name conflict
# undef SLEW
# endif
-# ifdef NDELAY
-# warning undefining NDELAY due to option name conflict
-# undef NDELAY
+# ifdef USEPCC
+# warning undefining USEPCC due to option name conflict
+# undef USEPCC
# endif
-# ifdef PDELAY
-# warning undefining PDELAY due to option name conflict
-# undef PDELAY
+# ifdef PCCFREQ
+# warning undefining PCCFREQ due to option name conflict
+# undef PCCFREQ
# endif
#else /* NO_OPTION_NAME_WARNINGS */
# undef IPV4
# undef AUTHREQ
# undef AUTHNOREQ
# undef BCASTSYNC
-# undef SIMBROADCASTDELAY
# undef CONFIGFILE
-# undef PHASENOISE
# undef DEBUG_LEVEL
# undef SET_DEBUG_LEVEL
# undef DRIFTFILE
# undef PANICGATE
-# undef SIMSLEW
# undef JAILDIR
# undef INTERFACE
# undef KEYFILE
# undef MODIFYMMTIMER
# undef NOFORK
# undef NICE
-# undef SERVERTIME
# undef PIDFILE
# undef PRIORITY
# undef QUIT
# undef PROPAGATIONDELAY
-# undef UPDATEINTERVAL
+# undef SAVECONFIGQUIT
# undef STATSDIR
-# undef ENDSIMTIME
# undef TRUSTEDKEY
-# undef FREQERR
-# undef WALKNOISE
# undef USER
+# undef UPDATEINTERVAL
# undef VAR
# undef DVAR
# undef SLEW
-# undef NDELAY
-# undef PDELAY
+# undef USEPCC
+# undef PCCFREQ
#endif /* NO_OPTION_NAME_WARNINGS */
-/*
+/* * * * * *
+ *
* Interface defines for specific options.
*/
#define VALUE_OPT_IPV4 '4'
+
#define WHICH_OPT_IPV4 (DESC(IPV4).optActualValue)
#define WHICH_IDX_IPV4 (DESC(IPV4).optActualIndex)
#define VALUE_OPT_IPV6 '6'
#define VALUE_OPT_AUTHREQ 'a'
#define VALUE_OPT_AUTHNOREQ 'A'
#define VALUE_OPT_BCASTSYNC 'b'
-#define VALUE_OPT_SIMBROADCASTDELAY 'B'
#define VALUE_OPT_CONFIGFILE 'c'
-#define VALUE_OPT_PHASENOISE 'C'
-#ifdef DEBUG
#define VALUE_OPT_DEBUG_LEVEL 'd'
-#endif /* DEBUG */
-#ifdef DEBUG
#define VALUE_OPT_SET_DEBUG_LEVEL 'D'
-#endif /* DEBUG */
#define VALUE_OPT_DRIFTFILE 'f'
#define VALUE_OPT_PANICGATE 'g'
-#define VALUE_OPT_SIMSLEW 'H'
#define VALUE_OPT_JAILDIR 'i'
#define VALUE_OPT_INTERFACE 'I'
#define VALUE_OPT_KEYFILE 'k'
#define VALUE_OPT_LOGFILE 'l'
#define VALUE_OPT_NOVIRTUALIPS 'L'
-#ifdef SYS_WINNT
#define VALUE_OPT_MODIFYMMTIMER 'M'
-#endif /* SYS_WINNT */
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_NICE 'N'
-#define VALUE_OPT_SERVERTIME 'O'
#define VALUE_OPT_PIDFILE 'p'
#define VALUE_OPT_PRIORITY 'P'
+
#define OPT_VALUE_PRIORITY (DESC(PRIORITY).optArg.argInt)
#define VALUE_OPT_QUIT 'q'
#define VALUE_OPT_PROPAGATIONDELAY 'r'
-#define VALUE_OPT_UPDATEINTERVAL 'U'
-#define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt)
+#define VALUE_OPT_SAVECONFIGQUIT 22
#define VALUE_OPT_STATSDIR 's'
-#define VALUE_OPT_ENDSIMTIME 'S'
#define VALUE_OPT_TRUSTEDKEY 't'
-#define VALUE_OPT_FREQERR 'T'
-#define VALUE_OPT_WALKNOISE 'W'
#define VALUE_OPT_USER 'u'
-#define VALUE_OPT_VAR 'v'
-#define VALUE_OPT_DVAR 'V'
-#define VALUE_OPT_SLEW 'x'
-#define VALUE_OPT_NDELAY 'Y'
-#define VALUE_OPT_PDELAY 'Z'
+#define VALUE_OPT_UPDATEINTERVAL 'U'
-#define VALUE_OPT_VERSION 'v'
-#define VALUE_OPT_SAVE_OPTS '>'
-#define VALUE_OPT_LOAD_OPTS '<'
+#define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt)
+#define VALUE_OPT_VAR 27
+#define VALUE_OPT_DVAR 28
+#define VALUE_OPT_SLEW 'x'
+#define VALUE_OPT_USEPCC 30
+#define VALUE_OPT_PCCFREQ 31
#define VALUE_OPT_HELP '?'
#define VALUE_OPT_MORE_HELP '!'
+#define VALUE_OPT_VERSION INDEX_OPT_VERSION
+#define VALUE_OPT_SAVE_OPTS '>'
+#define VALUE_OPT_LOAD_OPTS '<'
#define SET_OPT_SAVE_OPTS(a) STMTS( \
DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \
DESC(SAVE_OPTS).fOptState |= OPTST_SET; \
ntpdsimOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ntpdsimOptions.pUsageProc)( &ntpdsimOptions, c )
-/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 345 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
/* * * * * *
*
extern tOptions ntpdsimOptions;
-#ifndef _
-# if ENABLE_NLS
-# include <stdio.h>
- static inline char* aoGetsText( char const* pz ) {
- if (pz == NULL) return NULL;
- return (char*)gettext( pz );
- }
-# define _(s) aoGetsText(s)
-# else /* ENABLE_NLS */
-# define _(s) s
-# endif /* ENABLE_NLS */
-#endif
+#if defined(ENABLE_NLS)
+# ifndef _
+# include <stdio.h>
+ static inline char* aoGetsText( char const* pz ) {
+ if (pz == NULL) return NULL;
+ return (char*)gettext( pz );
+ }
+# define _(s) aoGetsText(s)
+# endif /* _() */
+
+# define OPT_NO_XLAT_CFG_NAMES STMTS(ntpdsimOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT_CFG;)
+# define OPT_NO_XLAT_OPT_NAMES STMTS(ntpdsimOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG;)
+
+# define OPT_XLAT_CFG_NAMES STMTS(ntpdsimOptions.fOptSet &= \
+ ~(OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG);)
+# define OPT_XLAT_OPT_NAMES STMTS(ntpdsimOptions.fOptSet &= \
+ ~OPTPROC_NXLAT_OPT;)
+
+#else /* ENABLE_NLS */
+# define OPT_NO_XLAT_CFG_NAMES
+# define OPT_NO_XLAT_OPT_NAMES
+
+# define OPT_XLAT_CFG_NAMES
+# define OPT_XLAT_OPT_NAMES
+
+# ifndef _
+# define _(_s) _s
+# endif
+#endif /* ENABLE_NLS */
#ifdef __cplusplus
}
*
* DO NOT EDIT THIS FILE (options.h)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:08 AM by AutoGen 5.9.10pre13
* From the definitions funcs.def
* and the template file options_h
*
* values for "opt_name" are available.
*/
-#define OPTIONS_STRUCT_VERSION 131073
-#define OPTIONS_VERSION_STRING "32:1:7"
+#define OPTIONS_STRUCT_VERSION 135168
+#define OPTIONS_VERSION_STRING "33:0:8"
#define OPTIONS_MINIMUM_VERSION 102400
#define OPTIONS_MIN_VER_STRING "25:0:0"
* The usage procedure will never return. It calls "exit(2)"
* with the "exitCode" argument passed to it.
*/
+// coverity[+kill]
typedef void (tUsageProc)(tOptions* pOpts, int exitCode);
typedef tUsageProc* tpUsageProc;
void* pExtensions;
void* pSavedState;
+ // coverity[+kill]
tpUsageProc pUsageProc;
tOptionXlateProc* pTransProc;
extern void optionOnlyUsage(tOptions*, int);
-/* From: autoopts.c line 1041
+/* From: autoopts.c line 1058
*
* optionProcess - this is the main option processing routine
*
extern char const* optionVersion(void);
-/* From: ../compat/pathfind.c line 33
+/* From: ../compat/pathfind.c line 32
*
* pathfind - fild a file in a list of directories
*
*
* DO NOT EDIT THIS FILE (usage-txt.h)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:10 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:07 AM by AutoGen 5.9.10pre13
* From the definitions usage-txt.def
* and the template file usage-txt.tpl
*
* This file handles all the bookkeeping required for tracking all the little
- * tiny strings used by the AutoOpts library. There are 130
+ * tiny strings used by the AutoOpts library. There are 134
* of them. This is not versioned because it is entirely internal to the
* library and accessed by client code only in a very well-controlled way:
* they may substitute translated strings using a procedure that steps through
char* utpz_GnuTimeArg;
char* utpz_GnuNumArg;
char* utpz_GnuStrArg;
- cch_t* apz_str[ 123 ];
+ cch_t* apz_str[ 127 ];
} usage_text_t;
/*
#define zAO_Sml (option_usage_text.apz_str[ 3])
#define zAO_Ver (option_usage_text.apz_str[ 4])
#define zAO_Woops (option_usage_text.apz_str[ 5])
-#define zAll (option_usage_text.apz_str[ 6])
-#define zAlt (option_usage_text.apz_str[ 7])
-#define zAmbigKey (option_usage_text.apz_str[ 8])
-#define zAmbigOptStr (option_usage_text.apz_str[ 9])
-#define zArgsMust (option_usage_text.apz_str[ 10])
-#define zAtMost (option_usage_text.apz_str[ 11])
-#define zAuto (option_usage_text.apz_str[ 12])
-#define zBadPipe (option_usage_text.apz_str[ 13])
-#define zBadVerArg (option_usage_text.apz_str[ 14])
-#define zCantFmt (option_usage_text.apz_str[ 15])
-#define zCantSave (option_usage_text.apz_str[ 16])
-#define zDefaultOpt (option_usage_text.apz_str[ 17])
-#define zDis (option_usage_text.apz_str[ 18])
-#define zEnab (option_usage_text.apz_str[ 19])
-#define zEquiv (option_usage_text.apz_str[ 20])
-#define zErrOnly (option_usage_text.apz_str[ 21])
-#define zExamineFmt (option_usage_text.apz_str[ 22])
-#define zFiveSpaces (option_usage_text.apz_str[ 23])
-#define zFlagOkay (option_usage_text.apz_str[ 24])
-#define zFmtFmt (option_usage_text.apz_str[ 25])
-#define zForkFail (option_usage_text.apz_str[ 26])
-#define zFSErrOptLoad (option_usage_text.apz_str[ 27])
-#define zFSErrReadFile (option_usage_text.apz_str[ 28])
-#define zFSOptError (option_usage_text.apz_str[ 29])
-#define zFSOptErrMayExist (option_usage_text.apz_str[ 30])
-#define zFSOptErrMustExist (option_usage_text.apz_str[ 31])
-#define zFSOptErrNoExist (option_usage_text.apz_str[ 32])
-#define zFSOptErrOpen (option_usage_text.apz_str[ 33])
-#define zFSOptErrFopen (option_usage_text.apz_str[ 34])
-#define zFileCannotExist (option_usage_text.apz_str[ 35])
-#define zFileMustExist (option_usage_text.apz_str[ 36])
-#define zGenshell (option_usage_text.apz_str[ 37])
+#define zAliasRange (option_usage_text.apz_str[ 6])
+#define zAll (option_usage_text.apz_str[ 7])
+#define zAlt (option_usage_text.apz_str[ 8])
+#define zAmbigKey (option_usage_text.apz_str[ 9])
+#define zAmbigOptStr (option_usage_text.apz_str[ 10])
+#define zArgsMust (option_usage_text.apz_str[ 11])
+#define zAtMost (option_usage_text.apz_str[ 12])
+#define zAuto (option_usage_text.apz_str[ 13])
+#define zBadPipe (option_usage_text.apz_str[ 14])
+#define zBadVerArg (option_usage_text.apz_str[ 15])
+#define zCantFmt (option_usage_text.apz_str[ 16])
+#define zCantSave (option_usage_text.apz_str[ 17])
+#define zDefaultOpt (option_usage_text.apz_str[ 18])
+#define zDis (option_usage_text.apz_str[ 19])
+#define zDisabledErr (option_usage_text.apz_str[ 20])
+#define zDisabledOpt (option_usage_text.apz_str[ 21])
+#define zDisabledWhy (option_usage_text.apz_str[ 22])
+#define zEnab (option_usage_text.apz_str[ 23])
+#define zEquiv (option_usage_text.apz_str[ 24])
+#define zErrOnly (option_usage_text.apz_str[ 25])
+#define zExamineFmt (option_usage_text.apz_str[ 26])
+#define zFiveSpaces (option_usage_text.apz_str[ 27])
+#define zFlagOkay (option_usage_text.apz_str[ 28])
+#define zFmtFmt (option_usage_text.apz_str[ 29])
+#define zForkFail (option_usage_text.apz_str[ 30])
+#define zFSErrOptLoad (option_usage_text.apz_str[ 31])
+#define zFSErrReadFile (option_usage_text.apz_str[ 32])
+#define zFSOptError (option_usage_text.apz_str[ 33])
+#define zFSOptErrMayExist (option_usage_text.apz_str[ 34])
+#define zFSOptErrMustExist (option_usage_text.apz_str[ 35])
+#define zFSOptErrNoExist (option_usage_text.apz_str[ 36])
+#define zFSOptErrOpen (option_usage_text.apz_str[ 37])
+#define zFSOptErrFopen (option_usage_text.apz_str[ 38])
+#define zFileCannotExist (option_usage_text.apz_str[ 39])
+#define zFileMustExist (option_usage_text.apz_str[ 40])
+#define zGenshell (option_usage_text.apz_str[ 41])
#define zGnuBoolArg (option_usage_text.utpz_GnuBoolArg)
-#define zGnuBreak (option_usage_text.apz_str[ 38])
+#define zGnuBreak (option_usage_text.apz_str[ 42])
#define zGnuKeyArg (option_usage_text.utpz_GnuKeyArg)
#define zGnuFileArg (option_usage_text.utpz_GnuFileArg)
#define zGnuKeyLArg (option_usage_text.utpz_GnuKeyLArg)
#define zGnuTimeArg (option_usage_text.utpz_GnuTimeArg)
-#define zGnuNestArg (option_usage_text.apz_str[ 39])
+#define zGnuNestArg (option_usage_text.apz_str[ 43])
#define zGnuNumArg (option_usage_text.utpz_GnuNumArg)
-#define zGnuOptArg (option_usage_text.apz_str[ 40])
-#define zGnuOptFmt (option_usage_text.apz_str[ 41])
+#define zGnuOptArg (option_usage_text.apz_str[ 44])
+#define zGnuOptFmt (option_usage_text.apz_str[ 45])
#define zGnuStrArg (option_usage_text.utpz_GnuStrArg)
-#define zIllOptChr (option_usage_text.apz_str[ 42])
-#define zIllOptStr (option_usage_text.apz_str[ 43])
-#define zIllegal (option_usage_text.apz_str[ 44])
-#define zIntRange (option_usage_text.apz_str[ 45])
-#define zInvalOptDesc (option_usage_text.apz_str[ 46])
-#define zLowerBits (option_usage_text.apz_str[ 47])
-#define zMembers (option_usage_text.apz_str[ 48])
-#define zMisArg (option_usage_text.apz_str[ 49])
-#define zMultiEquiv (option_usage_text.apz_str[ 50])
-#define zMust (option_usage_text.apz_str[ 51])
-#define zNeedOne (option_usage_text.apz_str[ 52])
-#define zNoArg (option_usage_text.apz_str[ 53])
-#define zNoArgs (option_usage_text.apz_str[ 54])
-#define zNoCreat (option_usage_text.apz_str[ 55])
-#define zNoFlags (option_usage_text.apz_str[ 56])
-#define zNoKey (option_usage_text.apz_str[ 57])
-#define zNoLim (option_usage_text.apz_str[ 58])
-#define zNoPreset (option_usage_text.apz_str[ 59])
-#define zNoResetArg (option_usage_text.apz_str[ 60])
-#define zNoRq_NoShrtTtl (option_usage_text.apz_str[ 61])
-#define zNoRq_ShrtTtl (option_usage_text.apz_str[ 62])
-#define zNoStat (option_usage_text.apz_str[ 63])
-#define zNoState (option_usage_text.apz_str[ 64])
-#define zNone (option_usage_text.apz_str[ 65])
-#define zNotDef (option_usage_text.apz_str[ 66])
-#define zNotCmdOpt (option_usage_text.apz_str[ 67])
-#define zNotEnough (option_usage_text.apz_str[ 68])
-#define zNotFile (option_usage_text.apz_str[ 69])
-#define zNotNumber (option_usage_text.apz_str[ 70])
-#define zNrmOptFmt (option_usage_text.apz_str[ 71])
-#define zNumberOpt (option_usage_text.apz_str[ 72])
-#define zOneSpace (option_usage_text.apz_str[ 73])
-#define zOnlyOne (option_usage_text.apz_str[ 74])
-#define zOptsOnly (option_usage_text.apz_str[ 75])
-#define zPathFmt (option_usage_text.apz_str[ 76])
-#define zPlsSendBugs (option_usage_text.apz_str[ 77])
-#define zPreset (option_usage_text.apz_str[ 78])
-#define zPresetFile (option_usage_text.apz_str[ 79])
-#define zPresetIntro (option_usage_text.apz_str[ 80])
-#define zProg (option_usage_text.apz_str[ 81])
-#define zProhib (option_usage_text.apz_str[ 82])
-#define zReorder (option_usage_text.apz_str[ 83])
-#define zRange (option_usage_text.apz_str[ 84])
-#define zRangeAbove (option_usage_text.apz_str[ 85])
-#define zRangeLie (option_usage_text.apz_str[ 86])
-#define zRangeBadLie (option_usage_text.apz_str[ 87])
-#define zRangeOnly (option_usage_text.apz_str[ 88])
-#define zRangeOr (option_usage_text.apz_str[ 89])
-#define zRangeErr (option_usage_text.apz_str[ 90])
-#define zRangeExact (option_usage_text.apz_str[ 91])
-#define zRangeScaled (option_usage_text.apz_str[ 92])
-#define zRangeUpto (option_usage_text.apz_str[ 93])
-#define zResetNotConfig (option_usage_text.apz_str[ 94])
-#define zReqFmt (option_usage_text.apz_str[ 95])
-#define zReqOptFmt (option_usage_text.apz_str[ 96])
-#define zReqThese (option_usage_text.apz_str[ 97])
-#define zReq_NoShrtTtl (option_usage_text.apz_str[ 98])
-#define zReq_ShrtTtl (option_usage_text.apz_str[ 99])
-#define zSepChars (option_usage_text.apz_str[100])
-#define zSetMemberSettings (option_usage_text.apz_str[101])
-#define zShrtGnuOptFmt (option_usage_text.apz_str[102])
-#define zSixSpaces (option_usage_text.apz_str[103])
-#define zStdBoolArg (option_usage_text.apz_str[104])
-#define zStdBreak (option_usage_text.apz_str[105])
-#define zStdFileArg (option_usage_text.apz_str[106])
-#define zStdKeyArg (option_usage_text.apz_str[107])
-#define zStdKeyLArg (option_usage_text.apz_str[108])
-#define zStdTimeArg (option_usage_text.apz_str[109])
-#define zStdNestArg (option_usage_text.apz_str[110])
-#define zStdNoArg (option_usage_text.apz_str[111])
-#define zStdNumArg (option_usage_text.apz_str[112])
-#define zStdOptArg (option_usage_text.apz_str[113])
-#define zStdReqArg (option_usage_text.apz_str[114])
-#define zStdStrArg (option_usage_text.apz_str[115])
-#define zTabHyp (option_usage_text.apz_str[116])
-#define zTabHypAnd (option_usage_text.apz_str[117])
-#define zTabout (option_usage_text.apz_str[118])
-#define zThreeSpaces (option_usage_text.apz_str[119])
-#define zTwoSpaces (option_usage_text.apz_str[120])
-#define zUpTo (option_usage_text.apz_str[121])
-#define zValidKeys (option_usage_text.apz_str[122])
+#define zIllOptChr (option_usage_text.apz_str[ 46])
+#define zIllOptStr (option_usage_text.apz_str[ 47])
+#define zIllegal (option_usage_text.apz_str[ 48])
+#define zIntRange (option_usage_text.apz_str[ 49])
+#define zInvalOptDesc (option_usage_text.apz_str[ 50])
+#define zLowerBits (option_usage_text.apz_str[ 51])
+#define zMembers (option_usage_text.apz_str[ 52])
+#define zMisArg (option_usage_text.apz_str[ 53])
+#define zMultiEquiv (option_usage_text.apz_str[ 54])
+#define zMust (option_usage_text.apz_str[ 55])
+#define zNeedOne (option_usage_text.apz_str[ 56])
+#define zNoArg (option_usage_text.apz_str[ 57])
+#define zNoArgs (option_usage_text.apz_str[ 58])
+#define zNoCreat (option_usage_text.apz_str[ 59])
+#define zNoFlags (option_usage_text.apz_str[ 60])
+#define zNoKey (option_usage_text.apz_str[ 61])
+#define zNoLim (option_usage_text.apz_str[ 62])
+#define zNoPreset (option_usage_text.apz_str[ 63])
+#define zNoResetArg (option_usage_text.apz_str[ 64])
+#define zNoRq_NoShrtTtl (option_usage_text.apz_str[ 65])
+#define zNoRq_ShrtTtl (option_usage_text.apz_str[ 66])
+#define zNoStat (option_usage_text.apz_str[ 67])
+#define zNoState (option_usage_text.apz_str[ 68])
+#define zNone (option_usage_text.apz_str[ 69])
+#define zNotDef (option_usage_text.apz_str[ 70])
+#define zNotCmdOpt (option_usage_text.apz_str[ 71])
+#define zNotEnough (option_usage_text.apz_str[ 72])
+#define zNotFile (option_usage_text.apz_str[ 73])
+#define zNotNumber (option_usage_text.apz_str[ 74])
+#define zNrmOptFmt (option_usage_text.apz_str[ 75])
+#define zNumberOpt (option_usage_text.apz_str[ 76])
+#define zOneSpace (option_usage_text.apz_str[ 77])
+#define zOnlyOne (option_usage_text.apz_str[ 78])
+#define zOptsOnly (option_usage_text.apz_str[ 79])
+#define zPathFmt (option_usage_text.apz_str[ 80])
+#define zPlsSendBugs (option_usage_text.apz_str[ 81])
+#define zPreset (option_usage_text.apz_str[ 82])
+#define zPresetFile (option_usage_text.apz_str[ 83])
+#define zPresetIntro (option_usage_text.apz_str[ 84])
+#define zProg (option_usage_text.apz_str[ 85])
+#define zProhib (option_usage_text.apz_str[ 86])
+#define zReorder (option_usage_text.apz_str[ 87])
+#define zRange (option_usage_text.apz_str[ 88])
+#define zRangeAbove (option_usage_text.apz_str[ 89])
+#define zRangeLie (option_usage_text.apz_str[ 90])
+#define zRangeBadLie (option_usage_text.apz_str[ 91])
+#define zRangeOnly (option_usage_text.apz_str[ 92])
+#define zRangeOr (option_usage_text.apz_str[ 93])
+#define zRangeErr (option_usage_text.apz_str[ 94])
+#define zRangeExact (option_usage_text.apz_str[ 95])
+#define zRangeScaled (option_usage_text.apz_str[ 96])
+#define zRangeUpto (option_usage_text.apz_str[ 97])
+#define zResetNotConfig (option_usage_text.apz_str[ 98])
+#define zReqFmt (option_usage_text.apz_str[ 99])
+#define zReqOptFmt (option_usage_text.apz_str[100])
+#define zReqThese (option_usage_text.apz_str[101])
+#define zReq_NoShrtTtl (option_usage_text.apz_str[102])
+#define zReq_ShrtTtl (option_usage_text.apz_str[103])
+#define zSepChars (option_usage_text.apz_str[104])
+#define zSetMemberSettings (option_usage_text.apz_str[105])
+#define zShrtGnuOptFmt (option_usage_text.apz_str[106])
+#define zSixSpaces (option_usage_text.apz_str[107])
+#define zStdBoolArg (option_usage_text.apz_str[108])
+#define zStdBreak (option_usage_text.apz_str[109])
+#define zStdFileArg (option_usage_text.apz_str[110])
+#define zStdKeyArg (option_usage_text.apz_str[111])
+#define zStdKeyLArg (option_usage_text.apz_str[112])
+#define zStdTimeArg (option_usage_text.apz_str[113])
+#define zStdNestArg (option_usage_text.apz_str[114])
+#define zStdNoArg (option_usage_text.apz_str[115])
+#define zStdNumArg (option_usage_text.apz_str[116])
+#define zStdOptArg (option_usage_text.apz_str[117])
+#define zStdReqArg (option_usage_text.apz_str[118])
+#define zStdStrArg (option_usage_text.apz_str[119])
+#define zTabHyp (option_usage_text.apz_str[120])
+#define zTabHypAnd (option_usage_text.apz_str[121])
+#define zTabout (option_usage_text.apz_str[122])
+#define zThreeSpaces (option_usage_text.apz_str[123])
+#define zTwoSpaces (option_usage_text.apz_str[124])
+#define zUpTo (option_usage_text.apz_str[125])
+#define zValidKeys (option_usage_text.apz_str[126])
/*
* First, set up the strings. Some of these are writable. These are all in
static char eng_zGnuTimeArg[] = "=Tim";
static char eng_zGnuNumArg[] = "=num";
static char eng_zGnuStrArg[] = "=str";
-static char const usage_txt[4024] =
+static char const usage_txt[4159] =
"AutoOpts function called without option descriptor\n\0"
"\tThis exceeds the compiled library version: \0"
"Automated Options Processing Error!\n"
"Automated Options version %s\n"
"\tcopyright (c) 1999-2009 by Bruce Korb - all rights reserved\n\0"
"AutoOpts lib error: defaulted to option with optional arg\n\0"
+ "(AutoOpts bug): Aliasing option is out of range.\0"
"all\0"
"\t\t\t\t- an alternate for %s\n\0"
"%s error: the keyword `%s' is ambiguous for %s\n\0"
"%s(optionSaveState): error: cannot allocate %d bytes\n\0"
"\t\t\t\t- default option for unnamed options\n\0"
"\t\t\t\t- disabled as --%s\n\0"
+ "%s: The ``%s'' option has been disabled\0"
+ " --- %-14s %s\n\0"
+ "This option has been disabled\0"
"\t\t\t\t- enabled by default\n\0"
"-equivalence\0"
"ERROR: only \0"
* Aren't you glad you don't maintain this by hand?
*/
usage_text_t option_usage_text = {
- 130,
+ 134,
eng_zGnuBoolArg, eng_zGnuKeyArg, eng_zGnuFileArg, eng_zGnuKeyLArg,
eng_zGnuTimeArg, eng_zGnuNumArg, eng_zGnuStrArg,
{
usage_txt + 0, usage_txt + 52, usage_txt + 98, usage_txt + 197,
- usage_txt + 247, usage_txt + 338, usage_txt + 397, usage_txt + 401,
- usage_txt + 428, usage_txt + 477, usage_txt + 505, usage_txt + 542,
- usage_txt + 567, usage_txt + 593, usage_txt + 633, usage_txt + 770,
- usage_txt + 818, usage_txt + 872, usage_txt + 914, usage_txt + 938,
- usage_txt + 964, usage_txt + 977, usage_txt + 991, usage_txt +1038,
- usage_txt +1044, usage_txt +1147, usage_txt +1159, usage_txt +1210,
- usage_txt +1261, usage_txt +1295, usage_txt +1336, usage_txt +1359,
- usage_txt +1385, usage_txt +1416, usage_txt +1430, usage_txt +1445,
- usage_txt +1476, usage_txt +1503, usage_txt +1609, usage_txt +1615,
- usage_txt +1621, usage_txt +1628, usage_txt +1639, usage_txt +1665,
- usage_txt +1691, usage_txt +1699, usage_txt +1735, usage_txt +1786,
- usage_txt +1842, usage_txt +1876, usage_txt +1914, usage_txt +1979,
- usage_txt +2022, usage_txt +2057, usage_txt +2098, usage_txt +2138,
- usage_txt +2165, usage_txt +2232, usage_txt +2280, usage_txt +2313,
- usage_txt +2338, usage_txt +2386, usage_txt +2421, usage_txt +2459,
- usage_txt +2486, usage_txt +2535, usage_txt +2540, usage_txt +2558,
- usage_txt +2593, usage_txt +2637, usage_txt +2691, usage_txt +2737,
- usage_txt +2745, usage_txt +2793, usage_txt +2795, usage_txt +2820,
- usage_txt +2854, usage_txt +2873, usage_txt +2907, usage_txt +2943,
- usage_txt +2981, usage_txt +3037, usage_txt +3045, usage_txt +3071,
- usage_txt +3137, usage_txt +3150, usage_txt +3181, usage_txt +3218,
- usage_txt +3264, usage_txt +3280, usage_txt +3286, usage_txt +3338,
- usage_txt +3352, usage_txt +3398, usage_txt +3426, usage_txt +3471,
- usage_txt +3513, usage_txt +3527, usage_txt +3552, usage_txt +3592,
- usage_txt +3635, usage_txt +3639, usage_txt +3858, usage_txt +3861,
- usage_txt +3868, usage_txt +3872, usage_txt +3880, usage_txt +3884,
- usage_txt +3888, usage_txt +3892, usage_txt +3896, usage_txt +3900,
- usage_txt +3904, usage_txt +3908, usage_txt +3912, usage_txt +3916,
- usage_txt +3920, usage_txt +3927, usage_txt +3939, usage_txt +3947,
- usage_txt +3951, usage_txt +3954, usage_txt +3987
+ usage_txt + 247, usage_txt + 338, usage_txt + 397, usage_txt + 447,
+ usage_txt + 451, usage_txt + 478, usage_txt + 527, usage_txt + 555,
+ usage_txt + 592, usage_txt + 617, usage_txt + 643, usage_txt + 683,
+ usage_txt + 820, usage_txt + 868, usage_txt + 922, usage_txt + 964,
+ usage_txt + 988, usage_txt +1028, usage_txt +1043, usage_txt +1073,
+ usage_txt +1099, usage_txt +1112, usage_txt +1126, usage_txt +1173,
+ usage_txt +1179, usage_txt +1282, usage_txt +1294, usage_txt +1345,
+ usage_txt +1396, usage_txt +1430, usage_txt +1471, usage_txt +1494,
+ usage_txt +1520, usage_txt +1551, usage_txt +1565, usage_txt +1580,
+ usage_txt +1611, usage_txt +1638, usage_txt +1744, usage_txt +1750,
+ usage_txt +1756, usage_txt +1763, usage_txt +1774, usage_txt +1800,
+ usage_txt +1826, usage_txt +1834, usage_txt +1870, usage_txt +1921,
+ usage_txt +1977, usage_txt +2011, usage_txt +2049, usage_txt +2114,
+ usage_txt +2157, usage_txt +2192, usage_txt +2233, usage_txt +2273,
+ usage_txt +2300, usage_txt +2367, usage_txt +2415, usage_txt +2448,
+ usage_txt +2473, usage_txt +2521, usage_txt +2556, usage_txt +2594,
+ usage_txt +2621, usage_txt +2670, usage_txt +2675, usage_txt +2693,
+ usage_txt +2728, usage_txt +2772, usage_txt +2826, usage_txt +2872,
+ usage_txt +2880, usage_txt +2928, usage_txt +2930, usage_txt +2955,
+ usage_txt +2989, usage_txt +3008, usage_txt +3042, usage_txt +3078,
+ usage_txt +3116, usage_txt +3172, usage_txt +3180, usage_txt +3206,
+ usage_txt +3272, usage_txt +3285, usage_txt +3316, usage_txt +3353,
+ usage_txt +3399, usage_txt +3415, usage_txt +3421, usage_txt +3473,
+ usage_txt +3487, usage_txt +3533, usage_txt +3561, usage_txt +3606,
+ usage_txt +3648, usage_txt +3662, usage_txt +3687, usage_txt +3727,
+ usage_txt +3770, usage_txt +3774, usage_txt +3993, usage_txt +3996,
+ usage_txt +4003, usage_txt +4007, usage_txt +4015, usage_txt +4019,
+ usage_txt +4023, usage_txt +4027, usage_txt +4031, usage_txt +4035,
+ usage_txt +4039, usage_txt +4043, usage_txt +4047, usage_txt +4051,
+ usage_txt +4055, usage_txt +4062, usage_txt +4074, usage_txt +4082,
+ usage_txt +4086, usage_txt +4089, usage_txt +4122
}
};
*
* DO NOT EDIT THIS FILE (genshell.c)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:09 AM by AutoGen 5.9.10pre13
* From the definitions genshell.def
* and the template file options
*
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
+
/*
* Script option description:
*/
/*
* Help/More_Help/Version option descriptions:
*/
-tSCC zHelpText[] = "Display usage information and exit";
+tSCC zHelpText[] = "Display extended usage information and exit";
tSCC zHelp_Name[] = "help";
-tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
+#ifdef HAVE_WORKING_FORK
+#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
tSCC zMore_Help_Name[] = "more-help";
+tSCC zMore_HelpText[] = "Extended usage information passed thru pager";
+#else
+#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
+#define zMore_Help_Name NULL
+#define zMore_HelpText NULL
+#endif
+#ifdef NO_OPTIONAL_OPT_ARGS
+# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT
+#else
+# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
+ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
+#endif
+
tSCC zVersionText[] = "Output version information and exit";
tSCC zVersion_Name[] = "version";
/*
/* desc, NAME, name */ zShellText, zShell_NAME, zShell_Name,
/* disablement strs */ zNotShell_Name, zNotShell_Pfx },
-#ifdef NO_OPTIONAL_OPT_ARGS
-# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT
-#else
-# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
- OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
-#endif
-
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ VERSION_OPT_FLAGS, 0,
+ /* opt state flags */ OPTST_VERSION_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
/* desc, NAME, name */ zVersionText, NULL, zVersion_Name,
/* disablement strs */ NULL, NULL },
-#undef VERSION_OPT_FLAGS
{ /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
- /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0,
+ /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
text, the second line of the file through the ending tag will be replaced\n\
by the newly generated text. The first `#!' line will be regenerated.\n";
tSCC zFullVersion[] = GENSHELLOPT_FULL_VERSION;
-/* extracted from optcode.tpl near line 501 */
+/* extracted from optcode.tpl near line 495 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE
(void)pOptions;
USAGE( EXIT_SUCCESS );
}
-/* extracted from optcode.tpl near line 633 */
+/* extracted from optcode.tpl near line 627 */
#if ENABLE_NLS
#include <stdio.h>
*
* DO NOT EDIT THIS FILE (genshell.h)
*
- * It has been AutoGen-ed August 1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
+ * It has been AutoGen-ed November 8, 2009 at 08:41:09 AM by AutoGen 5.9.10pre13
* From the definitions genshell.def
* and the template file options
*
* tolerable version is at least as old as what was current when the header
* template was released.
*/
-#define AO_TEMPLATE_VERSION 131073
+#define AO_TEMPLATE_VERSION 135168
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
projects / thirdparty / ntp.git / commitdiff
