+(4.2.5p190) 2009/07/20 Released by Harlan Stenn <stenn@ntp.org>
* Updated to AutoGen-5.9.8.
* [Bug 1248] RES_MSSNTP typo in ntp_proto.c.
* [Bug 1246] use a common template for singly-linked lists, convert most
/*
* EDIT THIS FILE WITH CAUTION (sntp-opts.c)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:13:42 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:05:02 AM EDT
* From the definitions sntp-opts.def
* and the template file options
*
*/
tSCC zPROGNAME[] = "SNTP";
tSCC zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.5p189\n\
+"sntp - standard SNTP program - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... ...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
/*
* EDIT THIS FILE WITH CAUTION (sntp-opts.h)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:13:41 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:05:01 AM EDT
* From the definitions sntp-opts.def
* and the template file options
*
} teOptIndex;
#define OPTION_CT 17
-#define SNTP_VERSION "4.2.5p189"
-#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p189"
+#define SNTP_VERSION "4.2.5p190"
+#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
#
# EDIT THIS FILE WITH CAUTION (sntp-opts.texi)
#
-# It has been AutoGen-ed Monday July 20, 2009 at 05:13:44 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 08:05:04 AM EDT
# From the definitions sntp-opts.def
# and the template file aginfo.tpl
@end ignore
-.TH SNTP 1 2009-07-20 "( 4.2.5p189)" "Programmer's Manual"
+.TH SNTP 1 2009-07-20 "( 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (sntp.1)
.\"
-.\" It has been AutoGen-ed Monday July 20, 2009 at 05:13:42 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 08:05:02 AM EDT
.\" From the definitions sntp-opts.def
.\" and the template file agman1.tpl
.\"
/*
* EDIT THIS FILE WITH CAUTION (ntpd-opts.c)
*
- * It has been AutoGen-ed Thursday July 16, 2009 at 07:38:42 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 07:51:54 AM EDT
* From the definitions ntpd-opts.def
* and the template file options
*
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 32:1:7 templates.
*/
/*
* see html/copyright.html
*/
-
+#include <sys/types.h>
#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
#define OPTION_CODE_COMPILE 1
#include "ntpd-opts.h"
#ifdef __cplusplus
extern "C" {
#endif
+
+/* TRANSLATORS: choose the translation for option names wisely because you
+ cannot ever change your mind. */
tSCC zCopyright[] =
- "ntpd copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved";
-tSCC zCopyrightNotice[] =
-
+ "ntpd copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
/* extracted from ../include/copyright.def near line 8 */
+;
+tSCC zCopyrightNotice[24] =
"see html/copyright.html";
+
extern tUsageProc optionUsage;
/*
/*
* 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 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";
/*
* Declare option callback procedures
*/
*/
tSCC zPROGNAME[] = "NTPD";
tSCC zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.5p189\n\
+"ntpd - NTP daemon program - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
#define zRcName NULL
#define apzHomeList NULL
#define zExplain NULL
tSCC zDetail[] = "\n\n";
tSCC zFullVersion[] = NTPD_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 501 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
+
+#define ntpd_full_usage NULL
+#define ntpd_short_usage NULL
tOptions ntpdOptions = {
OPTIONS_STRUCT_VERSION,
0, NULL, /* original argc + argv */
/*
* Indexes to special options
*/
- { INDEX_OPT_MORE_HELP,
- 0 /* no option state saving */,
- NO_EQUIVALENT /* index of '-#' option */,
+ { INDEX_OPT_MORE_HELP, /* more-help option index */
+ NO_EQUIVALENT, /* save option index */
+ NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
- 34 /* full option count */, 31 /* user option count */
+ 34 /* full option count */, 31 /* user option count */,
+ ntpd_full_usage, ntpd_short_usage,
+ NULL, NULL
};
/*
tOptions* pOptions,
tOptDesc* pOptDesc )
{
+ (void)pOptions;
USAGE( EXIT_SUCCESS );
}
#if ! defined(TEST_NTPD_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 */
DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
}
#endif /* defined DEBUG */
-
#endif /* defined(TEST_NTPD_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_NTPD_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( &ntpdOptions, argc, argv );
- {
- void optionPutShell( tOptions* );
- optionPutShell( &ntpdOptions );
- }
+ optionPutShell( &ntpdOptions );
return res;
}
#endif /* defined TEST_NTPD_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */
#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 = ntpdOptions.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 = ntpdOptions.optCt; ix > 0; ix--, pOD++)
+ coerce_it((void*)&(pOD->pzText));
}
- option_usage_text.field_ct = 0;
- {
+ if ((ntpdOptions.fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
tOptDesc* pOD = ntpdOptions.pOptDesc;
- int ix = ntpdOptions.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 = ntpdOptions.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 */
+ ntpdOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
- COERSION(pzCopyright);
- COERSION(pzCopyNotice);
- COERSION(pzFullVersion);
- COERSION(pzUsageTitle);
- COERSION(pzExplain);
- COERSION(pzDetail);
}
#endif /* ENABLE_NLS */
/*
* EDIT THIS FILE WITH CAUTION (ntpd-opts.h)
*
- * It has been AutoGen-ed Thursday July 16, 2009 at 07:38:41 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 07:51:53 AM EDT
* From the definitions ntpd-opts.def
* and the template file options
*
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 32:1:7 templates.
*/
/*
* "AutoOpts" chapter. Please refer to that doc for usage help.
*/
#ifndef AUTOOPTS_NTPD_OPTS_H_GUARD
-#define AUTOOPTS_NTPD_OPTS_H_GUARD
+#define AUTOOPTS_NTPD_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 118784
+#define AO_TEMPLATE_VERSION 131073
#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_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_STATSDIR = 22,
- INDEX_OPT_TRUSTEDKEY = 23,
- INDEX_OPT_USER = 24,
- INDEX_OPT_UPDATEINTERVAL = 25,
- INDEX_OPT_VAR = 26,
- INDEX_OPT_DVAR = 27,
- INDEX_OPT_SLEW = 28,
- INDEX_OPT_USEPCC = 29,
- INDEX_OPT_PCCFREQ = 30,
- INDEX_OPT_VERSION = 31,
- INDEX_OPT_HELP = 32,
- INDEX_OPT_MORE_HELP = 33
+ 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_STATSDIR = 22,
+ INDEX_OPT_TRUSTEDKEY = 23,
+ INDEX_OPT_USER = 24,
+ INDEX_OPT_UPDATEINTERVAL = 25,
+ INDEX_OPT_VAR = 26,
+ INDEX_OPT_DVAR = 27,
+ INDEX_OPT_SLEW = 28,
+ INDEX_OPT_USEPCC = 29,
+ INDEX_OPT_PCCFREQ = 30,
+ INDEX_OPT_VERSION = 31,
+ INDEX_OPT_HELP = 32,
+ INDEX_OPT_MORE_HELP = 33
} teOptIndex;
#define OPTION_CT 34
-#define NTPD_VERSION "4.2.5p189"
-#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p189"
+#define NTPD_VERSION "4.2.5p190"
+#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
# undef PCCFREQ
#endif /* NO_OPTION_NAME_WARNINGS */
-/*
+/* * * * * *
+ *
* Interface defines for specific options.
*/
#define VALUE_OPT_IPV4 '4'
#ifdef SYS_WINNT
#define VALUE_OPT_PCCFREQ 30
#endif /* SYS_WINNT */
-
-#define VALUE_OPT_VERSION INDEX_OPT_VERSION
#define VALUE_OPT_HELP '?'
#define VALUE_OPT_MORE_HELP '!'
+#define VALUE_OPT_VERSION INDEX_OPT_VERSION
/*
* Interface defines not associated with particular options
*/
ntpdOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ntpdOptions.pUsageProc)( &ntpdOptions, c )
-/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
/* * * * * *
*
extern tOptions ntpdOptions;
-#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(ntpdOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT_CFG;)
+# define OPT_NO_XLAT_OPT_NAMES STMTS(ntpdOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG;)
+
+# define OPT_XLAT_CFG_NAMES STMTS(ntpdOptions.fOptSet &= \
+ ~(OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG);)
+# define OPT_XLAT_OPT_NAMES STMTS(ntpdOptions.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
}
#
# EDIT THIS FILE WITH CAUTION (ntpd-opts.texi)
#
-# It has been AutoGen-ed Thursday July 16, 2009 at 07:38:45 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 07:51:56 AM EDT
# From the definitions ntpd-opts.def
# and the template file aginfo.tpl
@end ignore
-.TH NTPD 1 2009-07-16 "( 4.2.5p189)" "Programmer's Manual"
+.TH NTPD 1 2009-07-20 "( 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (ntpd.1)
.\"
-.\" It has been AutoGen-ed Thursday July 16, 2009 at 07:38:43 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 07:51:55 AM EDT
.\" From the definitions ntpd-opts.def
.\" and the template file agman1.tpl
.\"
.PP
All arguments must be options.
.SH "DESCRIPTION"
-This manual page documents, briefly, the \fBntpd\fP command.
+This manual page briefly documents the \fBntpd\fP command.
.SH OPTIONS
.TP
.nf
\fBNTPD_<option-name>\fP or \fBNTPD\fP
.fi
-.aj
+.ad
.SH AUTHOR
David L. Mills and/or others
.br
/*
* EDIT THIS FILE WITH CAUTION (ntpdc-opts.c)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:09:22 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 07:58:50 AM EDT
* From the definitions ntpdc-opts.def
* and the template file options
*
*/
tSCC zPROGNAME[] = "NTPDC";
tSCC zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p189\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
/*
* EDIT THIS FILE WITH CAUTION (ntpdc-opts.h)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:09:21 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 07:58:49 AM EDT
* From the definitions ntpdc-opts.def
* and the template file options
*
} teOptIndex;
#define OPTION_CT 15
-#define NTPDC_VERSION "4.2.5p189"
-#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p189"
+#define NTPDC_VERSION "4.2.5p190"
+#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
#
# EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi)
#
-# It has been AutoGen-ed Monday July 20, 2009 at 05:09:24 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 07:58:52 AM EDT
# From the definitions ntpdc-opts.def
# and the template file aginfo.tpl
@end ignore
The following option preset mechanisms are supported:
- reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/ntp-dev/ntpdc/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/ntpdc/.ntprc
- examining environment variables named NTPDC_*
The
-.TH NTPDC 1 2009-07-20 "( 4.2.5p189)" "Programmer's Manual"
+.TH NTPDC 1 2009-07-20 "( 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (ntpdc.1)
.\"
-.\" It has been AutoGen-ed Monday July 20, 2009 at 05:09:23 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 07:58:51 AM EDT
.\" From the definitions ntpdc-opts.def
.\" and the template file agman1.tpl
.\"
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.c)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:12:10 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 07:59:20 AM EDT
* From the definitions ntpq-opts.def
* and the template file options
*
*/
tSCC zPROGNAME[] = "NTPQ";
tSCC zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.5p189\n\
+"ntpq - standard NTP query program - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.h)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:12:09 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 07:59:19 AM EDT
* From the definitions ntpq-opts.def
* and the template file options
*
} teOptIndex;
#define OPTION_CT 13
-#define NTPQ_VERSION "4.2.5p189"
-#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p189"
+#define NTPQ_VERSION "4.2.5p190"
+#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
#
# EDIT THIS FILE WITH CAUTION (ntpq-opts.texi)
#
-# It has been AutoGen-ed Monday July 20, 2009 at 05:12:12 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 07:59:23 AM EDT
# From the definitions ntpq-opts.def
# and the template file aginfo.tpl
@end ignore
The following option preset mechanisms are supported:
- reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc
- examining environment variables named NTPQ_*
The
-.TH NTPQ 1 2009-07-20 "( 4.2.5p189)" "Programmer's Manual"
+.TH NTPQ 1 2009-07-20 "( 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (ntpq.1)
.\"
-.\" It has been AutoGen-ed Monday July 20, 2009 at 05:12:11 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 07:59:22 AM EDT
.\" From the definitions ntpq-opts.def
.\" and the template file agman1.tpl
.\"
/*
* EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c)
*
- * It has been AutoGen-ed Thursday July 16, 2009 at 07:46:50 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:00:06 AM EDT
* From the definitions ntpsnmpd-opts.def
* and the template file options
*
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 32:1:7 templates.
*/
/*
* see html/copyright.html
*/
-
+#include <sys/types.h>
#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
#define OPTION_CODE_COMPILE 1
#include "ntpsnmpd-opts.h"
#ifdef __cplusplus
extern "C" {
#endif
+
+/* TRANSLATORS: choose the translation for option names wisely because you
+ cannot ever change your mind. */
tSCC zCopyright[] =
- "ntpsnmpd copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved";
-tSCC zCopyrightNotice[] =
-
+ "ntpsnmpd copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved"
/* extracted from ../include/copyright.def near line 8 */
+;
+tSCC zCopyrightNotice[24] =
"see html/copyright.html";
+
extern tUsageProc optionUsage;
#ifndef NULL
/*
* 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";
-
-/*
- * Save/Load_Opts option description:
- */
+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 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)
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, NOLIMIT, 0,
- /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) \
+ /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
| OPTST_DISABLE_IMM, 0,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
*/
tSCC zPROGNAME[] = "NTPSNMPD";
tSCC zUsageTitle[] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p189\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> | --<name> ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
#define zExplain NULL
#define zDetail NULL
tSCC zFullVersion[] = NTPSNMPD_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 501 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
+
+#define ntpsnmpd_full_usage NULL
+#define ntpsnmpd_short_usage NULL
tOptions ntpsnmpdOptions = {
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 */
},
- 7 /* full option count */, 2 /* user option count */
+ 7 /* full option count */, 2 /* user option count */,
+ ntpsnmpd_full_usage, ntpsnmpd_short_usage,
+ NULL, NULL
};
/*
tOptions* pOptions,
tOptDesc* pOptDesc )
{
+ (void)pOptions;
USAGE( EXIT_SUCCESS );
}
-/* 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_NTPSNMPD_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( &ntpsnmpdOptions, argc, argv );
- {
- void optionPutShell( tOptions* );
- optionPutShell( &ntpsnmpdOptions );
- }
+ optionPutShell( &ntpsnmpdOptions );
return res;
}
#endif /* defined TEST_NTPSNMPD_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */
#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 = ntpsnmpdOptions.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 = ntpsnmpdOptions.optCt; ix > 0; ix--, pOD++)
+ coerce_it((void*)&(pOD->pzText));
}
- option_usage_text.field_ct = 0;
- {
+ if ((ntpsnmpdOptions.fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
tOptDesc* pOD = ntpsnmpdOptions.pOptDesc;
- int ix = ntpsnmpdOptions.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 = ntpsnmpdOptions.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 */
+ ntpsnmpdOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
- COERSION(pzCopyright);
- COERSION(pzCopyNotice);
- COERSION(pzFullVersion);
- COERSION(pzUsageTitle);
- COERSION(pzExplain);
- COERSION(pzDetail);
}
#endif /* ENABLE_NLS */
/*
* EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h)
*
- * It has been AutoGen-ed Thursday July 16, 2009 at 07:46:50 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:00:05 AM EDT
* From the definitions ntpsnmpd-opts.def
* and the template file options
*
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 32:1:7 templates.
*/
/*
* "AutoOpts" chapter. Please refer to that doc for usage help.
*/
#ifndef AUTOOPTS_NTPSNMPD_OPTS_H_GUARD
-#define AUTOOPTS_NTPSNMPD_OPTS_H_GUARD
+#define AUTOOPTS_NTPSNMPD_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 118784
+#define AO_TEMPLATE_VERSION 131073
#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_NOFORK = 0,
- INDEX_OPT_SYSLOG = 1,
- INDEX_OPT_VERSION = 2,
- INDEX_OPT_HELP = 3,
- INDEX_OPT_MORE_HELP = 4,
- INDEX_OPT_SAVE_OPTS = 5,
- INDEX_OPT_LOAD_OPTS = 6
+ INDEX_OPT_NOFORK = 0,
+ INDEX_OPT_SYSLOG = 1,
+ INDEX_OPT_VERSION = 2,
+ INDEX_OPT_HELP = 3,
+ INDEX_OPT_MORE_HELP = 4,
+ INDEX_OPT_SAVE_OPTS = 5,
+ INDEX_OPT_LOAD_OPTS = 6
} teOptIndex;
#define OPTION_CT 7
-#define NTPSNMPD_VERSION "4.2.5p189"
-#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p189"
+#define NTPSNMPD_VERSION "4.2.5p190"
+#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
# undef SYSLOG
#endif /* NO_OPTION_NAME_WARNINGS */
-/*
+/* * * * * *
+ *
* Interface defines for specific options.
*/
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_SYSLOG 'p'
-
-#define VALUE_OPT_VERSION INDEX_OPT_VERSION
#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( \
ntpsnmpdOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ntpsnmpdOptions.pUsageProc)( &ntpsnmpdOptions, c )
-/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */
+/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */
/* * * * * *
*
extern tOptions ntpsnmpdOptions;
-#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(ntpsnmpdOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT_CFG;)
+# define OPT_NO_XLAT_OPT_NAMES STMTS(ntpsnmpdOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG;)
+
+# define OPT_XLAT_CFG_NAMES STMTS(ntpsnmpdOptions.fOptSet &= \
+ ~(OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG);)
+# define OPT_XLAT_OPT_NAMES STMTS(ntpsnmpdOptions.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
}
#
# EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi)
#
-# It has been AutoGen-ed Thursday July 16, 2009 at 07:46:52 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 08:00:08 AM EDT
# From the definitions ntpsnmpd-opts.def
# and the template file aginfo.tpl
@end ignore
-.TH NTPSNMPD 1 2009-07-16 "( 4.2.5p189)" "Programmer's Manual"
+.TH NTPSNMPD 1 2009-07-20 "( 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1)
.\"
-.\" It has been AutoGen-ed Thursday July 16, 2009 at 07:46:51 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 08:00:07 AM EDT
.\" From the definitions ntpsnmpd-opts.def
.\" and the template file agman1.tpl
.\"
.PP
All arguments must be options.
.SH "DESCRIPTION"
-This manual page documents, briefly, the \fBntpsnmpd\fP command.
+This manual page briefly documents the \fBntpsnmpd\fP command.
Its description is not documented.
.SH OPTIONS
.TP
.nf
\fBNTPSNMPD_<option-name>\fP or \fBNTPSNMPD\fP
.fi
-.aj
+.ad
The environmental presets take precedence (are processed later than)
the configuration files.
The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
# - Numeric values increment
# - empty 'increments' to 1
# - NEW 'increments' to empty
-point=189
+point=190
# Special. Normally unused. A suffix.
#special=ag
special=
/*
* EDIT THIS FILE WITH CAUTION (sntp-opts.c)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:15:22 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:06:05 AM EDT
* From the definitions sntp-opts.def
* and the template file options
*
*/
tSCC zPROGNAME[] = "SNTP";
tSCC zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.5p189\n\
+"sntp - standard SNTP program - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> | --<name> ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
/*
* EDIT THIS FILE WITH CAUTION (sntp-opts.h)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:15:21 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:06:04 AM EDT
* From the definitions sntp-opts.def
* and the template file options
*
} teOptIndex;
#define OPTION_CT 13
-#define SNTP_VERSION "4.2.5p189"
-#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p189"
+#define SNTP_VERSION "4.2.5p190"
+#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
#
# EDIT THIS FILE WITH CAUTION (sntp-opts.texi)
#
-# It has been AutoGen-ed Monday July 20, 2009 at 05:15:24 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 08:06:07 AM EDT
# From the definitions sntp-opts.def
# and the template file aginfo.tpl
@end ignore
-.TH SNTP 1 2009-07-20 "( 4.2.5p189)" "Programmer's Manual"
+.TH SNTP 1 2009-07-20 "( 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (sntp.1)
.\"
-.\" It has been AutoGen-ed Monday July 20, 2009 at 05:15:22 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 08:06:05 AM EDT
.\" From the definitions sntp-opts.def
.\" and the template file agman1.tpl
.\"
/*
* EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:16:04 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:06:44 AM EDT
* From the definitions ntp-keygen-opts.def
* and the template file options
*
*/
tSCC zPROGNAME[] = "NTP_KEYGEN";
tSCC zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p189\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p190\n\
USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
tSCC zRcName[] = ".ntprc";
tSCC* apzHomeList[] = {
/*
* EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h)
*
- * It has been AutoGen-ed Monday July 20, 2009 at 05:16:03 AM EDT
+ * It has been AutoGen-ed Monday July 20, 2009 at 08:06:43 AM EDT
* From the definitions ntp-keygen-opts.def
* and the template file options
*
} teOptIndex;
#define OPTION_CT 23
-#define NTP_KEYGEN_VERSION "4.2.5p189"
-#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p189"
+#define NTP_KEYGEN_VERSION "4.2.5p190"
+#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p190"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
#
# EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.texi)
#
-# It has been AutoGen-ed Monday July 20, 2009 at 05:16:06 AM EDT
+# It has been AutoGen-ed Monday July 20, 2009 at 08:06:46 AM EDT
# From the definitions ntp-keygen-opts.def
# and the template file aginfo.tpl
@end ignore
The following option preset mechanisms are supported:
- reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/ntp-dev/util/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/util/.ntprc
- examining environment variables named NTP_KEYGEN_*
If there is no new host key, look for an existing one.
-.TH NTP-KEYGEN 1 2009-07-20 "(ntp 4.2.5p189)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2009-07-20 "(ntp 4.2.5p190)" "Programmer's Manual"
.\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1)
.\"
-.\" It has been AutoGen-ed Monday July 20, 2009 at 05:16:05 AM EDT
+.\" It has been AutoGen-ed Monday July 20, 2009 at 08:06:45 AM EDT
.\" From the definitions ntp-keygen-opts.def
.\" and the template file agman1.tpl
.\"
projects / thirdparty / ntp.git / commitdiff
