From: Harlan Stenn Date: Tue, 22 Feb 2011 06:35:03 +0000 (-0500) Subject: Updated to AutoGen-5.11.6 X-Git-Tag: NTP_4_2_7P132~3^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e84c70e59837f8b07af60eebd5ba49bae7885e9e;p=thirdparty%2Fntp.git Updated to AutoGen-5.11.6 bk: 4d635917qUiwUPYaGYTu10jzNvqdNw --- diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c index 644521ea6..9989e9d20 100644 --- a/clockstuff/clktest-opts.c +++ b/clockstuff/clktest-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:20:29 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:36 AM by AutoGen 5.11.6 * From the definitions clktest-opts.def * and the template file options * @@ -39,7 +39,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "clktest copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from ../sntp/include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -336,11 +336,11 @@ static char const * const apzHomeList[3] = { static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL static char const zDetail[164] = "\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"; +Clktest can be used to test the clock line discipline (CLKLDISC, it must\n\ +be available), and to take a look at radio clocks attached to a serial\n\ +port.\n"; static char const zFullVersion[] = CLKTEST_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -357,6 +357,22 @@ static char const zFullVersion[] = CLKTEST_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define clktest_packager_info NULL +#else +static char const clktest_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport clktest bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions clktestOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -375,7 +391,7 @@ tOptions clktestOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -388,7 +404,7 @@ tOptions clktestOptions = { 10 /* full option count */, 5 /* user option count */, clktest_full_usage, clktest_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, clktest_packager_info }; /* @@ -515,7 +531,7 @@ doOptTimeout(tOptions* pOptions, tOptDesc* pOptDesc) } pOptDesc->optArg.argInt = val; } -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_CLKTEST_OPTS) /* TEST MAIN PROCEDURE: */ @@ -533,7 +549,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_CLKTEST_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -577,7 +593,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -597,6 +612,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = clktestOptions.optCt; ix > 0; ix--, pOD++) diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h index d9aa05d7b..eebce1a3c 100644 --- a/clockstuff/clktest-opts.h +++ b/clockstuff/clktest-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:20:29 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:36 AM by AutoGen 5.11.6 * From the definitions clktest-opts.def * and the template file options * @@ -158,7 +158,7 @@ typedef enum { 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 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index c07552685..d4fc0150f 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:18:28 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:17:02 AM by AutoGen 5.11.6 * From the definitions ntpd-opts.def * and the template file options * @@ -38,7 +38,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "ntpd copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from ../sntp/include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -1016,7 +1016,7 @@ static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL static char const zDetail[7] = "\n\n"; static char const zFullVersion[] = NTPD_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -1033,6 +1033,22 @@ static char const zFullVersion[] = NTPD_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define ntpd_packager_info NULL +#else +static char const ntpd_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport ntpd bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions ntpdOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -1050,7 +1066,7 @@ tOptions ntpdOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -1063,7 +1079,7 @@ tOptions ntpdOptions = { 36 /* full option count */, 33 /* user option count */, ntpd_full_usage, ntpd_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, ntpd_packager_info }; /* @@ -1093,7 +1109,7 @@ 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 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */ @@ -1111,7 +1127,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -1155,7 +1171,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -1175,6 +1190,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = ntpdOptions.optCt; ix > 0; ix--, pOD++) diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 60bdc30f8..9a2f2cbc7 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:18:28 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:17:01 AM by AutoGen 5.11.6 * From the definitions ntpd-opts.def * and the template file options * @@ -352,7 +352,7 @@ typedef enum { 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 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 01021c752..2fba7be04 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed February 21, 2011 at 09:19:48 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 22, 2011 at 01:18:44 AM by AutoGen 5.11.6 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -129,8 +129,8 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... \ -? no help Display extended usage information and exit -! no more-help Extended usage information passed thru pager -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. The following option preset mechanisms are supported: - examining environment variables named NTPD_* diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 586f3eb65..2c9f13fb7 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" +.TH NTPD 1 2011-02-22 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed February 21, 2011 at 09:19:47 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 22, 2011 at 01:18:43 AM by AutoGen 5.11.6 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 55f368675..4f0c10fe8 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:19:59 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:18:54 AM by AutoGen 5.11.6 * From the definitions ntpdc-opts.def * and the template file options * @@ -38,7 +38,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "ntpdc copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from ../sntp/include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -461,25 +461,18 @@ static char const * const apzHomeList[3] = { static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL -static char const zDetail[618] = "\n\ -The\n\ -[= prog-name =]\n\ -utility program is used to query an NTP daemon about its\n\ -current state and to request changes in that state.\n\ -It uses NTP mode 7 control message formats described in the source code.\n\ -The program may\n\ +static char const zDetail[601] = "\n\ +The [= prog-name =] utility program is used to query an NTP daemon about\n\ +its current state and to request changes in that state. It uses NTP mode\n\ +7 control message formats described in the source code. The program may\n\ be run either in interactive mode or controlled using command line\n\ -arguments.\n\ -Extensive state and statistics information is available\n\ -through the\n\ -[= prog-name =]\n\ -interface.\n\ -In addition, nearly all the\n\ -configuration options which can be specified at startup using\n\ -ntpd's configuration file may also be specified at run time using\n\ -[= prog-name =] .\n"; +arguments. Extensive state and statistics information is available\n\ +through the [= prog-name =] interface. In addition, nearly all the\n\ +configuration options which can be specified at startup using ntpd's\n\ +configuration file may also be specified at run time using [= prog-name =]\n\ +.\n"; static char const zFullVersion[] = NTPDC_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -496,6 +489,22 @@ static char const zFullVersion[] = NTPDC_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define ntpdc_packager_info NULL +#else +static char const ntpdc_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport ntpdc bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions ntpdcOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -513,7 +522,7 @@ tOptions ntpdcOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -526,7 +535,7 @@ tOptions ntpdcOptions = { 15 /* full option count */, 10 /* user option count */, ntpdc_full_usage, ntpdc_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, ntpdc_packager_info }; /* @@ -550,11 +559,11 @@ doUsageOpt( static void doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) { - /* extracted from ../sntp/include/debug-opt.def, line 27 */ + /* extracted from debug-opt.def, line 27 */ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined(TEST_NTPDC_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */ @@ -572,7 +581,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPDC_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -616,7 +625,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -636,6 +644,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = ntpdcOptions.optCt; ix > 0; ix--, pOD++) diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index be62ee0b7..435c7f278 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:19:59 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:18:54 AM by AutoGen 5.11.6 * From the definitions ntpdc-opts.def * and the template file options * @@ -191,7 +191,7 @@ typedef enum { ntpdcOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdcOptions.pUsageProc)(&ntpdcOptions, c) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 6eb7b1c5e..0a80991e0 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed February 21, 2011 at 09:20:08 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 22, 2011 at 01:19:04 AM by AutoGen 5.11.6 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -97,30 +97,23 @@ USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] - disabled as --no-load-opts - may appear multiple times -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. The following option preset mechanisms are supported: - reading file $HOME/.ntprc - reading file ./.ntprc - examining environment variables named NTPDC_* -The -[= prog-name =] -utility program is used to query an NTP daemon about its -current state and to request changes in that state. -It uses NTP mode 7 control message formats described in the source code. -The program may +The [= prog-name =] utility program is used to query an NTP daemon about +its current state and to request changes in that state. It uses NTP mode +7 control message formats described in the source code. The program may be run either in interactive mode or controlled using command line -arguments. -Extensive state and statistics information is available -through the -[= prog-name =] -interface. -In addition, nearly all the -configuration options which can be specified at startup using -ntpd's configuration file may also be specified at run time using -[= prog-name =] . +arguments. Extensive state and statistics information is available +through the [= prog-name =] interface. In addition, nearly all the +configuration options which can be specified at startup using ntpd's +configuration file may also be specified at run time using [= prog-name =] +. please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 1c75389f4..a68bb75c4 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" +.TH NTPDC 1 2011-02-22 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed February 21, 2011 at 09:20:08 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 22, 2011 at 01:19:03 AM by AutoGen 5.11.6 .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 89549fbd6..9e6042658 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:20:09 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:05 AM by AutoGen 5.11.6 * From the definitions ntpq-opts.def * and the template file options * @@ -38,7 +38,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "ntpq copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from ../sntp/include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -438,17 +438,15 @@ static char const * const apzHomeList[3] = { static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL -static char const zDetail[389] = "\n\ -The\n\ -[= prog-name =]\n\ -utility program is used to query NTP servers which\n\ -implement the standard NTP mode 6 control message formats defined\n\ -in Appendix B of the NTPv3 specification RFC1305, requesting\n\ -information about current state and/or changes in that state.\n\ -The same formats are used in NTPv4, although some of the\n\ -variables have changed and new ones added.\n"; +static char const zDetail[384] = "\n\ +The [= prog-name =] utility program is used to query NTP servers which\n\ +implement the standard NTP mode 6 control message formats defined in\n\ +Appendix B of the NTPv3 specification RFC1305, requesting information\n\ +about current state and/or changes in that state. The same formats are\n\ +used in NTPv4, although some of the variables have changed and new ones\n\ +added.\n"; static char const zFullVersion[] = NTPQ_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -465,6 +463,22 @@ static char const zFullVersion[] = NTPQ_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define ntpq_packager_info NULL +#else +static char const ntpq_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport ntpq bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions ntpqOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -482,7 +496,7 @@ tOptions ntpqOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -495,7 +509,7 @@ tOptions ntpqOptions = { 14 /* full option count */, 9 /* user option count */, ntpq_full_usage, ntpq_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, ntpq_packager_info }; /* @@ -519,11 +533,11 @@ doUsageOpt( static void doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) { - /* extracted from ../sntp/include/debug-opt.def, line 27 */ + /* extracted from debug-opt.def, line 27 */ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined(TEST_NTPQ_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */ @@ -541,7 +555,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPQ_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -585,7 +599,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -605,6 +618,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = ntpqOptions.optCt; ix > 0; ix--, pOD++) diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 9a6867df8..8b25758df 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:20:09 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:05 AM by AutoGen 5.11.6 * From the definitions ntpq-opts.def * and the template file options * @@ -184,7 +184,7 @@ typedef enum { ntpqOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpqOptions.pUsageProc)(&ntpqOptions, c) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 938f188a0..a41198f9c 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed February 21, 2011 at 09:20:20 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 22, 2011 at 01:19:24 AM by AutoGen 5.11.6 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -79,22 +79,20 @@ USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] - disabled as --no-load-opts - may appear multiple times -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. The following option preset mechanisms are supported: - reading file $HOME/.ntprc - reading file ./.ntprc - examining environment variables named NTPQ_* -The -[= prog-name =] -utility program is used to query NTP servers which -implement the standard NTP mode 6 control message formats defined -in Appendix B of the NTPv3 specification RFC1305, requesting -information about current state and/or changes in that state. -The same formats are used in NTPv4, although some of the -variables have changed and new ones added. +The [= prog-name =] utility program is used to query NTP servers which +implement the standard NTP mode 6 control message formats defined in +Appendix B of the NTPv3 specification RFC1305, requesting information +about current state and/or changes in that state. The same formats are +used in NTPv4, although some of the variables have changed and new ones +added. please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index ae7ae693e..07a4215c7 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" +.TH NTPQ 1 2011-02-22 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed February 21, 2011 at 09:20:20 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 22, 2011 at 01:19:24 AM by AutoGen 5.11.6 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 6077865dd..59a36554f 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:20:21 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:26 AM by AutoGen 5.11.6 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -38,7 +38,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "ntpsnmpd copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from ../sntp/include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -267,7 +267,7 @@ static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL #define zDetail NULL static char const zFullVersion[] = NTPSNMPD_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -284,6 +284,22 @@ static char const zFullVersion[] = NTPSNMPD_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define ntpsnmpd_packager_info NULL +#else +static char const ntpsnmpd_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport ntpsnmpd bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions ntpsnmpdOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -302,7 +318,7 @@ tOptions ntpsnmpdOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -315,7 +331,7 @@ tOptions ntpsnmpdOptions = { 8 /* full option count */, 3 /* user option count */, ntpsnmpd_full_usage, ntpsnmpd_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, ntpsnmpd_packager_info }; /* @@ -329,7 +345,7 @@ doUsageOpt( (void)pOptions; USAGE(EXIT_SUCCESS); } -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */ @@ -347,7 +363,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPSNMPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -391,7 +407,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -411,6 +426,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = ntpsnmpdOptions.optCt; ix > 0; ix--, pOD++) diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index b205f785d..51d4d4399 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:20:21 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:26 AM by AutoGen 5.11.6 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -142,7 +142,7 @@ typedef enum { 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 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index f7fc8f81e..8f178d6b4 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed February 21, 2011 at 09:20:28 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 22, 2011 at 01:19:33 AM by AutoGen 5.11.6 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -48,8 +48,8 @@ USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... - disabled as --no-load-opts - may appear multiple times -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. The following option preset mechanisms are supported: - reading file $HOME/.ntprc diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index a47787ef2..85bf3d422 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" +.TH NTPSNMPD 1 2011-02-22 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed February 21, 2011 at 09:20:27 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 22, 2011 at 01:19:33 AM by AutoGen 5.11.6 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 5fd4f3a91..d0ea1e897 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:18:09 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:16:29 AM by AutoGen 5.11.6 * From the definitions sntp-opts.def * and the template file options * @@ -39,7 +39,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "sntp copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -654,14 +654,14 @@ static char const * const apzHomeList[3] = { static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; static char const zExplain[] = "\n\n"; static char const zDetail[351] = "\n\ -sntp implements the Simple Network Time Protocol and is used to query\n\ -an NTP or SNTP server and either display the time or set the local\n\ -system's time (given suitable privilege).\n\n\ +sntp implements the Simple Network Time Protocol and is used to query an\n\ +NTP or SNTP server and either display the time or set the local system's\n\ +time (given suitable privilege).\n\n\ It can be run interactively from the command line or as a cron job.\n\n\ NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC\n\ 1305.\n"; static char const zFullVersion[] = SNTP_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -678,6 +678,22 @@ static char const zFullVersion[] = SNTP_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define sntp_packager_info NULL +#else +static char const sntp_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport sntp bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions sntpOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -696,7 +712,7 @@ tOptions sntpOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -709,7 +725,7 @@ tOptions sntpOptions = { 24 /* full option count */, 19 /* user option count */, sntp_full_usage, sntp_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, sntp_packager_info }; /* @@ -733,7 +749,7 @@ doUsageOpt( static void doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) { - /* extracted from include/debug-opt.def, line 27 */ + /* extracted from debug-opt.def, line 27 */ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined(TEST_SNTP_OPTS) */ @@ -891,7 +907,7 @@ doOptNtpversion(tOptions* pOptions, tOptDesc* pOptDesc) } pOptDesc->optArg.argInt = val; } -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_SNTP_OPTS) /* TEST MAIN PROCEDURE: */ @@ -909,7 +925,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_SNTP_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -953,7 +969,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -973,6 +988,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = sntpOptions.optCt; ix > 0; ix--, pOD++) diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 6c29620d4..c941a6c13 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:18:09 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:16:29 AM by AutoGen 5.11.6 * From the definitions sntp-opts.def * and the template file options * @@ -276,7 +276,7 @@ typedef enum { sntpOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*sntpOptions.pUsageProc)(&sntpOptions, c) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 1e88ffbd3..094b0d1b3 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed February 21, 2011 at 09:18:24 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 22, 2011 at 01:16:55 AM by AutoGen 5.11.6 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -119,8 +119,8 @@ USAGE: sntp [ - [] | --[@{=| @}] ]... \ - disabled as --no-load-opts - may appear multiple times -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. @@ -129,9 +129,9 @@ The following option preset mechanisms are supported: - reading file ./.ntprc - examining environment variables named SNTP_* -sntp implements the Simple Network Time Protocol and is used to query -an NTP or SNTP server and either display the time or set the local -system's time (given suitable privilege). +sntp implements the Simple Network Time Protocol and is used to query an +NTP or SNTP server and either display the time or set the local system's +time (given suitable privilege). It can be run interactively from the command line or as a cron job. diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 3922aaf90..944de3536 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" +.TH SNTP 1 2011-02-22 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed February 21, 2011 at 09:18:23 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 22, 2011 at 01:16:55 AM by AutoGen 5.11.6 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index d895f8aa4..43025d9b9 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -193,8 +193,8 @@ USAGE: sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]. - disabled as --no-load-opts - may appear multiple times -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. @@ -203,9 +203,9 @@ The following option preset mechanisms are supported: - reading file ./.ntprc - examining environment variables named SNTP_* -sntp implements the Simple Network Time Protocol and is used to query -an NTP or SNTP server and either display the time or set the local -system's time (given suitable privilege). +sntp implements the Simple Network Time Protocol and is used to query an +NTP or SNTP server and either display the time or set the local system's +time (given suitable privilege). It can be run interactively from the command line or as a cron job. diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 75587c210..02c6cfa46 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed February 21, 2011 at 09:20:32 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:39 AM by AutoGen 5.11.6 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -39,7 +39,7 @@ extern "C" { cannot ever change your mind. */ tSCC zCopyright[] = "ntp-keygen copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from ../sntp/include/copyright.def near line 8 */ +/* extracted from copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -767,11 +767,11 @@ static char const * const apzHomeList[3] = { static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL -static char const zDetail[98] = "\n\ -If there is no new host key, look for an existing one.\n\ -If one is not found, create it.\n"; +static char const zDetail[99] = "\n\ +If there is no new host key, look for an existing one. If one is not\n\ +found, create it.\n"; static char const zFullVersion[] = NTP_KEYGEN_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ +/* extracted from optcode.tlib near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -788,6 +788,22 @@ static char const zFullVersion[] = NTP_KEYGEN_FULL_VERSION; # define PKGDATADIR "" #endif +#ifndef WITH_PACKAGER +# define ntp_keygen_packager_info NULL +#else +static char const ntp_keygen_packager_info[] = + "Packaged by " WITH_PACKAGER + +# ifdef WITH_PACKAGER_VERSION + " ("WITH_PACKAGER_VERSION")" +# endif + +# ifdef WITH_PACKAGER_BUG_REPORTS + "\nReport ntp_keygen bugs to " WITH_PACKAGER_BUG_REPORTS +# endif + "\n"; +#endif + tOptions ntp_keygenOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -806,7 +822,7 @@ tOptions ntp_keygenOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -819,7 +835,7 @@ tOptions ntp_keygenOptions = { 24 /* full option count */, 19 /* user option count */, ntp_keygen_full_usage, ntp_keygen_short_usage, NULL, NULL, - PKGDATADIR + PKGDATADIR, ntp_keygen_packager_info }; /* @@ -843,7 +859,7 @@ doUsageOpt( static void doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) { - /* extracted from ../sntp/include/debug-opt.def, line 27 */ + /* extracted from debug-opt.def, line 27 */ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined(TEST_NTP_KEYGEN_OPTS) */ @@ -899,7 +915,7 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc) pOptDesc->optArg.argInt = val; } #endif /* defined AUTOKEY */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from optmain.tlib near line 107 */ #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */ @@ -917,7 +933,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTP_KEYGEN_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ +/* extracted from optcode.tlib near line 657 */ #if ENABLE_NLS #include @@ -961,7 +977,6 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ 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. @@ -981,6 +996,7 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); + COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = ntp_keygenOptions.optCt; ix > 0; ix--, pOD++) diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index ea27b3e2c..50d83f3c1 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed February 21, 2011 at 09:20:32 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 22, 2011 at 01:19:39 AM by AutoGen 5.11.6 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -270,7 +270,7 @@ typedef enum { ntp_keygenOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntp_keygenOptions.pUsageProc)(&ntp_keygenOptions, c) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ +/* extracted from opthead.tlib near line 435 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 2025fc348..36f31267b 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.texi) # -# It has been AutoGen-ed February 21, 2011 at 09:20:41 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 22, 2011 at 01:19:50 AM by AutoGen 5.11.6 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -84,16 +84,16 @@ USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... - disabled as --no-load-opts - may appear multiple times -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. +Options are specified by doubled hyphens and their name or by a single +hyphen and the flag character. The following option preset mechanisms are supported: - reading file $HOME/.ntprc - reading file ./.ntprc - examining environment variables named NTP_KEYGEN_* -If there is no new host key, look for an existing one. -If one is not found, create it. +If there is no new host key, look for an existing one. If one is not +found, create it. please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 7b1bcc4c6..fd0927282 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2011-02-21 "(ntp 4.2.7p131)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2011-02-22 "(ntp 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed February 21, 2011 at 09:20:41 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 22, 2011 at 01:19:50 AM by AutoGen 5.11.6 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"