From: Harlan Stenn Date: Thu, 1 Aug 2013 02:39:32 +0000 (+0000) Subject: Upgrade to AutoGen-5.18.1pre3 X-Git-Tag: NTP_4_2_7P378~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=991048acdb28fc026802394ce4c5d8506ae3f5b3;p=thirdparty%2Fntp.git Upgrade to AutoGen-5.18.1pre3 bk: 51f9ca64Jg54s2d72v8YSgrBPvhqyg --- diff --git a/ChangeLog b/ChangeLog index 82fd89c89..783b03263 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* Upgrade to AutoGen-5.18.1pre3 * Upgrade to libopts-40.1.15. (4.2.7p377) 2013/07/28 Released by Harlan Stenn * [Bug 2397] License/copyright cleanup. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 5672e1aa9..f9728b043 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:38:54 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:31:57 AM by AutoGen 5.18.1pre3 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 0c421bf5e..17e2b0702 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:38:56 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:31:59 AM by AutoGen 5.18.1pre3 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index d178f38cc..6b6879020 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:38:58 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:32:00 AM by AutoGen 5.18.1pre3 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 976ff4079..49bed9cb3 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "28 Jul 2013" "4.2.7p377" "File Formats" +.TH ntp.conf 5man "01 Aug 2013" "4.2.7p377" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:38:39 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:02 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -27,7 +27,7 @@ Usually, it is installed in the directory, but could be installed elsewhere (see the daemon's -c + c command line option). .PP The file format is similar to other @@ -133,11 +133,11 @@ with the exception of reference clock addresses, which are always IPv4. .PP Note that in contexts where a host name is expected, a -4 + 4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a -6 + 6 qualifier forces DNS resolution to the IPv6 namespace. See IPv6 references for the equivalent classes for that address family. @@ -324,7 +324,7 @@ acquisition with the command and s addresses and when .Xr ntpd 1ntpdmdoc is started with the -q + q option. .TP .BR Cm key Ar key @@ -959,7 +959,7 @@ and .Xr ntpdc 1ntpdcmdoc when operating with symmetric key cryptography. This is the same operation as the -k + k command line option. .TP .BR Ic keysdir Ar path @@ -1995,7 +1995,7 @@ continuously and run either .Xr ntpdate 8 or .Xr ntpd 1ntpdmdoc -q + q as a cron job. In either case the servers must be configured in advance and the program fails if none are @@ -2003,7 +2003,7 @@ available when the cron job runs. A really slick application of manycast is with .Xr ntpd 1ntpdmdoc -q . + q . The program wakes up, scans the local landscape looking for the usual suspects, selects the best from among the rascals, sets the clock and then departs. @@ -2473,7 +2473,7 @@ This command specifies the complete path and name of the file used to record the frequency of the local clock oscillator. This is the same operation as the -f + f command line option. If the file exists, it is read at startup in order to set the initial frequency and then updated once per @@ -2833,7 +2833,7 @@ pulses will not be suppressed. Specify the number of megabytes of memory that can be allocated. Probably only available under Linux, this option is useful when dropping root (the -i + i option). The default is 32 megabytes. .ti -4 @@ -2892,25 +2892,6 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 14646b1d9..6eb676609 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTP_CONF 5mdoc File Formats -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:00 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:45 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2724,25 +2724,6 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 22c65d8f2..1ac5ff90b 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "28 Jul 2013" "4.2.7p377" "File Formats" +.TH ntp.conf 5 "01 Aug 2013" "4.2.7p377" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:38:39 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:02 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -27,7 +27,7 @@ Usually, it is installed in the directory, but could be installed elsewhere (see the daemon's -c + c command line option). .PP The file format is similar to other @@ -133,11 +133,11 @@ with the exception of reference clock addresses, which are always IPv4. .PP Note that in contexts where a host name is expected, a -4 + 4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a -6 + 6 qualifier forces DNS resolution to the IPv6 namespace. See IPv6 references for the equivalent classes for that address family. @@ -324,7 +324,7 @@ acquisition with the command and s addresses and when .Xr ntpd @NTPD_MS@ is started with the -q + q option. .TP .BR Cm key Ar key @@ -959,7 +959,7 @@ and .Xr ntpdc @NTPDC_MS@ when operating with symmetric key cryptography. This is the same operation as the -k + k command line option. .TP .BR Ic keysdir Ar path @@ -1995,7 +1995,7 @@ continuously and run either .Xr ntpdate 8 or .Xr ntpd @NTPD_MS@ -q + q as a cron job. In either case the servers must be configured in advance and the program fails if none are @@ -2003,7 +2003,7 @@ available when the cron job runs. A really slick application of manycast is with .Xr ntpd @NTPD_MS@ -q . + q . The program wakes up, scans the local landscape looking for the usual suspects, selects the best from among the rascals, sets the clock and then departs. @@ -2473,7 +2473,7 @@ This command specifies the complete path and name of the file used to record the frequency of the local clock oscillator. This is the same operation as the -f + f command line option. If the file exists, it is read at startup in order to set the initial frequency and then updated once per @@ -2833,7 +2833,7 @@ pulses will not be suppressed. Specify the number of megabytes of memory that can be allocated. Probably only available under Linux, this option is useful when dropping root (the -i + i option). The default is 32 megabytes. .ti -4 @@ -2892,25 +2892,6 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 5b560f327..c3d622a64 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTP_CONF 5 File Formats -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:00 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:45 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2724,25 +2724,6 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 43a223554..6ecae5cad 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "28 Jul 2013" "4.2.7p377" "File Formats" +.TH ntp.keys 5man "01 Aug 2013" "4.2.7p377" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:38:44 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:05 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -22,7 +22,7 @@ page. .PP .Xr ntpd 8 reads its keys from a file specified using the -k + k command line option or the .Ic keys statement in the configuration file. @@ -96,25 +96,6 @@ and programs are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in ASCII format. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH FILES .TP .BR Pa /etc/ntp.keys diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index f8b4f1020..e491fd58a 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTP_KEYS 5mdoc File Formats -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:04 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:50 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -112,25 +112,6 @@ by loading values from environment variables named: \fBNTP_KEYS_\fP or \fBNTP_KEYS\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index bbfa599e2..eb18c863c 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "28 Jul 2013" "4.2.7p377" "File Formats" +.TH ntp.keys 5 "01 Aug 2013" "4.2.7p377" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:38:44 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:05 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -22,7 +22,7 @@ page. .PP .Xr ntpd 8 reads its keys from a file specified using the -k + k command line option or the .Ic keys statement in the configuration file. @@ -96,25 +96,6 @@ and programs are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in ASCII format. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH FILES .TP .BR Pa /etc/ntp.keys diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index ea96bd7c2..ab423280d 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTP_KEYS 5 File Formats -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:04 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:50 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -112,25 +112,6 @@ by loading values from environment variables named: \fBNTP_KEYS_\fP or \fBNTP_KEYS\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index fbe1c0573..cdb868797 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed July 28, 2013 at 11:37:47 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:31:35 AM by AutoGen 5.18.1pre3 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -1542,10 +1542,10 @@ translate_option_strings(void) static void bogus_function(void) { /* TRANSLATORS: - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the ntpdOptions structure noted in the comments below. The - literal text is defined in ntpd_opt_strs. + The following dummy function was crated solely so that xgettext can + extract the correct strings. These strings are actually referenced + by a field name in the ntpdOptions structure noted in the + comments below. The literal text is defined in ntpd_opt_strs. NOTE: the strings below are segmented with respect to the source string ntpd_opt_strs. The strings above are handed off for translation @@ -1710,9 +1710,9 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ /* referenced via ntpdOptions.pzShortUsage */ puts(_("<<>>")); /* LIBOPTS-MESSAGES: */ -#line 45 "../autoopts.c" +#line 67 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); -#line 71 "../autoopts.c" +#line 93 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); @@ -1721,7 +1721,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ #line 88 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); -#line 58 "../autoopts.c" +#line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); #line 92 "../init.c" puts(_("\tThis is less than the minimum library version: ")); @@ -1736,9 +1736,9 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("could not locate the 'help' option")); #line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 747 "../usage.c" +#line 748 "../usage.c" puts(_("invalid argument type specified")); -#line 589 "../find.c" +#line 598 "../find.c" puts(_("defaulted to option with optional arg")); #line 76 "../alias.c" puts(_("aliasing option is out of range.")); @@ -1746,7 +1746,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("%s error: the keyword '%s' is ambiguous for %s\n")); #line 108 "../find.c" puts(_(" The following options match:\n")); -#line 290 "../find.c" +#line 293 "../find.c" puts(_("%s: ambiguous option name: %s (matches %d options)\n")); #line 161 "../check.c" puts(_("%s: Command line arguments required\n")); @@ -1763,42 +1763,42 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ "\t'n' - version and full copyright notice\n")); #line 58 "../check.c" puts(_("%s error: the '%s' and '%s' options conflict\n")); -#line 214 "../find.c" +#line 217 "../find.c" puts(_("%s: The '%s' option has been disabled.")); -#line 421 "../find.c" +#line 430 "../find.c" puts(_("%s: The '%s' option has been disabled.")); #line 38 "../alias.c" puts(_("-equivalence")); -#line 460 "../find.c" +#line 469 "../find.c" puts(_("%s: illegal option -- %c\n")); #line 110 "../reset.c" puts(_("%s: illegal option -- %c\n")); -#line 268 "../find.c" +#line 271 "../find.c" puts(_("%s: illegal option -- %s\n")); -#line 746 "../find.c" +#line 755 "../find.c" puts(_("%s: illegal option -- %s\n")); #line 118 "../reset.c" puts(_("%s: illegal option -- %s\n")); -#line 332 "../find.c" +#line 335 "../find.c" puts(_("%s: unknown vendor extension option -- %s\n")); #line 159 "../enum.c" puts(_(" or an integer from %d through %d\n")); #line 169 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 746 "../usage.c" +#line 747 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1080 "../usage.c" +#line 1081 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 379 "../find.c" +#line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); -#line 518 "../find.c" +#line 527 "../find.c" puts(_("%s: The '%s' option requires an argument.\n")); #line 156 "../autoopts.c" puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n" "\t'%s' and '%s'.")); #line 94 "../check.c" puts(_("%s error: The %s option is required\n")); -#line 623 "../find.c" +#line 632 "../find.c" puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); @@ -1828,7 +1828,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("%s error: '%s' is not a recognizable number.\n")); #line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 329 "../usage.c" +#line 330 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); @@ -1838,17 +1838,17 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("standard output")); #line 274 "../usage.c" puts(_("standard output")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard output")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); #line 274 "../usage.c" puts(_("standard error")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard error")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); @@ -1858,9 +1858,9 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("write")); #line 273 "../usage.c" puts(_("write")); -#line 413 "../usage.c" +#line 414 "../usage.c" puts(_("write")); -#line 623 "../usage.c" +#line 624 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -1881,29 +1881,29 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 872 "../usage.c" +#line 873 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1147 "../usage.c" +#line 1148 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 923 "../usage.c" +#line 924 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 836 "../usage.c" +#line 837 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1116 "../usage.c" +#line 1117 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1114 "../usage.c" +#line 1115 "../usage.c" puts(_("This option has been disabled")); -#line 863 "../usage.c" +#line 864 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1193 "../usage.c" +#line 1194 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 379 "../usage.c" +#line 380 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); #line 916 "../makeshell.c" @@ -1913,33 +1913,33 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ "a shell script to parse the options for %s:\n\n")); #line 166 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 896 "../usage.c" +#line 897 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 917 "../usage.c" +#line 918 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 381 "../usage.c" +#line 382 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 903 "../usage.c" +#line 904 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 890 "../usage.c" +#line 891 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1308 "../usage.c" +#line 1309 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1244 "../usage.c" - puts(_(" Flg Arg Option-Name Description\n")); -#line 1302 "../usage.c" +#line 1245 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); #line 1303 "../usage.c" + puts(_(" Flg Arg Option-Name Description\n")); +#line 1304 "../usage.c" puts(_(" %3s %s")); -#line 1309 "../usage.c" +#line 1310 "../usage.c" puts(_(" %3s %s")); -#line 386 "../usage.c" +#line 387 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 382 "../usage.c" +#line 383 "../usage.c" puts(_("All arguments are named options.\n")); -#line 970 "../usage.c" +#line 971 "../usage.c" puts(_(" - reading file %s")); -#line 408 "../usage.c" +#line 409 "../usage.c" puts(_("\n" "Please send bug reports to: <%s>\n")); #line 100 "../version.c" @@ -1948,17 +1948,17 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ #line 129 "../version.c" puts(_("\n" "Please send bug reports to: <%s>\n")); -#line 902 "../usage.c" +#line 903 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 943 "../usage.c" +#line 944 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1191 "../usage.c" +#line 1192 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 681 "../usage.c" +#line 682 "../usage.c" puts(_("prohibits these options:\n")); -#line 676 "../usage.c" +#line 677 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -1976,28 +1976,28 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 389 "../usage.c" +#line 390 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 651 "../usage.c" +#line 652 "../usage.c" puts(_("requires the option '%s'\n")); -#line 654 "../usage.c" +#line 655 "../usage.c" puts(_("requires these options:\n")); -#line 1320 "../usage.c" +#line 1321 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1314 "../usage.c" +#line 1315 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); #line 167 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 909 "../usage.c" +#line 910 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); #line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1151 "../usage.c" +#line 1152 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 772 "../usage.c" +#line 773 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 491fd8e50..c03c39d84 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed July 28, 2013 at 11:37:45 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:31:35 AM by AutoGen 5.18.1pre3 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 159744 +#define AO_TEMPLATE_VERSION 163841 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index bc31fd7c8..a2bd457b9 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpd 1ntpdman "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:38:49 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:07 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -58,7 +58,7 @@ NetInfo if the default .Xr ntp.conf 5 file cannot be read and no file is specified by the -c + c option. .PP Various internal @@ -84,7 +84,7 @@ will set the to 022. .SH "OPTIONS" .TP -.BR \-4 ", " \-\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -92,7 +92,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " \-\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -100,7 +100,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-a ", " \-\-authreq +.BR \-a ", " \-\-authreq Require crypto authentication. This option must not appear in combination with any of the following options: authnoreq. @@ -109,7 +109,7 @@ Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is the default. .TP -.BR \-A ", " \-\-authnoreq +.BR \-A ", " \-\-authnoreq Do not require crypto authentication. This option must not appear in combination with any of the following options: authreq. @@ -118,29 +118,29 @@ Do not require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is almost never a good idea. .TP -.BR \-b ", " \-\-bcastsync +.BR \-b ", " \-\-bcastsync Allow us to sync to broadcast servers. .sp .TP -.BR \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP +.BR \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP configuration file name. .sp The name and path of the configuration file, \fI/etc/ntp.conf\fP by default. .TP -.BR \-d ", " \-\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP +.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP +.BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP frequency drift file name. .sp The name and path of the frequency file, @@ -152,7 +152,7 @@ configuration specification in the \fI/etc/ntp.conf\fP file. .TP -.BR \-g ", " \-\-panicgate +.BR \-g ", " \-\-panicgate Allow the first adjustment to be Big. This option may appear an unlimited number of times. .sp @@ -169,7 +169,7 @@ See the \fBtinker\fP configuration file directive for other options. .TP -.BR \-i " \fIstring\fP, " \-\-jaildir "=" \fIstring\fP +.BR \-i " \fIstring\fP, " \-\-jaildir "=" \fIstring\fP Jail directory. .sp Chroot the server to the directory @@ -185,7 +185,7 @@ This option is supported under NetBSD (configure with \fB--enable-clockctl\fP) and Linux (configure with \fB--enable-linuxcaps\fP). .TP -.BR \-I " \fIiface\fP, " \-\-interface "=" \fIiface\fP +.BR \-I " \fIiface\fP, " \-\-interface "=" \fIiface\fP Listen on an interface name or address. This option may appear an unlimited number of times. .sp @@ -195,7 +195,7 @@ also implies not opening other addresses, except wildcard and localhost. This option is deprecated. Please consider using the configuration file \fBinterface\fP command, which is more versatile. .TP -.BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP +.BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP path to symmetric keys. .sp Specify the name and path of the symmetric key file. @@ -205,7 +205,7 @@ This is the same operation as the \fBkeys\fP \fIkeyfile\fP configuration file directive. .TP -.BR \-l " \fIstring\fP, " \-\-logfile "=" \fIstring\fP +.BR \-l " \fIstring\fP, " \-\-logfile "=" \fIstring\fP path to the log file. .sp Specify the name and path of the log file. @@ -214,7 +214,7 @@ This is the same operation as the \fBlogfile\fP \fIlogfile\fP configuration file directive. .TP -.BR \-L ", " \-\-novirtualips +.BR \-L ", " \-\-novirtualips Do not listen to virtual interfaces. .sp Do not listen to virtual interfaces, defined as those with @@ -222,27 +222,27 @@ names containing a colon. This option is deprecated. Please consider using the configuration file \fBinterface\fP command, which is more versatile. .TP -.BR \-M ", " \-\-modifymmtimer +.BR \-M ", " \-\-modifymmtimer Modify Multimedia Timer (Windows only). .sp Set the Windows Multimedia Timer to highest resolution. This ensures the resolution does not change while ntpd is running, avoiding timekeeping glitches associated with changes. .TP -.BR \-n ", " \-\-nofork +.BR \-n ", " \-\-nofork Do not fork. This option must not appear in combination with any of the following options: wait-sync. .sp .TP -.BR \-N ", " \-\-nice +.BR \-N ", " \-\-nice Run at high priority. .sp To the extent permitted by the operating system, run \fBntpd\fP at the highest priority. .TP -.BR \-p " \fIstring\fP, " \-\-pidfile "=" \fIstring\fP +.BR \-p " \fIstring\fP, " \-\-pidfile "=" \fIstring\fP path to the PID file. .sp Specify the name and path of the file used to record @@ -252,7 +252,7 @@ This is the same operation as the \fBpidfile\fP \fIpidfile\fP configuration file directive. .TP -.BR \-P " \fInumber\fP, " \-\-priority "=" \fInumber\fP +.BR \-P " \fInumber\fP, " \-\-priority "=" \fInumber\fP Process priority. This option takes an integer number as its argument. .sp @@ -262,7 +262,7 @@ at the specified \fBsched_setscheduler(SCHED_FIFO)\fP priority. .TP -.BR \-q ", " \-\-quit +.BR \-q ", " \-\-quit Set the time and quit. This option must not appear in combination with any of the following options: saveconfigquit, wait-sync. @@ -279,12 +279,12 @@ and options can be used with this option. Note: The kernel time discipline is disabled with this option. .TP -.BR \-r " \fIstring\fP, " \-\-propagationdelay "=" \fIstring\fP +.BR \-r " \fIstring\fP, " \-\-propagationdelay "=" \fIstring\fP Broadcast/propagation delay. .sp Specify the default propagation delay from the broadcast/multicast server to this client. This is necessary only if the delay cannot be computed automatically by the protocol. .TP -.BR \-\-saveconfigquit "=\fIstring\fP" +.BR \-\-saveconfigquit "=\fIstring\fP" Save parsed configuration and quit. This option must not appear in combination with any of the following options: quit, wait-sync. @@ -293,7 +293,7 @@ Cause \fBntpd\fP to parse its startup configuration file and save an equivalent to the given filename and exit. This option was designed for automated testing. .TP -.BR \-s " \fIstring\fP, " \-\-statsdir "=" \fIstring\fP +.BR \-s " \fIstring\fP, " \-\-statsdir "=" \fIstring\fP Statistics file location. .sp Specify the directory path for files created by the statistics facility. @@ -301,13 +301,13 @@ This is the same operation as the \fBstatsdir\fP \fIstatsdir\fP configuration file directive. .TP -.BR \-t " \fItkey\fP, " \-\-trustedkey "=" \fItkey\fP +.BR \-t " \fItkey\fP, " \-\-trustedkey "=" \fItkey\fP Trusted key number. This option may appear an unlimited number of times. .sp Add the specified key number to the trusted key list. .TP -.BR \-u " \fIstring\fP, " \-\-user "=" \fIstring\fP +.BR \-u " \fIstring\fP, " \-\-user "=" \fIstring\fP Run as userid (or userid:groupid). .sp Specify a user, and optionally a group, to switch to. @@ -317,7 +317,7 @@ This option is supported under NetBSD (configure with \fB--enable-clockctl\fP) and Linux (configure with \fB--enable-linuxcaps\fP). .TP -.BR \-U " \fInumber\fP, " \-\-updateinterval "=" \fInumber\fP +.BR \-U " \fInumber\fP, " \-\-updateinterval "=" \fInumber\fP interval in seconds between scans for new or dropped interfaces. This option takes an integer number as its argument. .sp @@ -326,17 +326,17 @@ For systems with routing socket support the scans will be performed shortly afte has been detected by the system. Use 0 to disable scanning. 60 seconds is the minimum time between scans. .TP -.BR \-\-var "=\fInvar\fP" +.BR \-\-var "=\fInvar\fP" make ARG an ntp variable (RW). This option may appear an unlimited number of times. .sp .TP -.BR \-\-dvar "=\fIndvar\fP" +.BR \-\-dvar "=\fIndvar\fP" make ARG an ntp variable (RW|DEF). This option may appear an unlimited number of times. .sp .TP -.BR \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP +.BR \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP Seconds to wait for first clock sync. This option must not appear in combination with any of the following options: nofork, quit, saveconfigquit. @@ -351,7 +351,7 @@ otherwise it is \fBETIMEDOUT\fP. This provides the option for a script starting \fBntpd\fP to easily wait for the first set of the clock before proceeding. .TP -.BR \-x ", " \-\-slew +.BR \-x ", " \-\-slew Slew up to 600 seconds. .sp Normally, the time is slewed if the offset is less than the step threshold, which is 128 ms by default, and stepped if above the threshold. @@ -368,7 +368,7 @@ See the configuration file directive for other options. Note: The kernel time discipline is disabled with this option. .TP -.BR \-\-usepcc +.BR \-\-usepcc Use CPU cycle counter (Windows only). .sp Attempt to substitute the CPU counter for \fBQueryPerformanceCounter\fP. @@ -376,14 +376,14 @@ The CPU counter and \fBQueryPerformanceCounter\fP are compared, and if they have the same frequency, the CPU counter (RDTSC on x86) is used directly, saving the overhead of a system call. .TP -.BR \-\-pccfreq "=\fIstring\fP" +.BR \-\-pccfreq "=\fIstring\fP" Force CPU cycle counter use (Windows only). .sp Force substitution the CPU counter for \fBQueryPerformanceCounter\fP. The CPU counter (RDTSC on x86) is used unconditionally with the given frequency (in Hz). .TP -.BR \-m ", " \-\-mdns +.BR \-m ", " \-\-mdns Register with mDNS as a NTP server. .sp Registers as an NTP server with the local mDNS server which allows @@ -406,25 +406,6 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE .SS "How NTP Operates" The @@ -474,7 +455,7 @@ This causes to exit with a panic message to the system log. The -g + g option overrides this check and the clock will be set to the server time regardless of the chip time (up to 68 years in the past or future \(em @@ -519,13 +500,13 @@ in the future relative to the server. In some applications, this behavior may be unacceptable. There are several solutions, however. If the -x + x option is included on the command line, the clock will never be stepped and only slew corrections will be used. But this choice comes with a cost that should be carefully explored before deciding to use the -x + x option. The maximum slew rate possible is limited to 500 parts-per-million (PPM) as a consequence of the correctness @@ -593,9 +574,9 @@ be stable in under 11 seconds' time. As soon as possible in the startup sequence, start .Xr ntpd 1ntpdmdoc with at least the -g + g and perhaps the -N + N options. Then, start the rest of your "normal" processes. @@ -613,7 +594,7 @@ run .Xr ntp-wait 1ntp-waitmdoc as late as possible in the boot sequence (perhaps with the -v + v flag) and after .Xr ntp-wait 1ntp-waitmdoc @@ -707,7 +688,7 @@ However, this program does not have the crafted signal processing, error checking and mitigation algorithms of .B . The -q + q option is intended for this purpose. Setting this option will cause .B diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 2aae56d66..9d48d9ae0 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPD 1ntpdmdoc User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:05 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:53 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -375,25 +375,6 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE .Ss "How NTP Operates" The diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in index 1f2b6cddc..46398aab5 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpd @NTPD_MS@ "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:38:49 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:07 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -58,7 +58,7 @@ NetInfo if the default .Xr ntp.conf 5 file cannot be read and no file is specified by the -c + c option. .PP Various internal @@ -84,7 +84,7 @@ will set the to 022. .SH "OPTIONS" .TP -.BR \-4 ", " \-\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -92,7 +92,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " \-\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -100,7 +100,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-a ", " \-\-authreq +.BR \-a ", " \-\-authreq Require crypto authentication. This option must not appear in combination with any of the following options: authnoreq. @@ -109,7 +109,7 @@ Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is the default. .TP -.BR \-A ", " \-\-authnoreq +.BR \-A ", " \-\-authnoreq Do not require crypto authentication. This option must not appear in combination with any of the following options: authreq. @@ -118,29 +118,29 @@ Do not require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is almost never a good idea. .TP -.BR \-b ", " \-\-bcastsync +.BR \-b ", " \-\-bcastsync Allow us to sync to broadcast servers. .sp .TP -.BR \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP +.BR \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP configuration file name. .sp The name and path of the configuration file, \fI/etc/ntp.conf\fP by default. .TP -.BR \-d ", " \-\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP +.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP +.BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP frequency drift file name. .sp The name and path of the frequency file, @@ -152,7 +152,7 @@ configuration specification in the \fI/etc/ntp.conf\fP file. .TP -.BR \-g ", " \-\-panicgate +.BR \-g ", " \-\-panicgate Allow the first adjustment to be Big. This option may appear an unlimited number of times. .sp @@ -169,7 +169,7 @@ See the \fBtinker\fP configuration file directive for other options. .TP -.BR \-i " \fIstring\fP, " \-\-jaildir "=" \fIstring\fP +.BR \-i " \fIstring\fP, " \-\-jaildir "=" \fIstring\fP Jail directory. .sp Chroot the server to the directory @@ -185,7 +185,7 @@ This option is supported under NetBSD (configure with \fB--enable-clockctl\fP) and Linux (configure with \fB--enable-linuxcaps\fP). .TP -.BR \-I " \fIiface\fP, " \-\-interface "=" \fIiface\fP +.BR \-I " \fIiface\fP, " \-\-interface "=" \fIiface\fP Listen on an interface name or address. This option may appear an unlimited number of times. .sp @@ -195,7 +195,7 @@ also implies not opening other addresses, except wildcard and localhost. This option is deprecated. Please consider using the configuration file \fBinterface\fP command, which is more versatile. .TP -.BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP +.BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP path to symmetric keys. .sp Specify the name and path of the symmetric key file. @@ -205,7 +205,7 @@ This is the same operation as the \fBkeys\fP \fIkeyfile\fP configuration file directive. .TP -.BR \-l " \fIstring\fP, " \-\-logfile "=" \fIstring\fP +.BR \-l " \fIstring\fP, " \-\-logfile "=" \fIstring\fP path to the log file. .sp Specify the name and path of the log file. @@ -214,7 +214,7 @@ This is the same operation as the \fBlogfile\fP \fIlogfile\fP configuration file directive. .TP -.BR \-L ", " \-\-novirtualips +.BR \-L ", " \-\-novirtualips Do not listen to virtual interfaces. .sp Do not listen to virtual interfaces, defined as those with @@ -222,27 +222,27 @@ names containing a colon. This option is deprecated. Please consider using the configuration file \fBinterface\fP command, which is more versatile. .TP -.BR \-M ", " \-\-modifymmtimer +.BR \-M ", " \-\-modifymmtimer Modify Multimedia Timer (Windows only). .sp Set the Windows Multimedia Timer to highest resolution. This ensures the resolution does not change while ntpd is running, avoiding timekeeping glitches associated with changes. .TP -.BR \-n ", " \-\-nofork +.BR \-n ", " \-\-nofork Do not fork. This option must not appear in combination with any of the following options: wait-sync. .sp .TP -.BR \-N ", " \-\-nice +.BR \-N ", " \-\-nice Run at high priority. .sp To the extent permitted by the operating system, run \fBntpd\fP at the highest priority. .TP -.BR \-p " \fIstring\fP, " \-\-pidfile "=" \fIstring\fP +.BR \-p " \fIstring\fP, " \-\-pidfile "=" \fIstring\fP path to the PID file. .sp Specify the name and path of the file used to record @@ -252,7 +252,7 @@ This is the same operation as the \fBpidfile\fP \fIpidfile\fP configuration file directive. .TP -.BR \-P " \fInumber\fP, " \-\-priority "=" \fInumber\fP +.BR \-P " \fInumber\fP, " \-\-priority "=" \fInumber\fP Process priority. This option takes an integer number as its argument. .sp @@ -262,7 +262,7 @@ at the specified \fBsched_setscheduler(SCHED_FIFO)\fP priority. .TP -.BR \-q ", " \-\-quit +.BR \-q ", " \-\-quit Set the time and quit. This option must not appear in combination with any of the following options: saveconfigquit, wait-sync. @@ -279,12 +279,12 @@ and options can be used with this option. Note: The kernel time discipline is disabled with this option. .TP -.BR \-r " \fIstring\fP, " \-\-propagationdelay "=" \fIstring\fP +.BR \-r " \fIstring\fP, " \-\-propagationdelay "=" \fIstring\fP Broadcast/propagation delay. .sp Specify the default propagation delay from the broadcast/multicast server to this client. This is necessary only if the delay cannot be computed automatically by the protocol. .TP -.BR \-\-saveconfigquit "=\fIstring\fP" +.BR \-\-saveconfigquit "=\fIstring\fP" Save parsed configuration and quit. This option must not appear in combination with any of the following options: quit, wait-sync. @@ -293,7 +293,7 @@ Cause \fBntpd\fP to parse its startup configuration file and save an equivalent to the given filename and exit. This option was designed for automated testing. .TP -.BR \-s " \fIstring\fP, " \-\-statsdir "=" \fIstring\fP +.BR \-s " \fIstring\fP, " \-\-statsdir "=" \fIstring\fP Statistics file location. .sp Specify the directory path for files created by the statistics facility. @@ -301,13 +301,13 @@ This is the same operation as the \fBstatsdir\fP \fIstatsdir\fP configuration file directive. .TP -.BR \-t " \fItkey\fP, " \-\-trustedkey "=" \fItkey\fP +.BR \-t " \fItkey\fP, " \-\-trustedkey "=" \fItkey\fP Trusted key number. This option may appear an unlimited number of times. .sp Add the specified key number to the trusted key list. .TP -.BR \-u " \fIstring\fP, " \-\-user "=" \fIstring\fP +.BR \-u " \fIstring\fP, " \-\-user "=" \fIstring\fP Run as userid (or userid:groupid). .sp Specify a user, and optionally a group, to switch to. @@ -317,7 +317,7 @@ This option is supported under NetBSD (configure with \fB--enable-clockctl\fP) and Linux (configure with \fB--enable-linuxcaps\fP). .TP -.BR \-U " \fInumber\fP, " \-\-updateinterval "=" \fInumber\fP +.BR \-U " \fInumber\fP, " \-\-updateinterval "=" \fInumber\fP interval in seconds between scans for new or dropped interfaces. This option takes an integer number as its argument. .sp @@ -326,17 +326,17 @@ For systems with routing socket support the scans will be performed shortly afte has been detected by the system. Use 0 to disable scanning. 60 seconds is the minimum time between scans. .TP -.BR \-\-var "=\fInvar\fP" +.BR \-\-var "=\fInvar\fP" make ARG an ntp variable (RW). This option may appear an unlimited number of times. .sp .TP -.BR \-\-dvar "=\fIndvar\fP" +.BR \-\-dvar "=\fIndvar\fP" make ARG an ntp variable (RW|DEF). This option may appear an unlimited number of times. .sp .TP -.BR \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP +.BR \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP Seconds to wait for first clock sync. This option must not appear in combination with any of the following options: nofork, quit, saveconfigquit. @@ -351,7 +351,7 @@ otherwise it is \fBETIMEDOUT\fP. This provides the option for a script starting \fBntpd\fP to easily wait for the first set of the clock before proceeding. .TP -.BR \-x ", " \-\-slew +.BR \-x ", " \-\-slew Slew up to 600 seconds. .sp Normally, the time is slewed if the offset is less than the step threshold, which is 128 ms by default, and stepped if above the threshold. @@ -368,7 +368,7 @@ See the configuration file directive for other options. Note: The kernel time discipline is disabled with this option. .TP -.BR \-\-usepcc +.BR \-\-usepcc Use CPU cycle counter (Windows only). .sp Attempt to substitute the CPU counter for \fBQueryPerformanceCounter\fP. @@ -376,14 +376,14 @@ The CPU counter and \fBQueryPerformanceCounter\fP are compared, and if they have the same frequency, the CPU counter (RDTSC on x86) is used directly, saving the overhead of a system call. .TP -.BR \-\-pccfreq "=\fIstring\fP" +.BR \-\-pccfreq "=\fIstring\fP" Force CPU cycle counter use (Windows only). .sp Force substitution the CPU counter for \fBQueryPerformanceCounter\fP. The CPU counter (RDTSC on x86) is used unconditionally with the given frequency (in Hz). .TP -.BR \-m ", " \-\-mdns +.BR \-m ", " \-\-mdns Register with mDNS as a NTP server. .sp Registers as an NTP server with the local mDNS server which allows @@ -406,25 +406,6 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE .SS "How NTP Operates" The @@ -474,7 +455,7 @@ This causes to exit with a panic message to the system log. The -g + g option overrides this check and the clock will be set to the server time regardless of the chip time (up to 68 years in the past or future \(em @@ -519,13 +500,13 @@ in the future relative to the server. In some applications, this behavior may be unacceptable. There are several solutions, however. If the -x + x option is included on the command line, the clock will never be stepped and only slew corrections will be used. But this choice comes with a cost that should be carefully explored before deciding to use the -x + x option. The maximum slew rate possible is limited to 500 parts-per-million (PPM) as a consequence of the correctness @@ -593,9 +574,9 @@ be stable in under 11 seconds' time. As soon as possible in the startup sequence, start .Xr ntpd @NTPD_MS@ with at least the -g + g and perhaps the -N + N options. Then, start the rest of your "normal" processes. @@ -613,7 +594,7 @@ run .Xr ntp-wait @NTP_WAIT_MS@ as late as possible in the boot sequence (perhaps with the -v + v flag) and after .Xr ntp-wait @NTP_WAIT_MS@ @@ -707,7 +688,7 @@ However, this program does not have the crafted signal processing, error checking and mitigation algorithms of .B . The -q + q option is intended for this purpose. Setting this option will cause .B diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in index 8100be5c7..176202fa7 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPD @NTPD_MS@ User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:05 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:53 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -375,25 +375,6 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE .Ss "How NTP Operates" The diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index c3ecfd8bf..407278dbe 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c) * - * It has been AutoGen-ed February 21, 2013 at 09:23:11 PM by AutoGen 5.17.2pre17 + * It has been AutoGen-ed August 1, 2013 at 02:05:43 AM by AutoGen 5.18.1pre3 * From the definitions ntpdsim-opts.def * and the template file options * - * Generated from AutoOpts 38:0:13 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -71,11 +71,11 @@ extern FILE * option_usage_fp; # define NULL 0 #endif -/* - * ntpdsim option static const strings +/** + * static const strings for ntpdsim options */ static char const ntpdsim_opt_strs[3099] = -/* 0 */ "ntpdsim 4.2.7p356\n" +/* 0 */ "ntpdsim 4.2.7p377\n" "Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -207,169 +207,238 @@ static char const ntpdsim_opt_strs[3099] = /* 2891 */ "no-load-opts\0" /* 2904 */ "no\0" /* 2907 */ "NTPDSIM\0" -/* 2915 */ "ntpdsim - NTP daemon simulation program - Ver. 4.2.7p356\n" +/* 2915 */ "ntpdsim - NTP daemon simulation program - Ver. 4.2.7p377\n" "Usage: %s [ - [] | --[{=| }] ]...\n\0" /* 3030 */ "$HOME\0" /* 3036 */ ".\0" /* 3038 */ ".ntprc\0" /* 3045 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3079 */ "\n\0" -/* 3081 */ "ntpdsim 4.2.7p356"; +/* 3081 */ "ntpdsim 4.2.7p377"; -/* +/** * ipv4 option description with * "Must also have options" and "Incompatible options": */ +/** Descriptive text for the ipv4 option */ #define IPV4_DESC (ntpdsim_opt_strs+957) +/** Upper-cased name for the ipv4 option */ #define IPV4_NAME (ntpdsim_opt_strs+988) +/** Name string for the ipv4 option */ #define IPV4_name (ntpdsim_opt_strs+993) +/** Other options that appear in conjunction with the ipv4 option */ static int const aIpv4CantList[] = { INDEX_OPT_IPV6, NO_EQUIVALENT }; +/** Compiled in flag settings for the ipv4 option */ #define IPV4_FLAGS (OPTST_DISABLED) -/* +/** * ipv6 option description with * "Must also have options" and "Incompatible options": */ +/** Descriptive text for the ipv6 option */ #define IPV6_DESC (ntpdsim_opt_strs+998) +/** Upper-cased name for the ipv6 option */ #define IPV6_NAME (ntpdsim_opt_strs+1029) +/** Name string for the ipv6 option */ #define IPV6_name (ntpdsim_opt_strs+1034) +/** Other options that appear in conjunction with the ipv6 option */ static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; +/** Compiled in flag settings for the ipv6 option */ #define IPV6_FLAGS (OPTST_DISABLED) -/* +/** * authreq option description with * "Must also have options" and "Incompatible options": */ +/** Descriptive text for the authreq option */ #define AUTHREQ_DESC (ntpdsim_opt_strs+1039) +/** Upper-cased name for the authreq option */ #define AUTHREQ_NAME (ntpdsim_opt_strs+1069) +/** Name string for the authreq option */ #define AUTHREQ_name (ntpdsim_opt_strs+1077) +/** Other options that appear in conjunction with the authreq option */ static int const aAuthreqCantList[] = { INDEX_OPT_AUTHNOREQ, NO_EQUIVALENT }; +/** Compiled in flag settings for the authreq option */ #define AUTHREQ_FLAGS (OPTST_DISABLED) -/* +/** * authnoreq option description with * "Must also have options" and "Incompatible options": */ +/** Descriptive text for the authnoreq option */ #define AUTHNOREQ_DESC (ntpdsim_opt_strs+1085) +/** Upper-cased name for the authnoreq option */ #define AUTHNOREQ_NAME (ntpdsim_opt_strs+1122) +/** Name string for the authnoreq option */ #define AUTHNOREQ_name (ntpdsim_opt_strs+1132) +/** Other options that appear in conjunction with the authnoreq option */ static int const aAuthnoreqCantList[] = { INDEX_OPT_AUTHREQ, NO_EQUIVALENT }; +/** Compiled in flag settings for the authnoreq option */ #define AUTHNOREQ_FLAGS (OPTST_DISABLED) -/* +/** * bcastsync option description: */ +/** Descriptive text for the bcastsync option */ #define BCASTSYNC_DESC (ntpdsim_opt_strs+1142) +/** Upper-cased name for the bcastsync option */ #define BCASTSYNC_NAME (ntpdsim_opt_strs+1180) +/** Name string for the bcastsync option */ #define BCASTSYNC_name (ntpdsim_opt_strs+1190) +/** Compiled in flag settings for the bcastsync option */ #define BCASTSYNC_FLAGS (OPTST_DISABLED) -/* +/** * configfile option description: */ +/** Descriptive text for the configfile option */ #define CONFIGFILE_DESC (ntpdsim_opt_strs+1200) +/** Upper-cased name for the configfile option */ #define CONFIGFILE_NAME (ntpdsim_opt_strs+1224) +/** Name string for the configfile option */ #define CONFIGFILE_name (ntpdsim_opt_strs+1235) +/** Compiled in flag settings for the configfile option */ #define CONFIGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * debug-level option description: */ +/** Descriptive text for the debug-level option */ #define DEBUG_LEVEL_DESC (ntpdsim_opt_strs+1246) +/** Upper-cased name for the debug-level option */ #define DEBUG_LEVEL_NAME (ntpdsim_opt_strs+1277) +/** Name string for the debug-level option */ #define DEBUG_LEVEL_name (ntpdsim_opt_strs+1289) +/** Compiled in flag settings for the debug-level option */ #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) -/* +/** * set-debug-level option description: */ +/** Descriptive text for the set-debug-level option */ #define SET_DEBUG_LEVEL_DESC (ntpdsim_opt_strs+1301) +/** Upper-cased name for the set-debug-level option */ #define SET_DEBUG_LEVEL_NAME (ntpdsim_opt_strs+1331) +/** Name string for the set-debug-level option */ #define SET_DEBUG_LEVEL_name (ntpdsim_opt_strs+1347) +/** Compiled in flag settings for the set-debug-level option */ #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/* +/** * driftfile option description: */ +/** Descriptive text for the driftfile option */ #define DRIFTFILE_DESC (ntpdsim_opt_strs+1363) +/** Upper-cased name for the driftfile option */ #define DRIFTFILE_NAME (ntpdsim_opt_strs+1389) +/** Name string for the driftfile option */ #define DRIFTFILE_name (ntpdsim_opt_strs+1399) +/** Compiled in flag settings for the driftfile option */ #define DRIFTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * panicgate option description: */ +/** Descriptive text for the panicgate option */ #define PANICGATE_DESC (ntpdsim_opt_strs+1409) +/** Upper-cased name for the panicgate option */ #define PANICGATE_NAME (ntpdsim_opt_strs+1446) +/** Name string for the panicgate option */ #define PANICGATE_name (ntpdsim_opt_strs+1456) +/** Compiled in flag settings for the panicgate option */ #define PANICGATE_FLAGS (OPTST_DISABLED) -/* +/** * jaildir option description: */ #ifdef HAVE_DROPROOT +/** Descriptive text for the jaildir option */ #define JAILDIR_DESC (ntpdsim_opt_strs+1466) +/** Upper-cased name for the jaildir option */ #define JAILDIR_NAME (ntpdsim_opt_strs+1481) +/** Name string for the jaildir option */ #define JAILDIR_name (ntpdsim_opt_strs+1489) +/** Compiled in flag settings for the jaildir option */ #define JAILDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable jaildir */ #define JAILDIR_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #define JAILDIR_NAME NULL +/** Descriptive text for the jaildir option */ #define JAILDIR_DESC (ntpdsim_opt_strs+1497) #define JAILDIR_name (ntpdsim_opt_strs+1489) #endif /* HAVE_DROPROOT */ -/* +/** * interface option description: */ +/** Descriptive text for the interface option */ #define INTERFACE_DESC (ntpdsim_opt_strs+1551) +/** Upper-cased name for the interface option */ #define INTERFACE_NAME (ntpdsim_opt_strs+1590) +/** Name string for the interface option */ #define INTERFACE_name (ntpdsim_opt_strs+1600) +/** Compiled in flag settings for the interface option */ #define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * keyfile option description: */ +/** Descriptive text for the keyfile option */ #define KEYFILE_DESC (ntpdsim_opt_strs+1610) +/** Upper-cased name for the keyfile option */ #define KEYFILE_NAME (ntpdsim_opt_strs+1633) +/** Name string for the keyfile option */ #define KEYFILE_name (ntpdsim_opt_strs+1641) +/** Compiled in flag settings for the keyfile option */ #define KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * logfile option description: */ +/** Descriptive text for the logfile option */ #define LOGFILE_DESC (ntpdsim_opt_strs+1649) +/** Upper-cased name for the logfile option */ #define LOGFILE_NAME (ntpdsim_opt_strs+1670) +/** Name string for the logfile option */ #define LOGFILE_name (ntpdsim_opt_strs+1678) +/** Compiled in flag settings for the logfile option */ #define LOGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * novirtualips option description: */ +/** Descriptive text for the novirtualips option */ #define NOVIRTUALIPS_DESC (ntpdsim_opt_strs+1686) +/** Upper-cased name for the novirtualips option */ #define NOVIRTUALIPS_NAME (ntpdsim_opt_strs+1722) +/** Name string for the novirtualips option */ #define NOVIRTUALIPS_name (ntpdsim_opt_strs+1735) +/** Compiled in flag settings for the novirtualips option */ #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) -/* +/** * modifymmtimer option description: */ #ifdef SYS_WINNT +/** Descriptive text for the modifymmtimer option */ #define MODIFYMMTIMER_DESC (ntpdsim_opt_strs+1748) +/** Upper-cased name for the modifymmtimer option */ #define MODIFYMMTIMER_NAME (ntpdsim_opt_strs+1787) +/** Name string for the modifymmtimer option */ #define MODIFYMMTIMER_name (ntpdsim_opt_strs+1801) +/** Compiled in flag settings for the modifymmtimer option */ #define MODIFYMMTIMER_FLAGS (OPTST_DISABLED) #else /* disable modifymmtimer */ @@ -379,75 +448,106 @@ static int const aAuthnoreqCantList[] = { #define MODIFYMMTIMER_name NULL #endif /* SYS_WINNT */ -/* +/** * nofork option description with * "Must also have options" and "Incompatible options": */ +/** Descriptive text for the nofork option */ #define NOFORK_DESC (ntpdsim_opt_strs+1815) +/** Upper-cased name for the nofork option */ #define NOFORK_NAME (ntpdsim_opt_strs+1827) +/** Name string for the nofork option */ #define NOFORK_name (ntpdsim_opt_strs+1834) +/** Other options that appear in conjunction with the nofork option */ static int const aNoforkCantList[] = { INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; +/** Compiled in flag settings for the nofork option */ #define NOFORK_FLAGS (OPTST_DISABLED) -/* +/** * nice option description: */ +/** Descriptive text for the nice option */ #define NICE_DESC (ntpdsim_opt_strs+1841) +/** Upper-cased name for the nice option */ #define NICE_NAME (ntpdsim_opt_strs+1862) +/** Name string for the nice option */ #define NICE_name (ntpdsim_opt_strs+1867) +/** Compiled in flag settings for the nice option */ #define NICE_FLAGS (OPTST_DISABLED) -/* +/** * pidfile option description: */ +/** Descriptive text for the pidfile option */ #define PIDFILE_DESC (ntpdsim_opt_strs+1872) +/** Upper-cased name for the pidfile option */ #define PIDFILE_NAME (ntpdsim_opt_strs+1893) +/** Name string for the pidfile option */ #define PIDFILE_name (ntpdsim_opt_strs+1901) +/** Compiled in flag settings for the pidfile option */ #define PIDFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * priority option description: */ +/** Descriptive text for the priority option */ #define PRIORITY_DESC (ntpdsim_opt_strs+1909) +/** Upper-cased name for the priority option */ #define PRIORITY_NAME (ntpdsim_opt_strs+1926) +/** Name string for the priority option */ #define PRIORITY_name (ntpdsim_opt_strs+1935) +/** Compiled in flag settings for the priority option */ #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/* +/** * quit option description with * "Must also have options" and "Incompatible options": */ +/** Descriptive text for the quit option */ #define QUIT_DESC (ntpdsim_opt_strs+1944) +/** Upper-cased name for the quit option */ #define QUIT_NAME (ntpdsim_opt_strs+1966) +/** Name string for the quit option */ #define QUIT_name (ntpdsim_opt_strs+1971) +/** Other options that appear in conjunction with the quit option */ static int const aQuitCantList[] = { INDEX_OPT_SAVECONFIGQUIT, INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; +/** Compiled in flag settings for the quit option */ #define QUIT_FLAGS (OPTST_DISABLED) -/* +/** * propagationdelay option description: */ +/** Descriptive text for the propagationdelay option */ #define PROPAGATIONDELAY_DESC (ntpdsim_opt_strs+1976) +/** Upper-cased name for the propagationdelay option */ #define PROPAGATIONDELAY_NAME (ntpdsim_opt_strs+2004) +/** Name string for the propagationdelay option */ #define PROPAGATIONDELAY_name (ntpdsim_opt_strs+2021) +/** Compiled in flag settings for the propagationdelay option */ #define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * saveconfigquit option description with * "Must also have options" and "Incompatible options": */ #ifdef SAVECONFIG +/** Descriptive text for the saveconfigquit option */ #define SAVECONFIGQUIT_DESC (ntpdsim_opt_strs+2038) +/** Upper-cased name for the saveconfigquit option */ #define SAVECONFIGQUIT_NAME (ntpdsim_opt_strs+2073) +/** Name string for the saveconfigquit option */ #define SAVECONFIGQUIT_name (ntpdsim_opt_strs+2088) +/** Other options that appear in conjunction with the saveconfigquit option */ static int const aSaveconfigquitCantList[] = { INDEX_OPT_QUIT, INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; +/** Compiled in flag settings for the saveconfigquit option */ #define SAVECONFIGQUIT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -459,80 +559,110 @@ static int const aSaveconfigquitCantList[] = { #define SAVECONFIGQUIT_name NULL #endif /* SAVECONFIG */ -/* +/** * statsdir option description: */ +/** Descriptive text for the statsdir option */ #define STATSDIR_DESC (ntpdsim_opt_strs+2103) +/** Upper-cased name for the statsdir option */ #define STATSDIR_NAME (ntpdsim_opt_strs+2128) +/** Name string for the statsdir option */ #define STATSDIR_name (ntpdsim_opt_strs+2137) +/** Compiled in flag settings for the statsdir option */ #define STATSDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * trustedkey option description: */ +/** Descriptive text for the trustedkey option */ #define TRUSTEDKEY_DESC (ntpdsim_opt_strs+2146) +/** Upper-cased name for the trustedkey option */ #define TRUSTEDKEY_NAME (ntpdsim_opt_strs+2165) +/** Name string for the trustedkey option */ #define TRUSTEDKEY_name (ntpdsim_opt_strs+2176) +/** Compiled in flag settings for the trustedkey option */ #define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * user option description: */ #ifdef HAVE_DROPROOT +/** Descriptive text for the user option */ #define USER_DESC (ntpdsim_opt_strs+2187) +/** Upper-cased name for the user option */ #define USER_NAME (ntpdsim_opt_strs+2221) +/** Name string for the user option */ #define USER_name (ntpdsim_opt_strs+2226) +/** Compiled in flag settings for the user option */ #define USER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable user */ #define USER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #define USER_NAME NULL +/** Descriptive text for the user option */ #define USER_DESC (ntpdsim_opt_strs+1497) #define USER_name (ntpdsim_opt_strs+2226) #endif /* HAVE_DROPROOT */ -/* +/** * updateinterval option description: */ +/** Descriptive text for the updateinterval option */ #define UPDATEINTERVAL_DESC (ntpdsim_opt_strs+2231) +/** Upper-cased name for the updateinterval option */ #define UPDATEINTERVAL_NAME (ntpdsim_opt_strs+2295) +/** Name string for the updateinterval option */ #define UPDATEINTERVAL_name (ntpdsim_opt_strs+2310) +/** Compiled in flag settings for the updateinterval option */ #define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) -/* +/** * var option description: */ +/** Descriptive text for the var option */ #define VAR_DESC (ntpdsim_opt_strs+2325) +/** Upper-cased name for the var option */ #define VAR_NAME (ntpdsim_opt_strs+2355) +/** Name string for the var option */ #define VAR_name (ntpdsim_opt_strs+2359) +/** Compiled in flag settings for the var option */ #define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * dvar option description: */ +/** Descriptive text for the dvar option */ #define DVAR_DESC (ntpdsim_opt_strs+2363) +/** Upper-cased name for the dvar option */ #define DVAR_NAME (ntpdsim_opt_strs+2397) +/** Name string for the dvar option */ #define DVAR_name (ntpdsim_opt_strs+2402) +/** Compiled in flag settings for the dvar option */ #define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -/* +/** * wait-sync option description with * "Must also have options" and "Incompatible options": */ #ifdef HAVE_WORKING_FORK +/** Descriptive text for the wait-sync option */ #define WAIT_SYNC_DESC (ntpdsim_opt_strs+2407) +/** Upper-cased name for the wait-sync option */ #define WAIT_SYNC_NAME (ntpdsim_opt_strs+2444) +/** Name string for the wait-sync option */ #define WAIT_SYNC_name (ntpdsim_opt_strs+2454) +/** Other options that appear in conjunction with the wait-sync option */ static int const aWait_SyncCantList[] = { INDEX_OPT_NOFORK, INDEX_OPT_QUIT, INDEX_OPT_SAVECONFIGQUIT, NO_EQUIVALENT }; +/** Compiled in flag settings for the wait-sync option */ #define WAIT_SYNC_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -544,21 +674,29 @@ static int const aWait_SyncCantList[] = { #define WAIT_SYNC_name NULL #endif /* HAVE_WORKING_FORK */ -/* +/** * slew option description: */ +/** Descriptive text for the slew option */ #define SLEW_DESC (ntpdsim_opt_strs+2464) +/** Upper-cased name for the slew option */ #define SLEW_NAME (ntpdsim_opt_strs+2487) +/** Name string for the slew option */ #define SLEW_name (ntpdsim_opt_strs+2492) +/** Compiled in flag settings for the slew option */ #define SLEW_FLAGS (OPTST_DISABLED) -/* +/** * usepcc option description: */ #ifdef SYS_WINNT +/** Descriptive text for the usepcc option */ #define USEPCC_DESC (ntpdsim_opt_strs+2497) +/** Upper-cased name for the usepcc option */ #define USEPCC_NAME (ntpdsim_opt_strs+2534) +/** Name string for the usepcc option */ #define USEPCC_name (ntpdsim_opt_strs+2541) +/** Compiled in flag settings for the usepcc option */ #define USEPCC_FLAGS (OPTST_DISABLED) #else /* disable usepcc */ @@ -568,13 +706,17 @@ static int const aWait_SyncCantList[] = { #define USEPCC_name NULL #endif /* SYS_WINNT */ -/* +/** * pccfreq option description: */ #ifdef SYS_WINNT +/** Descriptive text for the pccfreq option */ #define PCCFREQ_DESC (ntpdsim_opt_strs+2548) +/** Upper-cased name for the pccfreq option */ #define PCCFREQ_NAME (ntpdsim_opt_strs+2591) +/** Name string for the pccfreq option */ #define PCCFREQ_name (ntpdsim_opt_strs+2599) +/** Compiled in flag settings for the pccfreq option */ #define PCCFREQ_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -585,13 +727,17 @@ static int const aWait_SyncCantList[] = { #define PCCFREQ_name NULL #endif /* SYS_WINNT */ -/* +/** * mdns option description: */ #ifdef HAVE_DNSREGISTRATION +/** Descriptive text for the mdns option */ #define MDNS_DESC (ntpdsim_opt_strs+2607) +/** Upper-cased name for the mdns option */ #define MDNS_NAME (ntpdsim_opt_strs+2642) +/** Name string for the mdns option */ #define MDNS_name (ntpdsim_opt_strs+2647) +/** Compiled in flag settings for the mdns option */ #define MDNS_FLAGS (OPTST_DISABLED) #else /* disable mdns */ @@ -611,8 +757,8 @@ static int const aWait_SyncCantList[] = { #define MORE_HELP_name (ntpdsim_opt_strs+2746) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else -#define MORE_HELP_DESC NULL -#define MORE_HELP_name NULL +#define MORE_HELP_DESC HELP_DESC +#define MORE_HELP_name HELP_name #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #endif #ifdef NO_OPTIONAL_OPT_ARGS @@ -630,9 +776,11 @@ static int const aWait_SyncCantList[] = { #define NO_LOAD_OPTS_name (ntpdsim_opt_strs+2891) #define LOAD_OPTS_pfx (ntpdsim_opt_strs+2904) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) -/* +/** * Declare option callback procedures */ +/* extracted from optmain.tlib near line 745 */ + #if defined(TEST_NTPDSIM_OPTS) /* * Under test, omit argument processing, or call optionStackArg, @@ -659,12 +807,12 @@ extern tOptProc static tOptProc doOptDebug_Level, doUsageOpt; -/* +/** * #define map the "normal" callout procs */ #define DEBUG_LEVEL_OPT_PROC doOptDebug_Level -#endif /* defined(TEST_NTPDSIM_OPTS) */ +#endif /* TEST_NTPDSIM_OPTS */ #define VER_PROC ntpOptionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -1125,7 +1273,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -1148,20 +1296,25 @@ static tOptDesc optDesc[OPTION_CT] = { }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Define the ntpdsim Option Environment - */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/** Reference to the upper cased version of ntpdsim. */ #define zPROGNAME (ntpdsim_opt_strs+2907) +/** Reference to the title line for ntpdsim usage. */ #define zUsageTitle (ntpdsim_opt_strs+2915) +/** ntpdsim configuration file name. */ #define zRcName (ntpdsim_opt_strs+3038) +/** Directories to search for ntpdsim config files. */ static char const * const apzHomeList[3] = { ntpdsim_opt_strs+3030, ntpdsim_opt_strs+3036, NULL }; +/** The ntpdsim program bug email address. */ #define zBugsAddr (ntpdsim_opt_strs+3045) +/** Clarification/explanation of what ntpdsim does. */ #define zExplain (NULL) +/** Extra detail explaining what ntpdsim does. */ #define zDetail (ntpdsim_opt_strs+3079) +/** The full version string for ntpdsim. */ #define zFullVersion (ntpdsim_opt_strs+3081) /* extracted from optcode.tlib near line 364 */ @@ -1184,17 +1337,19 @@ static char const * const apzHomeList[3] = { /** * The callout function that invokes the optionUsage function. * - * @param pOptions the AutoOpts option description structure - * @param pOptDesc the descriptor for the "help" (usage) option. + * @param[in] opts the AutoOpts option description structure + * @param[in] od the descriptor for the "help" (usage) option. * @noreturn */ static void -doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) +doUsageOpt(tOptions * opts, tOptDesc * od) { - optionUsage(&ntpdsimOptions, NTPDSIM_EXIT_SUCCESS); + int ex_code; + ex_code = NTPDSIM_EXIT_SUCCESS; + optionUsage(&ntpdsimOptions, ex_code); /* NOTREACHED */ - (void)pOptDesc; - (void)pOptions; + (void)opts; + (void)od; } #if ! defined(TEST_NTPDSIM_OPTS) @@ -1203,8 +1358,8 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) /** * Code to handle the debug-level option. * - * @param pOptions the ntpdsim options data structure - * @param pOptDesc the option descriptor for this option. + * @param[in] pOptions the ntpdsim options data structure + * @param[in,out] pOptDesc the option descriptor for this option. */ static void doOptDebug_Level(tOptions* pOptions, tOptDesc* pOptDesc) @@ -1223,7 +1378,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++; #endif /* defined(TEST_NTPDSIM_OPTS) */ /* extracted from optmain.tlib near line 46 */ -#if defined(TEST_NTPDSIM_OPTS) /* TEST MAIN PROCEDURE: */ +#if defined(TEST_NTPDSIM_OPTS) /* TEST-MAIN-PROCEDURE: */ extern void optionPutShell(tOptions*); @@ -1231,8 +1386,8 @@ extern void optionPutShell(tOptions*); * Generated main procedure. This will emit text that a Bourne shell can * process to handle its command line arguments. * - * @param argc argument count - * @param argv argument vector + * @param[in] argc argument count + * @param[in] argv argument vector * @returns program exit code */ int @@ -1246,8 +1401,8 @@ main(int argc, char ** argv) fputs("output error writing to stdout\n", stderr); return res; } -#endif /* defined TEST_NTPDSIM_OPTS */ -/* extracted from optmain.tlib near line 1254 */ +#endif /* TEST_NTPDSIM_OPTS END-TEST-MAIN-PROCEDURE */ +/* extracted from optmain.tlib near line 1266 */ /** * The directory containing the data associated with ntpdsim. @@ -1263,6 +1418,7 @@ main(int argc, char ** argv) #ifndef WITH_PACKAGER # define ntpdsim_packager_info NULL #else +/** Packager information for ntpdsim. */ static char const ntpdsim_packager_info[] = "Packaged by " WITH_PACKAGER @@ -1292,7 +1448,8 @@ tOptions ntpdsimOptions = { + OPTPROC_NO_REQ_OPT + OPTPROC_ENVIRON + OPTPROC_NO_ARGS - + OPTPROC_MISUSE ), + + OPTPROC_MISUSE + + OPTPROC_SHELL_OUTPUT ), 0, NULL, /* current option index, current option */ NULL, NULL, zPROGNAME, zRcName, zCopyright, zLicenseDescrip, @@ -1317,7 +1474,7 @@ tOptions ntpdsimOptions = { }; #if ENABLE_NLS -/* +/** * This code is designed to translate translatable option text for the * ntpdsim program. These translations happen upon entry * to optionProcess(). @@ -1426,13 +1583,14 @@ translate_option_strings(void) #endif /* ENABLE_NLS */ #ifdef DO_NOT_COMPILE_THIS_CODE_IT_IS_FOR_GETTEXT +/** I18N function strictly for xgettext. Do not compile. */ static void bogus_function(void) { /* TRANSLATORS: - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the ntpdsimOptions structure noted in the comments below. The - literal text is defined in ntpdsim_opt_strs. + The following dummy function was crated solely so that xgettext can + extract the correct strings. These strings are actually referenced + by a field name in the ntpdsimOptions structure noted in the + comments below. The literal text is defined in ntpdsim_opt_strs. NOTE: the strings below are segmented with respect to the source string ntpdsim_opt_strs. The strings above are handed off for translation @@ -1444,7 +1602,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdsimOptions.pzCopyright */ - puts(_("ntpdsim 4.2.7p356\n\ + puts(_("ntpdsim 4.2.7p377\n\ Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1587,67 +1745,66 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpdsimOptions.pzUsageTitle */ - puts(_("ntpdsim - NTP daemon simulation program - Ver. 4.2.7p356\n\ + puts(_("ntpdsim - NTP daemon simulation program - Ver. 4.2.7p377\n\ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntpdsimOptions.pzDetail */ puts(_("\n")); /* referenced via ntpdsimOptions.pzFullVersion */ - puts(_("ntpdsim 4.2.7p356")); + puts(_("ntpdsim 4.2.7p377")); /* referenced via ntpdsimOptions.pzFullUsage */ puts(_("<<>>")); /* referenced via ntpdsimOptions.pzShortUsage */ puts(_("<<>>")); - /* LIBOPTS-MESSAGES: */ -#line 60 "../autoopts.c" +#line 67 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); -#line 86 "../autoopts.c" +#line 93 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); -#line 89 "../init.c" +#line 90 "../init.c" puts(_("\tThis exceeds the compiled library version: ")); -#line 87 "../init.c" +#line 88 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); -#line 73 "../autoopts.c" +#line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); -#line 91 "../init.c" +#line 92 "../init.c" puts(_("\tThis is less than the minimum library version: ")); #line 121 "../version.c" puts(_("Automated Options version %s\n" "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n")); -#line 310 "../usage.c" +#line 82 "../makeshell.c" puts(_("(AutoOpts bug): %s.\n")); #line 90 "../reset.c" puts(_("optionResetOpt() called, but reset-option not configured")); -#line 329 "../usage.c" +#line 292 "../usage.c" puts(_("could not locate the 'help' option")); -#line 351 "../autoopts.c" +#line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 770 "../usage.c" +#line 748 "../usage.c" puts(_("invalid argument type specified")); -#line 589 "../find.c" +#line 598 "../find.c" puts(_("defaulted to option with optional arg")); #line 76 "../alias.c" puts(_("aliasing option is out of range.")); -#line 229 "../enum.c" +#line 234 "../enum.c" puts(_("%s error: the keyword '%s' is ambiguous for %s\n")); #line 108 "../find.c" puts(_(" The following options match:\n")); -#line 290 "../find.c" +#line 293 "../find.c" puts(_("%s: ambiguous option name: %s (matches %d options)\n")); #line 161 "../check.c" puts(_("%s: Command line arguments required\n")); #line 43 "../alias.c" puts(_("%d %s%s options allowed\n")); -#line 81 "../makeshell.c" +#line 89 "../makeshell.c" puts(_("%s error %d (%s) calling %s for '%s'\n")); -#line 293 "../makeshell.c" +#line 301 "../makeshell.c" puts(_("interprocess pipe")); #line 168 "../version.c" puts(_("error: version option argument '%c' invalid. Use:\n" @@ -1656,48 +1813,48 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); "\t'n' - version and full copyright notice\n")); #line 58 "../check.c" puts(_("%s error: the '%s' and '%s' options conflict\n")); -#line 214 "../find.c" +#line 217 "../find.c" puts(_("%s: The '%s' option has been disabled.")); -#line 421 "../find.c" +#line 430 "../find.c" puts(_("%s: The '%s' option has been disabled.")); #line 38 "../alias.c" puts(_("-equivalence")); -#line 460 "../find.c" +#line 469 "../find.c" puts(_("%s: illegal option -- %c\n")); #line 110 "../reset.c" puts(_("%s: illegal option -- %c\n")); -#line 268 "../find.c" +#line 271 "../find.c" puts(_("%s: illegal option -- %s\n")); -#line 746 "../find.c" +#line 755 "../find.c" puts(_("%s: illegal option -- %s\n")); #line 118 "../reset.c" puts(_("%s: illegal option -- %s\n")); -#line 332 "../find.c" +#line 335 "../find.c" puts(_("%s: unknown vendor extension option -- %s\n")); -#line 154 "../enum.c" +#line 159 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 164 "../enum.c" +#line 169 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 769 "../usage.c" +#line 747 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1097 "../usage.c" +#line 1081 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 379 "../find.c" +#line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); -#line 518 "../find.c" +#line 527 "../find.c" puts(_("%s: The '%s' option requires an argument.\n")); -#line 171 "../autoopts.c" +#line 156 "../autoopts.c" puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n" - "\t'%s' and '%s'")); + "\t'%s' and '%s'.")); #line 94 "../check.c" puts(_("%s error: The %s option is required\n")); -#line 623 "../find.c" +#line 632 "../find.c" puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); -#line 531 "../save.c" +#line 535 "../save.c" puts(_("error %d (%s) creating %s\n")); -#line 229 "../enum.c" +#line 234 "../enum.c" puts(_("%s error: '%s' does not match any %s keywords.\n")); #line 93 "../reset.c" puts(_("%s error: The '%s' option requires an argument.\n")); @@ -1707,7 +1864,7 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("error %d (%s) stat-ing %s\n")); #line 143 "../restore.c" puts(_("%s error: no saved option state\n")); -#line 246 "../autoopts.c" +#line 231 "../autoopts.c" puts(_("'%s' is not a command line option.\n")); #line 114 "../time.c" puts(_("%s error: '%s' is not a recognizable date/time.\n")); @@ -1716,44 +1873,44 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); #line 53 "../time.c" puts(_("%s error: '%s' is not a recognizable time duration.\n")); #line 92 "../check.c" - puts(_("%s error: The %s option must appear %d times\n")); + puts(_("%s error: The %s option must appear %d times.\n")); #line 157 "../numeric.c" puts(_("%s error: '%s' is not a recognizable number.\n")); -#line 195 "../enum.c" +#line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 366 "../usage.c" +#line 330 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); -#line 195 "../makeshell.c" +#line 203 "../makeshell.c" puts(_("standard output")); -#line 930 "../makeshell.c" +#line 938 "../makeshell.c" puts(_("standard output")); -#line 304 "../usage.c" +#line 274 "../usage.c" puts(_("standard output")); -#line 451 "../usage.c" +#line 415 "../usage.c" puts(_("standard output")); -#line 647 "../usage.c" +#line 625 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); -#line 304 "../usage.c" +#line 274 "../usage.c" puts(_("standard error")); -#line 451 "../usage.c" +#line 415 "../usage.c" puts(_("standard error")); -#line 647 "../usage.c" +#line 625 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); -#line 195 "../makeshell.c" +#line 203 "../makeshell.c" puts(_("write")); -#line 930 "../makeshell.c" +#line 938 "../makeshell.c" puts(_("write")); -#line 303 "../usage.c" +#line 273 "../usage.c" puts(_("write")); -#line 450 "../usage.c" +#line 414 "../usage.c" puts(_("write")); -#line 646 "../usage.c" +#line 624 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -1769,89 +1926,89 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("%s warning: cannot save options - %s not regular file\n")); #line 256 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 530 "../save.c" +#line 534 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 895 "../usage.c" +#line 873 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1164 "../usage.c" +#line 1148 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 946 "../usage.c" +#line 924 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 859 "../usage.c" +#line 837 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1133 "../usage.c" +#line 1117 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1131 "../usage.c" +#line 1115 "../usage.c" puts(_("This option has been disabled")); -#line 886 "../usage.c" +#line 864 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1208 "../usage.c" +#line 1194 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 416 "../usage.c" +#line 380 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); -#line 908 "../makeshell.c" +#line 916 "../makeshell.c" puts(_("\n" "= = = = = = = =\n\n" "This incarnation of genshell will produce\n" "a shell script to parse the options for %s:\n\n")); -#line 161 "../enum.c" +#line 166 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 919 "../usage.c" +#line 897 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 940 "../usage.c" +#line 918 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 418 "../usage.c" +#line 382 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 926 "../usage.c" +#line 904 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 913 "../usage.c" +#line 891 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1323 "../usage.c" +#line 1309 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1259 "../usage.c" +#line 1245 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); -#line 1317 "../usage.c" +#line 1303 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); -#line 1318 "../usage.c" +#line 1304 "../usage.c" puts(_(" %3s %s")); -#line 1324 "../usage.c" +#line 1310 "../usage.c" puts(_(" %3s %s")); -#line 423 "../usage.c" +#line 387 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 419 "../usage.c" +#line 383 "../usage.c" puts(_("All arguments are named options.\n")); -#line 993 "../usage.c" +#line 971 "../usage.c" puts(_(" - reading file %s")); -#line 445 "../usage.c" +#line 409 "../usage.c" puts(_("\n" - "please send bug reports to: <%s>\n")); + "Please send bug reports to: <%s>\n")); #line 100 "../version.c" puts(_("\n" - "please send bug reports to: <%s>\n")); + "Please send bug reports to: <%s>\n")); #line 129 "../version.c" puts(_("\n" - "please send bug reports to: <%s>\n")); -#line 925 "../usage.c" + "Please send bug reports to: <%s>\n")); +#line 903 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 965 "../usage.c" +#line 944 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1206 "../usage.c" +#line 1192 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 704 "../usage.c" +#line 682 "../usage.c" puts(_("prohibits these options:\n")); -#line 699 "../usage.c" +#line 677 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -1869,28 +2026,28 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 426 "../usage.c" +#line 390 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 674 "../usage.c" +#line 652 "../usage.c" puts(_("requires the option '%s'\n")); -#line 677 "../usage.c" +#line 655 "../usage.c" puts(_("requires these options:\n")); -#line 1335 "../usage.c" +#line 1321 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1329 "../usage.c" +#line 1315 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); -#line 162 "../enum.c" +#line 167 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 932 "../usage.c" +#line 910 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); -#line 72 "../enum.c" +#line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1168 "../usage.c" +#line 1152 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 795 "../usage.c" +#line 773 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index c90fa5e61..a1b4f9827 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h) * - * It has been AutoGen-ed February 21, 2013 at 09:23:10 PM by AutoGen 5.17.2pre17 + * It has been AutoGen-ed August 1, 2013 at 02:05:43 AM by AutoGen 5.18.1pre3 * From the definitions ntpdsim-opts.def * and the template file options * - * Generated from AutoOpts 38:0:13 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -35,7 +35,7 @@ * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ -/* +/** * This file contains the programmatic interface to the Automated * Options generated for the ntpdsim program. * These macros are documented in the AutoGen info file in the @@ -46,22 +46,22 @@ #include "config.h" #include -/* +/** * Ensure that the library used for compiling this generated header is at * least as new as the version current when the header template was released * (not counting patch version increments). Also ensure that the oldest * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 155648 +#define AO_TEMPLATE_VERSION 163841 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header Choke Me. #endif -/* - * Enumeration of each option: +/** + * Enumeration of each option type for ntpdsim */ typedef enum { INDEX_OPT_IPV4 = 0, @@ -104,44 +104,61 @@ typedef enum { INDEX_OPT_SAVE_OPTS = 37, INDEX_OPT_LOAD_OPTS = 38 } teOptIndex; - +/** count of all options for ntpdsim */ #define OPTION_CT 39 -#define NTPDSIM_VERSION "4.2.7p356" -#define NTPDSIM_FULL_VERSION "ntpdsim 4.2.7p356" +/** ntpdsim version */ +#define NTPDSIM_VERSION "4.2.7p377" +/** Full ntpdsim version text */ +#define NTPDSIM_FULL_VERSION "ntpdsim 4.2.7p377" -/* +/** * Interface defines for all options. Replace "n" with the UPPER_CASED * option name (as in the teOptIndex enumeration above). * e.g. HAVE_OPT(IPV4) */ #define DESC(n) (ntpdsimOptions.pOptDesc[INDEX_OPT_## n]) +/** 'true' if an option has been specified in any way */ #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +/** The string argument to an option. The argument type must be \"string\". */ #define OPT_ARG(n) (DESC(n).optArg.argString) +/** Mask the option state revealing how an option was specified. + * It will be one and only one of \a OPTST_SET, \a OPTST_PRESET, + * \a OPTST_DEFINED, \a OPTST_RESET or zero. + */ #define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +/** Count of option's occurrances *on the command line*. */ #define COUNT_OPT(n) (DESC(n).optOccCt) +/** mask of \a OPTST_SET and \a OPTST_DEFINED. */ #define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +/** 'true' if \a HAVE_OPT would yield 'false'. */ #define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +/** 'true' if OPTST_DISABLED bit not set. */ #define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +/** number of stacked option arguments. + * Valid only for stacked option arguments. */ #define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +/** stacked argument vector. + * Valid only for stacked option arguments. */ #define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +/** Reset an option. */ #define CLEAR_OPT(n) STMTS( \ DESC(n).fOptState &= OPTST_PERSISTENT_MASK; \ if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \ DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) - -/* * * * * * - * +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/** * Enumeration of ntpdsim exit codes */ typedef enum { - NTPDSIM_EXIT_SUCCESS = 0, - NTPDSIM_EXIT_FAILURE = 1, - NTPDSIM_EXIT_USAGE_ERROR = 64, - NTPDSIM_EXIT_NO_CONFIG_INPUT = 66, - NTPDSIM_EXIT_LIBOPTS_FAILURE = 70 -} ntpdsim_exit_code_t; -/* + NTPDSIM_EXIT_SUCCESS = 0, + NTPDSIM_EXIT_FAILURE = 1, + NTPDSIM_EXIT_USAGE_ERROR = 64, + NTPDSIM_EXIT_NO_CONFIG_INPUT = 66, + NTPDSIM_EXIT_LIBOPTS_FAILURE = 70 +} ntpdsim_exit_code_t; +/** @} */ +/** * Make sure there are no #define name conflicts with the option names */ #ifndef NO_OPTION_NAME_WARNINGS @@ -318,9 +335,9 @@ typedef enum { # undef MDNS #endif /* NO_OPTION_NAME_WARNINGS */ -/* * * * * * - * +/** * Interface defines for specific options. + * @{ */ #define VALUE_OPT_IPV4 '4' #define VALUE_OPT_IPV6 '6' @@ -365,10 +382,15 @@ typedef enum { #define VALUE_OPT_USEPCC 31 #define VALUE_OPT_PCCFREQ 32 #define VALUE_OPT_MDNS 'm' +/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_HELP '?' +/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_MORE_HELP '!' +/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_VERSION INDEX_OPT_VERSION +/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_SAVE_OPTS '>' +/** option flag (value) for " (get "val-name") " option */ #define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ @@ -381,10 +403,9 @@ typedef enum { #define ERRSTOP_OPTERR STMTS(ntpdsimOptions.fOptSet |= OPTPROC_ERRSTOP) #define RESTART_OPT(n) STMTS( \ ntpdsimOptions.curOptIdx = (n); \ - ntpdsimOptions.pzCurOpt = NULL) + ntpdsimOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdsimOptions.pUsageProc)(&ntpdsimOptions, c) -/* extracted from opthead.tlib near line 498 */ #ifdef __cplusplus extern "C" { @@ -439,4 +460,5 @@ static inline char* aoGetsText(char const* pz) { } #endif #endif /* AUTOOPTS_NTPDSIM_OPTS_H_GUARD */ + /* ntpdsim-opts.h ends here */ diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi index 2df072f6f..30e04ffb3 100644 --- a/ntpdc/invoke-ntpdc.texi +++ b/ntpdc/invoke-ntpdc.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpdc.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:39:25 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:32:17 AM by AutoGen 5.18.1pre3 # From the definitions ntpdc-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 4b3ce0339..634a26deb 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed July 28, 2013 at 11:39:15 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:32:10 AM by AutoGen 5.18.1pre3 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -523,7 +523,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -836,10 +836,10 @@ translate_option_strings(void) static void bogus_function(void) { /* TRANSLATORS: - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the ntpdcOptions structure noted in the comments below. The - literal text is defined in ntpdc_opt_strs. + The following dummy function was crated solely so that xgettext can + extract the correct strings. These strings are actually referenced + by a field name in the ntpdcOptions structure noted in the + comments below. The literal text is defined in ntpdc_opt_strs. NOTE: the strings below are segmented with respect to the source string ntpdc_opt_strs. The strings above are handed off for translation @@ -931,9 +931,9 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* referenced via ntpdcOptions.pzShortUsage */ puts(_("<<>>")); /* LIBOPTS-MESSAGES: */ -#line 45 "../autoopts.c" +#line 67 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); -#line 71 "../autoopts.c" +#line 93 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); @@ -942,7 +942,7 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); #line 88 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); -#line 58 "../autoopts.c" +#line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); #line 92 "../init.c" puts(_("\tThis is less than the minimum library version: ")); @@ -957,9 +957,9 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("could not locate the 'help' option")); #line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 747 "../usage.c" +#line 748 "../usage.c" puts(_("invalid argument type specified")); -#line 589 "../find.c" +#line 598 "../find.c" puts(_("defaulted to option with optional arg")); #line 76 "../alias.c" puts(_("aliasing option is out of range.")); @@ -967,7 +967,7 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("%s error: the keyword '%s' is ambiguous for %s\n")); #line 108 "../find.c" puts(_(" The following options match:\n")); -#line 290 "../find.c" +#line 293 "../find.c" puts(_("%s: ambiguous option name: %s (matches %d options)\n")); #line 161 "../check.c" puts(_("%s: Command line arguments required\n")); @@ -984,42 +984,42 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); "\t'n' - version and full copyright notice\n")); #line 58 "../check.c" puts(_("%s error: the '%s' and '%s' options conflict\n")); -#line 214 "../find.c" +#line 217 "../find.c" puts(_("%s: The '%s' option has been disabled.")); -#line 421 "../find.c" +#line 430 "../find.c" puts(_("%s: The '%s' option has been disabled.")); #line 38 "../alias.c" puts(_("-equivalence")); -#line 460 "../find.c" +#line 469 "../find.c" puts(_("%s: illegal option -- %c\n")); #line 110 "../reset.c" puts(_("%s: illegal option -- %c\n")); -#line 268 "../find.c" +#line 271 "../find.c" puts(_("%s: illegal option -- %s\n")); -#line 746 "../find.c" +#line 755 "../find.c" puts(_("%s: illegal option -- %s\n")); #line 118 "../reset.c" puts(_("%s: illegal option -- %s\n")); -#line 332 "../find.c" +#line 335 "../find.c" puts(_("%s: unknown vendor extension option -- %s\n")); #line 159 "../enum.c" puts(_(" or an integer from %d through %d\n")); #line 169 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 746 "../usage.c" +#line 747 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1080 "../usage.c" +#line 1081 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 379 "../find.c" +#line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); -#line 518 "../find.c" +#line 527 "../find.c" puts(_("%s: The '%s' option requires an argument.\n")); #line 156 "../autoopts.c" puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n" "\t'%s' and '%s'.")); #line 94 "../check.c" puts(_("%s error: The %s option is required\n")); -#line 623 "../find.c" +#line 632 "../find.c" puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); @@ -1049,7 +1049,7 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("%s error: '%s' is not a recognizable number.\n")); #line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 329 "../usage.c" +#line 330 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); @@ -1059,17 +1059,17 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("standard output")); #line 274 "../usage.c" puts(_("standard output")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard output")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); #line 274 "../usage.c" puts(_("standard error")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard error")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); @@ -1079,9 +1079,9 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("write")); #line 273 "../usage.c" puts(_("write")); -#line 413 "../usage.c" +#line 414 "../usage.c" puts(_("write")); -#line 623 "../usage.c" +#line 624 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -1102,29 +1102,29 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 872 "../usage.c" +#line 873 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1147 "../usage.c" +#line 1148 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 923 "../usage.c" +#line 924 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 836 "../usage.c" +#line 837 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1116 "../usage.c" +#line 1117 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1114 "../usage.c" +#line 1115 "../usage.c" puts(_("This option has been disabled")); -#line 863 "../usage.c" +#line 864 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1193 "../usage.c" +#line 1194 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 379 "../usage.c" +#line 380 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); #line 916 "../makeshell.c" @@ -1134,33 +1134,33 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); "a shell script to parse the options for %s:\n\n")); #line 166 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 896 "../usage.c" +#line 897 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 917 "../usage.c" +#line 918 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 381 "../usage.c" +#line 382 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 903 "../usage.c" +#line 904 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 890 "../usage.c" +#line 891 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1308 "../usage.c" +#line 1309 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1244 "../usage.c" - puts(_(" Flg Arg Option-Name Description\n")); -#line 1302 "../usage.c" +#line 1245 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); #line 1303 "../usage.c" + puts(_(" Flg Arg Option-Name Description\n")); +#line 1304 "../usage.c" puts(_(" %3s %s")); -#line 1309 "../usage.c" +#line 1310 "../usage.c" puts(_(" %3s %s")); -#line 386 "../usage.c" +#line 387 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 382 "../usage.c" +#line 383 "../usage.c" puts(_("All arguments are named options.\n")); -#line 970 "../usage.c" +#line 971 "../usage.c" puts(_(" - reading file %s")); -#line 408 "../usage.c" +#line 409 "../usage.c" puts(_("\n" "Please send bug reports to: <%s>\n")); #line 100 "../version.c" @@ -1169,17 +1169,17 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); #line 129 "../version.c" puts(_("\n" "Please send bug reports to: <%s>\n")); -#line 902 "../usage.c" +#line 903 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 943 "../usage.c" +#line 944 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1191 "../usage.c" +#line 1192 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 681 "../usage.c" +#line 682 "../usage.c" puts(_("prohibits these options:\n")); -#line 676 "../usage.c" +#line 677 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -1197,28 +1197,28 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 389 "../usage.c" +#line 390 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 651 "../usage.c" +#line 652 "../usage.c" puts(_("requires the option '%s'\n")); -#line 654 "../usage.c" +#line 655 "../usage.c" puts(_("requires these options:\n")); -#line 1320 "../usage.c" +#line 1321 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1314 "../usage.c" +#line 1315 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); #line 167 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 909 "../usage.c" +#line 910 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); #line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1151 "../usage.c" +#line 1152 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 772 "../usage.c" +#line 773 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 244c8d3aa..e4b517d36 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed July 28, 2013 at 11:39:14 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:32:10 AM by AutoGen 5.18.1pre3 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 159744 +#define AO_TEMPLATE_VERSION 163841 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman index 72fb6366a..524fd1593 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpdc 1ntpdcman "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:21 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:19 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" @@ -33,7 +33,7 @@ ntpd's configuration file may also be specified at run time using .B . .SH "OPTIONS" .TP -.BR \-4 ", " \-\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -41,7 +41,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " \-\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -49,7 +49,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP +.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP run a command and exit. This option may appear an unlimited number of times. .sp @@ -57,18 +57,18 @@ The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). .TP -.BR \-d ", " \-\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP +.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-i ", " \-\-interactive +.BR \-i ", " \-\-interactive Force ntpq to operate in interactive mode. This option must not appear in combination with any of the following options: command, listpeers, peers, showpeers. @@ -76,7 +76,7 @@ command, listpeers, peers, showpeers. Force ntpq to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input. .TP -.BR \-l ", " \-\-listpeers +.BR \-l ", " \-\-listpeers Print a list of the peers. This option must not appear in combination with any of the following options: command. @@ -84,13 +84,13 @@ command. Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'listpeers' interactive command. .TP -.BR \-n ", " \-\-numeric +.BR \-n ", " \-\-numeric numeric host addresses. .sp Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names. .TP -.BR \-p ", " \-\-peers +.BR \-p ", " \-\-peers Print a list of the peers. This option must not appear in combination with any of the following options: command. @@ -98,7 +98,7 @@ command. Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'peers' interactive command. .TP -.BR \-s ", " \-\-showpeers +.BR \-s ", " \-\-showpeers Show a list of the peers. This option must not appear in combination with any of the following options: command. @@ -140,25 +140,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE If one or more request options are included on the command line when @@ -208,15 +189,15 @@ both the remote program and local server share a common key and key identifier. .PP Note that in contexts where a host name is expected, a -4 + 4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a -6 + 6 qualifier forces DNS resolution to the IPv6 namespace. Specifying a command line option other than -i + i or -n + n will cause the specified query (queries) to be sent to the indicated host(s) immediately. Otherwise, @@ -289,7 +270,7 @@ The default is .Cm yes , unless modified using the command line -n + n switch. .TP .BR Ic keyid Ar keyid diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index 2aee7d713..58e73dbfc 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPDC 1ntpdcmdoc User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:28 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:13 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -131,25 +131,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE If one or more request options are included on the command line when diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html index 33d826785..0aac1a946 100644 --- a/ntpdc/ntpdc.html +++ b/ntpdc/ntpdc.html @@ -3,7 +3,7 @@ ntpdc: NTPD Control User's Manual - + @@ -14,18 +14,20 @@ pre.smallformat { font-family:inherit; font-size:smaller } pre.smallexample { font-size:smaller } pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family: serif; font-weight: normal; } + span.sc { font-variant:small-caps } + span.roman { font-family:serif; font-weight:normal; } + span.sansserif { font-family:sans-serif; font-weight:normal; } -->

ntpdc: NTPD Control User's Manual

+

-Next: , +Next: , Previous: (dir), Up: (dir) -
+

ntpdc: NTPD Control User Manual

@@ -55,9 +57,10 @@ IETF specification.
-

-
+

+ +
@@ -76,9 +79,10 @@ the +4.567 +/- 0.089 secs indicates the time offset and error bound of the system clock relative to the server clock.
-

-
+

+ +

Invoking ntpdc

@@ -108,7 +112,7 @@ using the agtexi-cmd template and the option descriptions for the < This software is released under the NTP license, <http://ntp.org/license>.
+

-Next: , +Next: , Up: ntpdc Invocation -
+
-

ntpdc help/usage (--help)

+

ntpdc help/usage (--help)

This is the automatically generated usage text for ntpdc.

The text printed is the same whether selected with the help option -(--help) or the more-help option (--more-help). more-help will print +(--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. 

ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p377
@@ -193,11 +198,12 @@ Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 exit 0
+

-Next: , +Next: , Previous: ntpdc usage, Up: ntpdc Invocation -
+

ipv4 option (-4)

@@ -214,11 +220,12 @@ ipv6.

Force DNS resolution of following host names on the command line to the IPv4 namespace.

+

-Next: , +Next: , Previous: ntpdc ipv4, Up: ntpdc Invocation -
+

ipv6 option (-6)

@@ -235,18 +242,19 @@ ipv4.

Force DNS resolution of following host names on the command line to the IPv6 namespace.

+

-Next: , +Next: , Previous: ntpdc ipv6, Up: ntpdc Invocation -
+

command option (-c)

This is the “run a command and exit” option. -This option takes an argument string cmd. +This option takes an argument string cmd.

This option has some usage constraints. It:

    @@ -257,11 +265,12 @@ This option takes an argument string cmd. and is added to the list of commands to be executed on the specified host(s).
    +

    -Next: , +Next: , Previous: ntpdc command, Up: ntpdc Invocation -
    +

    interactive option (-i)

    @@ -278,11 +287,12 @@ command, listpeers, peers, showpeers.

    Force ntpq to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input.

    +

    -Next: , +Next: , Previous: ntpdc interactive, Up: ntpdc Invocation -
    +

    listpeers option (-l)

    @@ -299,11 +309,12 @@ command.

    Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'listpeers' interactive command.

    +

    -Next: , +Next: , Previous: ntpdc listpeers, Up: ntpdc Invocation -
    +

    numeric option (-n)

    @@ -313,11 +324,12 @@ This is the “numeric host addresses” option. Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names.
    +

    -Next: , +Next: , Previous: ntpdc numeric, Up: ntpdc Invocation -
    +

    peers option (-p)

    @@ -334,11 +346,12 @@ command.

    Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'peers' interactive command.

    +

    -Next: , +Next: , Previous: ntpdc peers, Up: ntpdc Invocation -
    +

    showpeers option (-s)

    @@ -356,11 +369,12 @@ command. of their state. This is equivalent to the 'dmpeers' interactive command.
    +

    -Next: , +Next: , Previous: ntpdc showpeers, Up: ntpdc Invocation -
    +

    presetting/configuring ntpdc

    @@ -378,9 +392,9 @@ values are treated like option arguments.
  • $PWD
The environment variables HOME, and PWD -are expanded and replaced when ntpdc runs. +are expanded and replaced when ntpdc runs. For any of these that are plain files, they are simply processed. -For any that are directories, then a file named .ntprc is searched for +For any that are directories, then a file named .ntprc is searched for within that directory and processed.

Configuration files may be in a wide variety of formats. @@ -422,72 +436,78 @@ detail to provide. The default is to print just the version. The licensing inf Only the first letter of the argument is examined:

-
version
Only print the version. This is the default. -
copyright
Name the copyright usage licensing terms. -
verbose
Print the full copyright usage licensing terms. +
‘version’
Only print the version. This is the default. +
‘copyright’
Name the copyright usage licensing terms. +
‘verbose’
Print the full copyright usage licensing terms.
+

-Next: , +Next: , Previous: ntpdc config, Up: ntpdc Invocation -
+

ntpdc exit status

One of the following exit values will be returned:

-
0 (EXIT_SUCCESS)
Successful program execution. -
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. -
66 (EX_NOINPUT)
A specified configuration file could not be loaded. -
70 (EX_SOFTWARE)
libopts had an internal operational error. Please report +
‘0 (EXIT_SUCCESS)’
Successful program execution. +
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. +
‘66 (EX_NOINPUT)’
A specified configuration file could not be loaded. +
‘70 (EX_SOFTWARE)’
libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you.
+

-Next: , +Next: , Previous: ntpdc exit status, Up: ntpdc Invocation -
+

ntpdc Usage

+

-Next: , +Next: , Previous: ntpdc Usage, Up: ntpdc Invocation -
+

ntpdc See Also

+

-Next: , +Next: , Previous: ntpdc See Also, Up: ntpdc Invocation -
+

ntpdc Authors

+

-Previous: ntpdc Authors, +Previous: ntpdc Authors, Up: ntpdc Invocation -
+

ntpdc Bugs

-

-
+

+ +
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in index 84145f471..170ff2072 100644 --- a/ntpdc/ntpdc.man.in +++ b/ntpdc/ntpdc.man.in @@ -1,8 +1,8 @@ -.TH ntpdc @NTPDC_MS@ "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpdc @NTPDC_MS@ "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:21 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:19 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" @@ -33,7 +33,7 @@ ntpd's configuration file may also be specified at run time using .B . .SH "OPTIONS" .TP -.BR \-4 ", " \-\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -41,7 +41,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " \-\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -49,7 +49,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP +.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP run a command and exit. This option may appear an unlimited number of times. .sp @@ -57,18 +57,18 @@ The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). .TP -.BR \-d ", " \-\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP +.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-i ", " \-\-interactive +.BR \-i ", " \-\-interactive Force ntpq to operate in interactive mode. This option must not appear in combination with any of the following options: command, listpeers, peers, showpeers. @@ -76,7 +76,7 @@ command, listpeers, peers, showpeers. Force ntpq to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input. .TP -.BR \-l ", " \-\-listpeers +.BR \-l ", " \-\-listpeers Print a list of the peers. This option must not appear in combination with any of the following options: command. @@ -84,13 +84,13 @@ command. Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'listpeers' interactive command. .TP -.BR \-n ", " \-\-numeric +.BR \-n ", " \-\-numeric numeric host addresses. .sp Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names. .TP -.BR \-p ", " \-\-peers +.BR \-p ", " \-\-peers Print a list of the peers. This option must not appear in combination with any of the following options: command. @@ -98,7 +98,7 @@ command. Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'peers' interactive command. .TP -.BR \-s ", " \-\-showpeers +.BR \-s ", " \-\-showpeers Show a list of the peers. This option must not appear in combination with any of the following options: command. @@ -140,25 +140,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE If one or more request options are included on the command line when @@ -208,15 +189,15 @@ both the remote program and local server share a common key and key identifier. .PP Note that in contexts where a host name is expected, a -4 + 4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a -6 + 6 qualifier forces DNS resolution to the IPv6 namespace. Specifying a command line option other than -i + i or -n + n will cause the specified query (queries) to be sent to the indicated host(s) immediately. Otherwise, @@ -289,7 +270,7 @@ The default is .Cm yes , unless modified using the command line -n + n switch. .TP .BR Ic keyid Ar keyid diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in index 961c36669..3639eb292 100644 --- a/ntpdc/ntpdc.mdoc.in +++ b/ntpdc/ntpdc.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPDC @NTPDC_MS@ User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:28 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:13 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -131,25 +131,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE If one or more request options are included on the command line when diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi index b8d435dca..5a6d74c06 100644 --- a/ntpq/invoke-ntpq.texi +++ b/ntpq/invoke-ntpq.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpq.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:39:41 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:32:28 AM by AutoGen 5.18.1pre3 # From the definitions ntpq-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 392929d73..c0928b6aa 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed July 28, 2013 at 11:39:31 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:32:21 AM by AutoGen 5.18.1pre3 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -493,7 +493,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -806,10 +806,10 @@ translate_option_strings(void) static void bogus_function(void) { /* TRANSLATORS: - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the ntpqOptions structure noted in the comments below. The - literal text is defined in ntpq_opt_strs. + The following dummy function was crated solely so that xgettext can + extract the correct strings. These strings are actually referenced + by a field name in the ntpqOptions structure noted in the + comments below. The literal text is defined in ntpq_opt_strs. NOTE: the strings below are segmented with respect to the source string ntpq_opt_strs. The strings above are handed off for translation @@ -895,9 +895,9 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* referenced via ntpqOptions.pzShortUsage */ puts(_("<<>>")); /* LIBOPTS-MESSAGES: */ -#line 45 "../autoopts.c" +#line 67 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); -#line 71 "../autoopts.c" +#line 93 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); @@ -906,7 +906,7 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); #line 88 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); -#line 58 "../autoopts.c" +#line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); #line 92 "../init.c" puts(_("\tThis is less than the minimum library version: ")); @@ -921,9 +921,9 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("could not locate the 'help' option")); #line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 747 "../usage.c" +#line 748 "../usage.c" puts(_("invalid argument type specified")); -#line 589 "../find.c" +#line 598 "../find.c" puts(_("defaulted to option with optional arg")); #line 76 "../alias.c" puts(_("aliasing option is out of range.")); @@ -931,7 +931,7 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("%s error: the keyword '%s' is ambiguous for %s\n")); #line 108 "../find.c" puts(_(" The following options match:\n")); -#line 290 "../find.c" +#line 293 "../find.c" puts(_("%s: ambiguous option name: %s (matches %d options)\n")); #line 161 "../check.c" puts(_("%s: Command line arguments required\n")); @@ -948,42 +948,42 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); "\t'n' - version and full copyright notice\n")); #line 58 "../check.c" puts(_("%s error: the '%s' and '%s' options conflict\n")); -#line 214 "../find.c" +#line 217 "../find.c" puts(_("%s: The '%s' option has been disabled.")); -#line 421 "../find.c" +#line 430 "../find.c" puts(_("%s: The '%s' option has been disabled.")); #line 38 "../alias.c" puts(_("-equivalence")); -#line 460 "../find.c" +#line 469 "../find.c" puts(_("%s: illegal option -- %c\n")); #line 110 "../reset.c" puts(_("%s: illegal option -- %c\n")); -#line 268 "../find.c" +#line 271 "../find.c" puts(_("%s: illegal option -- %s\n")); -#line 746 "../find.c" +#line 755 "../find.c" puts(_("%s: illegal option -- %s\n")); #line 118 "../reset.c" puts(_("%s: illegal option -- %s\n")); -#line 332 "../find.c" +#line 335 "../find.c" puts(_("%s: unknown vendor extension option -- %s\n")); #line 159 "../enum.c" puts(_(" or an integer from %d through %d\n")); #line 169 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 746 "../usage.c" +#line 747 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1080 "../usage.c" +#line 1081 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 379 "../find.c" +#line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); -#line 518 "../find.c" +#line 527 "../find.c" puts(_("%s: The '%s' option requires an argument.\n")); #line 156 "../autoopts.c" puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n" "\t'%s' and '%s'.")); #line 94 "../check.c" puts(_("%s error: The %s option is required\n")); -#line 623 "../find.c" +#line 632 "../find.c" puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); @@ -1013,7 +1013,7 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("%s error: '%s' is not a recognizable number.\n")); #line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 329 "../usage.c" +#line 330 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); @@ -1023,17 +1023,17 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("standard output")); #line 274 "../usage.c" puts(_("standard output")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard output")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); #line 274 "../usage.c" puts(_("standard error")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard error")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); @@ -1043,9 +1043,9 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("write")); #line 273 "../usage.c" puts(_("write")); -#line 413 "../usage.c" +#line 414 "../usage.c" puts(_("write")); -#line 623 "../usage.c" +#line 624 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -1066,29 +1066,29 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 872 "../usage.c" +#line 873 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1147 "../usage.c" +#line 1148 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 923 "../usage.c" +#line 924 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 836 "../usage.c" +#line 837 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1116 "../usage.c" +#line 1117 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1114 "../usage.c" +#line 1115 "../usage.c" puts(_("This option has been disabled")); -#line 863 "../usage.c" +#line 864 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1193 "../usage.c" +#line 1194 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 379 "../usage.c" +#line 380 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); #line 916 "../makeshell.c" @@ -1098,33 +1098,33 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); "a shell script to parse the options for %s:\n\n")); #line 166 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 896 "../usage.c" +#line 897 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 917 "../usage.c" +#line 918 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 381 "../usage.c" +#line 382 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 903 "../usage.c" +#line 904 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 890 "../usage.c" +#line 891 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1308 "../usage.c" +#line 1309 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1244 "../usage.c" - puts(_(" Flg Arg Option-Name Description\n")); -#line 1302 "../usage.c" +#line 1245 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); #line 1303 "../usage.c" + puts(_(" Flg Arg Option-Name Description\n")); +#line 1304 "../usage.c" puts(_(" %3s %s")); -#line 1309 "../usage.c" +#line 1310 "../usage.c" puts(_(" %3s %s")); -#line 386 "../usage.c" +#line 387 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 382 "../usage.c" +#line 383 "../usage.c" puts(_("All arguments are named options.\n")); -#line 970 "../usage.c" +#line 971 "../usage.c" puts(_(" - reading file %s")); -#line 408 "../usage.c" +#line 409 "../usage.c" puts(_("\n" "Please send bug reports to: <%s>\n")); #line 100 "../version.c" @@ -1133,17 +1133,17 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); #line 129 "../version.c" puts(_("\n" "Please send bug reports to: <%s>\n")); -#line 902 "../usage.c" +#line 903 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 943 "../usage.c" +#line 944 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1191 "../usage.c" +#line 1192 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 681 "../usage.c" +#line 682 "../usage.c" puts(_("prohibits these options:\n")); -#line 676 "../usage.c" +#line 677 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -1161,28 +1161,28 @@ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 389 "../usage.c" +#line 390 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 651 "../usage.c" +#line 652 "../usage.c" puts(_("requires the option '%s'\n")); -#line 654 "../usage.c" +#line 655 "../usage.c" puts(_("requires these options:\n")); -#line 1320 "../usage.c" +#line 1321 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1314 "../usage.c" +#line 1315 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); #line 167 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 909 "../usage.c" +#line 910 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); #line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1151 "../usage.c" +#line 1152 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 772 "../usage.c" +#line 773 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index da3c15094..b7f1394ea 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed July 28, 2013 at 11:39:30 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:32:21 AM by AutoGen 5.18.1pre3 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 159744 +#define AO_TEMPLATE_VERSION 163841 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman index 8139c863e..4b06788cc 100644 --- a/ntpq/ntpq.1ntpqman +++ b/ntpq/ntpq.1ntpqman @@ -1,8 +1,8 @@ -.TH ntpq 1ntpqman "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpq 1ntpqman "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:37 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:30 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .\" @@ -64,9 +64,9 @@ the remote host is not heard from within a suitable timeout time. Specifying a command line option other than -i + i or -n + n will cause the specified query (queries) to be sent to the indicated host(s) immediately. @@ -87,7 +87,7 @@ utility itself and do not result in NTP mode 6 requests being sent to a server. These are described following. .TP -.BR Ic ? Op Ar command_keyword +.BR Ic ? Op Ar command_keyword .TP .BR Ic help Op Ar command_keyword A @@ -216,7 +216,7 @@ The default is .Cm yes , unless modified using the command line -n + n switch. .TP .BR Ic keyid Ar keyid @@ -273,7 +273,7 @@ retries each query once after a timeout, the total waiting time for a timeout will be twice the timeout value set. .SH "OPTIONS" .TP -.BR \-4 ", " \-\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -281,7 +281,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " \-\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -289,7 +289,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP +.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP run a command and exit. This option may appear an unlimited number of times. .sp @@ -297,18 +297,18 @@ The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). .TP -.BR \-d ", " \-\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP +.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-p ", " \-\-peers +.BR \-p ", " \-\-peers Print a list of the peers. This option must not appear in combination with any of the following options: interactive. @@ -316,7 +316,7 @@ interactive. Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'peers' interactive command. .TP -.BR \-i ", " \-\-interactive +.BR \-i ", " \-\-interactive Force ntpq to operate in interactive mode. This option must not appear in combination with any of the following options: command, peers. @@ -325,13 +325,13 @@ Force \fBntpq\fP to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input. .TP -.BR \-n ", " \-\-numeric +.BR \-n ", " \-\-numeric numeric host addresses. .sp Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names. .TP -.BR \-\-old\-rv +.BR \-\-old\-rv Always output status line with readvar. .sp By default, \fBntpq\fP now suppresses the \fBassocid=...\fP @@ -378,25 +378,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH "FILES" diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc index ea6dbd546..b34a57bf9 100644 --- a/ntpq/ntpq.1ntpqmdoc +++ b/ntpq/ntpq.1ntpqmdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPQ 1ntpqmdoc User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:42 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:25 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -356,25 +356,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh "FILES" diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in index cf5f8f88e..740e7ae86 100644 --- a/ntpq/ntpq.man.in +++ b/ntpq/ntpq.man.in @@ -1,8 +1,8 @@ -.TH ntpq @NTPQ_MS@ "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpq @NTPQ_MS@ "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:37 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:30 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .\" @@ -64,9 +64,9 @@ the remote host is not heard from within a suitable timeout time. Specifying a command line option other than -i + i or -n + n will cause the specified query (queries) to be sent to the indicated host(s) immediately. @@ -87,7 +87,7 @@ utility itself and do not result in NTP mode 6 requests being sent to a server. These are described following. .TP -.BR Ic ? Op Ar command_keyword +.BR Ic ? Op Ar command_keyword .TP .BR Ic help Op Ar command_keyword A @@ -216,7 +216,7 @@ The default is .Cm yes , unless modified using the command line -n + n switch. .TP .BR Ic keyid Ar keyid @@ -273,7 +273,7 @@ retries each query once after a timeout, the total waiting time for a timeout will be twice the timeout value set. .SH "OPTIONS" .TP -.BR \-4 ", " \-\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -281,7 +281,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " \-\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -289,7 +289,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP +.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP run a command and exit. This option may appear an unlimited number of times. .sp @@ -297,18 +297,18 @@ The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). .TP -.BR \-d ", " \-\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP +.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-p ", " \-\-peers +.BR \-p ", " \-\-peers Print a list of the peers. This option must not appear in combination with any of the following options: interactive. @@ -316,7 +316,7 @@ interactive. Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'peers' interactive command. .TP -.BR \-i ", " \-\-interactive +.BR \-i ", " \-\-interactive Force ntpq to operate in interactive mode. This option must not appear in combination with any of the following options: command, peers. @@ -325,13 +325,13 @@ Force \fBntpq\fP to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input. .TP -.BR \-n ", " \-\-numeric +.BR \-n ", " \-\-numeric numeric host addresses. .sp Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names. .TP -.BR \-\-old\-rv +.BR \-\-old\-rv Always output status line with readvar. .sp By default, \fBntpq\fP now suppresses the \fBassocid=...\fP @@ -378,25 +378,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH "FILES" diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in index 3d8d8b927..cf29a0525 100644 --- a/ntpq/ntpq.mdoc.in +++ b/ntpq/ntpq.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPQ @NTPQ_MS@ User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:42 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:25 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -356,25 +356,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh "FILES" diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi index 1a4a2d39b..eb9f89378 100644 --- a/ntpsnmpd/invoke-ntpsnmpd.texi +++ b/ntpsnmpd/invoke-ntpsnmpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpsnmpd.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:39:56 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:32:38 AM by AutoGen 5.18.1pre3 # From the definitions ntpsnmpd-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 3b5787d7c..d80976a9a 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed July 28, 2013 at 11:39:45 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:32:32 AM by AutoGen 5.18.1pre3 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -290,7 +290,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -579,10 +579,10 @@ translate_option_strings(void) static void bogus_function(void) { /* TRANSLATORS: - The following dummy function was crated solely so that xgettext can extract - the correct strings. These strings are actually referenced by a field name - in the ntpsnmpdOptions structure noted in the comments below. The - literal text is defined in ntpsnmpd_opt_strs. + The following dummy function was crated solely so that xgettext can + extract the correct strings. These strings are actually referenced + by a field name in the ntpsnmpdOptions structure noted in the + comments below. The literal text is defined in ntpsnmpd_opt_strs. NOTE: the strings below are segmented with respect to the source string ntpsnmpd_opt_strs. The strings above are handed off for translation @@ -653,9 +653,9 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntpsnmpdOptions.pzShortUsage */ puts(_("<<>>")); /* LIBOPTS-MESSAGES: */ -#line 45 "../autoopts.c" +#line 67 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); -#line 71 "../autoopts.c" +#line 93 "../autoopts.c" puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); @@ -664,7 +664,7 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); #line 88 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); -#line 58 "../autoopts.c" +#line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); #line 92 "../init.c" puts(_("\tThis is less than the minimum library version: ")); @@ -679,9 +679,9 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("could not locate the 'help' option")); #line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 747 "../usage.c" +#line 748 "../usage.c" puts(_("invalid argument type specified")); -#line 589 "../find.c" +#line 598 "../find.c" puts(_("defaulted to option with optional arg")); #line 76 "../alias.c" puts(_("aliasing option is out of range.")); @@ -689,7 +689,7 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("%s error: the keyword '%s' is ambiguous for %s\n")); #line 108 "../find.c" puts(_(" The following options match:\n")); -#line 290 "../find.c" +#line 293 "../find.c" puts(_("%s: ambiguous option name: %s (matches %d options)\n")); #line 161 "../check.c" puts(_("%s: Command line arguments required\n")); @@ -706,42 +706,42 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); "\t'n' - version and full copyright notice\n")); #line 58 "../check.c" puts(_("%s error: the '%s' and '%s' options conflict\n")); -#line 214 "../find.c" +#line 217 "../find.c" puts(_("%s: The '%s' option has been disabled.")); -#line 421 "../find.c" +#line 430 "../find.c" puts(_("%s: The '%s' option has been disabled.")); #line 38 "../alias.c" puts(_("-equivalence")); -#line 460 "../find.c" +#line 469 "../find.c" puts(_("%s: illegal option -- %c\n")); #line 110 "../reset.c" puts(_("%s: illegal option -- %c\n")); -#line 268 "../find.c" +#line 271 "../find.c" puts(_("%s: illegal option -- %s\n")); -#line 746 "../find.c" +#line 755 "../find.c" puts(_("%s: illegal option -- %s\n")); #line 118 "../reset.c" puts(_("%s: illegal option -- %s\n")); -#line 332 "../find.c" +#line 335 "../find.c" puts(_("%s: unknown vendor extension option -- %s\n")); #line 159 "../enum.c" puts(_(" or an integer from %d through %d\n")); #line 169 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 746 "../usage.c" +#line 747 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1080 "../usage.c" +#line 1081 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 379 "../find.c" +#line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); -#line 518 "../find.c" +#line 527 "../find.c" puts(_("%s: The '%s' option requires an argument.\n")); #line 156 "../autoopts.c" puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n" "\t'%s' and '%s'.")); #line 94 "../check.c" puts(_("%s error: The %s option is required\n")); -#line 623 "../find.c" +#line 632 "../find.c" puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); @@ -771,7 +771,7 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("%s error: '%s' is not a recognizable number.\n")); #line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 329 "../usage.c" +#line 330 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); @@ -781,17 +781,17 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("standard output")); #line 274 "../usage.c" puts(_("standard output")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard output")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); #line 274 "../usage.c" puts(_("standard error")); -#line 414 "../usage.c" +#line 415 "../usage.c" puts(_("standard error")); -#line 624 "../usage.c" +#line 625 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); @@ -801,9 +801,9 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("write")); #line 273 "../usage.c" puts(_("write")); -#line 413 "../usage.c" +#line 414 "../usage.c" puts(_("write")); -#line 623 "../usage.c" +#line 624 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -824,29 +824,29 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 872 "../usage.c" +#line 873 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1147 "../usage.c" +#line 1148 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 923 "../usage.c" +#line 924 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 836 "../usage.c" +#line 837 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1116 "../usage.c" +#line 1117 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1114 "../usage.c" +#line 1115 "../usage.c" puts(_("This option has been disabled")); -#line 863 "../usage.c" +#line 864 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1193 "../usage.c" +#line 1194 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 379 "../usage.c" +#line 380 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); #line 916 "../makeshell.c" @@ -856,33 +856,33 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); "a shell script to parse the options for %s:\n\n")); #line 166 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 896 "../usage.c" +#line 897 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 917 "../usage.c" +#line 918 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 381 "../usage.c" +#line 382 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 903 "../usage.c" +#line 904 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 890 "../usage.c" +#line 891 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1308 "../usage.c" +#line 1309 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1244 "../usage.c" - puts(_(" Flg Arg Option-Name Description\n")); -#line 1302 "../usage.c" +#line 1245 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); #line 1303 "../usage.c" + puts(_(" Flg Arg Option-Name Description\n")); +#line 1304 "../usage.c" puts(_(" %3s %s")); -#line 1309 "../usage.c" +#line 1310 "../usage.c" puts(_(" %3s %s")); -#line 386 "../usage.c" +#line 387 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 382 "../usage.c" +#line 383 "../usage.c" puts(_("All arguments are named options.\n")); -#line 970 "../usage.c" +#line 971 "../usage.c" puts(_(" - reading file %s")); -#line 408 "../usage.c" +#line 409 "../usage.c" puts(_("\n" "Please send bug reports to: <%s>\n")); #line 100 "../version.c" @@ -891,17 +891,17 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); #line 129 "../version.c" puts(_("\n" "Please send bug reports to: <%s>\n")); -#line 902 "../usage.c" +#line 903 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 943 "../usage.c" +#line 944 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1191 "../usage.c" +#line 1192 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 681 "../usage.c" +#line 682 "../usage.c" puts(_("prohibits these options:\n")); -#line 676 "../usage.c" +#line 677 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -919,28 +919,28 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 389 "../usage.c" +#line 390 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 651 "../usage.c" +#line 652 "../usage.c" puts(_("requires the option '%s'\n")); -#line 654 "../usage.c" +#line 655 "../usage.c" puts(_("requires these options:\n")); -#line 1320 "../usage.c" +#line 1321 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1314 "../usage.c" +#line 1315 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); #line 167 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 909 "../usage.c" +#line 910 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); #line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1151 "../usage.c" +#line 1152 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 772 "../usage.c" +#line 773 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 9aa63001d..ede726786 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed July 28, 2013 at 11:39:45 AM by AutoGen 5.17.5pre10 + * It has been AutoGen-ed August 1, 2013 at 02:32:32 AM by AutoGen 5.18.1pre3 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 39:0:14 templates. + * Generated from AutoOpts 40:1:15 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 159744 +#define AO_TEMPLATE_VERSION 163841 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman index a8eb2f272..a3fd008d3 100644 --- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman +++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman @@ -1,8 +1,8 @@ -.TH ntpsnmpd 1ntpsnmpdman "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpsnmpd 1ntpsnmpdman "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:52 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:40 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -21,15 +21,15 @@ is an SNMP MIB agent designed to interface with .Xr ntpd 1ntpdmdoc . .SH "OPTIONS" .TP -.BR \-n ", " \-\-nofork +.BR \-n ", " \-\-nofork Do not fork. .sp .TP -.BR \-p ", " \-\-syslog +.BR \-p ", " \-\-syslog Log to syslog(). .sp .TP -.BR \-\-agentxsocket "=\fIstring\fP" +.BR \-\-agentxsocket "=\fIstring\fP" The socket address ntpsnmpd uses to connect to net-snmpd. The default \fIstring\fP for this option is: .ti +4 @@ -74,25 +74,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE .B currently uses a private MIB OID, diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc index 7fba547dd..787970385 100644 --- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc +++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:58 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:35 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -71,25 +71,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE .Nm currently uses a private MIB OID, diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in index e2c16cbe2..1257e7b42 100644 --- a/ntpsnmpd/ntpsnmpd.man.in +++ b/ntpsnmpd/ntpsnmpd.man.in @@ -1,8 +1,8 @@ -.TH ntpsnmpd @NTPSNMPD_MS@ "28 Jul 2013" "4.2.7p377" "User Commands" +.TH ntpsnmpd @NTPSNMPD_MS@ "01 Aug 2013" "4.2.7p377" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:52 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:40 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -21,15 +21,15 @@ is an SNMP MIB agent designed to interface with .Xr ntpd @NTPD_MS@ . .SH "OPTIONS" .TP -.BR \-n ", " \-\-nofork +.BR \-n ", " \-\-nofork Do not fork. .sp .TP -.BR \-p ", " \-\-syslog +.BR \-p ", " \-\-syslog Log to syslog(). .sp .TP -.BR \-\-agentxsocket "=\fIstring\fP" +.BR \-\-agentxsocket "=\fIstring\fP" The socket address ntpsnmpd uses to connect to net-snmpd. The default \fIstring\fP for this option is: .ti +4 @@ -74,25 +74,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE .B currently uses a private MIB OID, diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in index c3a25b296..0ad2955dd 100644 --- a/ntpsnmpd/ntpsnmpd.mdoc.in +++ b/ntpsnmpd/ntpsnmpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:39:58 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:32:35 AM by AutoGen 5.18.1pre3 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -71,25 +71,6 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE .Nm currently uses a private MIB OID, diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi index 4ffc5cc1c..1ee886ac6 100644 --- a/scripts/invoke-ntp-wait.texi +++ b/scripts/invoke-ntp-wait.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp-wait.texi) # -# It has been AutoGen-ed July 28, 2013 at 11:36:19 AM by AutoGen 5.17.5pre10 +# It has been AutoGen-ed August 1, 2013 at 02:31:28 AM by AutoGen 5.18.1pre3 # From the definitions ntp-wait-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -60,8 +60,8 @@ with a status code of 0. @exampleindent 0 @example -/deacon/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]), -running under Perl version 5.8.8. +/home/stenn/ntp-dev-autogen/A.psp-fb1/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.06 [paranoid]), +running under Perl version 5.8.9. Usage: ntp-wait [-OPTIONS [-MORE_OPTIONS]] [--] [PROGRAM_ARG1 ...] diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman index 54c284cb9..789eb484d 100644 --- a/scripts/ntp-wait.1ntp-waitman +++ b/scripts/ntp-wait.1ntp-waitman @@ -1,8 +1,8 @@ -.TH ntp-wait 1ntp-waitman "28 Jul 2013" "ntp (4.2.7p377)" "User Commands" +.TH ntp-wait 1ntp-waitman "01 Aug 2013" "ntp (4.2.7p377)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.man) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:36:15 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:29 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp-wait-opts.def .\" and the template file agman-cmd.tpl .\" @@ -29,11 +29,11 @@ has not yet produced a synchronized and stable system clock. .PP .B will do this quietly, unless the -v + v flag is provided. .SH "OPTIONS" .TP -.BR \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP +.BR \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP Number of times to check ntpd. This option takes an integer number as its argument. The default \fInum\-tries\fP for this option is: @@ -43,7 +43,7 @@ The default \fInum\-tries\fP for this option is: The maximum number of times we will check \fBntpd\fP to see if it has been able to synchronize and stabilize the system clock. .TP -.BR \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP +.BR \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP How long to sleep between tries. This option takes an integer number as its argument. The default \fIsecs\-between\-tries\fP for this option is: @@ -53,7 +53,7 @@ The default \fIsecs\-between\-tries\fP for this option is: We will sleep for \fIsecs-between-tries\fP after each query of \fBntpd\fP that returns "the time is not yet stable". .TP -.BR \-v ", " \-\- +.BR \-v ", " \-\- Be verbose. .sp By default, \fBntp-wait\fP is silent. @@ -76,25 +76,6 @@ by loading values from environment variables named: \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2man' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm \-f $list - list=`ls \-1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH "EXIT STATUS" diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc index b4b173c59..c3b03a953 100644 --- a/scripts/ntp-wait.1ntp-waitmdoc +++ b/scripts/ntp-wait.1ntp-waitmdoc @@ -1,9 +1,9 @@ -.Dd July 28 2013 +.Dd August 1 2013 .Dt NTP_WAIT 1ntp-waitmdoc User Commands -.Os SunOS 5.10 +.Os FreeBSD 6.4-STABLE .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.mdoc) .\" -.\" It has been AutoGen-ed July 28, 2013 at 11:36:21 AM by AutoGen 5.17.5pre10 +.\" It has been AutoGen-ed August 1, 2013 at 02:31:25 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp-wait-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -75,25 +75,6 @@ by loading values from environment variables named: \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP .fi .ad -cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option\-presets' - for f in $list ; do cat $f ; echo ; done - rm \-f $list name - list='implementation\-notes environment files examples exit\-status errors - compatibility see\-also conforming\-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end\-doc - rm \-f $list - list=`ls \-1 *`' .end\-doc' - for f in $list ; do cat $f ; echo ; done - rm \-f $list -} 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh "EXIT STATUS" diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html index fa31c31a0..21a7e8c4b 100644 --- a/scripts/ntp-wait.html +++ b/scripts/ntp-wait.html @@ -3,7 +3,7 @@ Ntp-wait User's Manual - + @@ -14,18 +14,20 @@ pre.smallformat { font-family:inherit; font-size:smaller } pre.smallexample { font-size:smaller } pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family: serif; font-weight: normal; } + span.sc { font-variant:small-caps } + span.roman { font-family:serif; font-weight:normal; } + span.sansserif { font-family:sans-serif; font-weight:normal; } -->

Ntp-wait User's Manual

+

-Next: , +Next: , Previous: (dir), Up: (dir) -
+

Simple Network Time Protocol User Manual

@@ -56,9 +58,11 @@ accurate and stable time.
-

+ -
+

+ +
@@ -69,9 +73,11 @@ This can be useful at boot time, to delay the boot sequence until after ntpd -g has set the time.
-

+ -
+

+ +

Invoking ntp-wait

@@ -99,7 +105,7 @@ using the agtexi-cmd template and the option descriptions for the < This software is released under the NTP license, <http://ntp.org/license>.
+ +

-Next: , +Next: , Up: ntp-wait Invocation -
+
-

ntp-wait help/usage (--help)

+

ntp-wait help/usage (--help)

This is the automatically generated usage text for ntp-wait.

The text printed is the same whether selected with the help option -(--help) or the more-help option (--more-help). more-help will print +(--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. -

/deacon/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
-running under Perl version 5.8.8.
+
/home/stenn/ntp-dev-autogen/A.psp-fb1/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.06 [paranoid]),
+running under Perl version 5.8.9.
 
 Usage: ntp-wait [-OPTIONS [-MORE_OPTIONS]] [--] [PROGRAM_ARG1 ...]
 
@@ -144,41 +152,47 @@ Space is not required between options and their arguments.
    See ``perldoc Getopt::Std'' about $Getopt::Std::STANDARD_HELP_VERSION.]
 

   

+
+
 

-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-

+
 

 
 
option (-n)

 
 

 This is the “number of times to check ntpd” option. 
-This option takes an argument number num-tries. 
+This option takes an argument number num-tries. 
 The maximum number of times we will check ntpd to see if
 it has been able to synchronize and stabilize the system clock. 
 

+
+
 

-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-

+
 

 
 
option (-s)

 
 

 This is the “how long to sleep between tries” option. 
-This option takes an argument number secs-between-tries. 
-We will sleep for secs-between-tries after each query
+This option takes an argument number secs-between-tries. 
+We will sleep for secs-between-tries after each query
 of ntpd that returns "the time is not yet stable". 
 

+
+
 

-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-

+
 

 
 
option (-v)

@@ -189,11 +203,13 @@ By default, ntp-wait is silent.
 With this option, ntp-wait will provide status information.
 
 

+
+
 

-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-

+
 

 
 
presetting/configuring ntp-wait

@@ -215,41 +231,47 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      

-
version
Only print the version.  This is the default. 
-
copyright
Name the copyright usage licensing terms. 
-
verbose
Print the full copyright usage licensing terms. 
+
‘version’
Only print the version.  This is the default. 
+
‘copyright’
Name the copyright usage licensing terms. 
+
‘verbose’
Print the full copyright usage licensing terms. 
 

 
 

+
+
 

-Next: ,
+Next: ,
 Previous: ntp-wait config,
 Up: ntp-wait Invocation
-

+
 

 
 
ntp-wait exit status

 
 
One of the following exit values will be returned:
      

-
0 (EXIT_SUCCESS)
Successful program execution. 
-
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
+
‘0 (EXIT_SUCCESS)’
Successful program execution. 
+
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
 

   

+
+
 

-Next: ,
+Next: ,
 Previous: ntp-wait exit status,
 Up: ntp-wait Invocation
-

+
 

 
 
ntp-wait Authors

 
 

+
+
 

-Previous: ntp-wait Authors,
+Previous: ntp-wait Authors,
 Up: ntp-wait Invocation
-

+
 

 
 
ntp-wait Notes

diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index a386ca4c6..db95b3202 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "28 Jul 2013" "ntp (4.2.7p377)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "01 Aug 2013" "ntp (4.2.7p377)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:36:15 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:31:29 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -29,11 +29,11 @@ has not yet produced a synchronized and stable system clock.
 .PP
 .B 
 will do this quietly, unless the
-v
+ v
 flag is provided.
 .SH "OPTIONS"
 .TP
-.BR \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
+.BR  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
 Number of times to check ntpd.
 This option takes an integer number as its argument.
 The default \fInum\-tries\fP for this option is:
@@ -43,7 +43,7 @@ The default \fInum\-tries\fP for this option is:
 The maximum number of times we will check \fBntpd\fP to see if
 it has been able to synchronize and stabilize the system clock.
 .TP
-.BR \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
+.BR  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
 How long to sleep between tries.
 This option takes an integer number as its argument.
 The default \fIsecs\-between\-tries\fP for this option is:
@@ -53,7 +53,7 @@ The default \fIsecs\-between\-tries\fP for this option is:
 We will sleep for \fIsecs-between-tries\fP after each query
 of \fBntpd\fP that returns "the time is not yet stable".
 .TP
-.BR \-v ", " \-\-
+.BR  \-v ", " \-\-
 Be verbose.
 .sp
 By default, \fBntp-wait\fP is silent.
@@ -76,25 +76,6 @@ by loading values from environment variables named:
   \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "EXIT STATUS"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index 6e8360482..151532c24 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd July 28 2013
+.Dd August 1 2013
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:36:21 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:31:25 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -75,25 +75,6 @@ by loading values from environment variables named:
   \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "EXIT STATUS"
diff --git a/sntp/include/autogen-version.def b/sntp/include/autogen-version.def
index cfe3b779a..96b750502 100644
--- a/sntp/include/autogen-version.def
+++ b/sntp/include/autogen-version.def
@@ -1,4 +1,4 @@
-#assert (version-compare >= autogen-version "5.17.3")
-// we need at least 5.17.3pre10
+#assert (version-compare > autogen-version "5.18")
+// running 5.18.1pre3 right now...
 // >= is usually what we want.
 guard-option-names;
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index dff13058e..6c88a1b43 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 #
-# It has been AutoGen-ed  July 28, 2013 at 11:40:39 AM by AutoGen 5.17.5pre10
+# It has been AutoGen-ed  August  1, 2013 at 02:33:05 AM by AutoGen 5.18.1pre3
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index c637e9c82..0d2bc0db3 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *
- *  It has been AutoGen-ed  July 28, 2013 at 11:30:41 AM by AutoGen 5.17.5pre10
+ *  It has been AutoGen-ed  August  1, 2013 at 02:31:22 AM by AutoGen 5.18.1pre3
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 39:0:14 templates.
+ * Generated from AutoOpts 40:1:15 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -747,7 +747,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
-                          | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS,
+                       | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL,  NULL,
@@ -1211,10 +1211,10 @@ translate_option_strings(void)
 static void bogus_function(void) {
   /* TRANSLATORS:
 
-     The following dummy function was crated solely so that xgettext can extract
-     the correct strings.  These strings are actually referenced by a field name
-     in the sntpOptions structure noted in the comments below.  The
-     literal text is defined in sntp_opt_strs.
+     The following dummy function was crated solely so that xgettext can
+     extract the correct strings.  These strings are actually referenced
+     by a field name in the sntpOptions structure noted in the
+     comments below.  The literal text is defined in sntp_opt_strs.
    
      NOTE: the strings below are segmented with respect to the source string
      sntp_opt_strs.  The strings above are handed off for translation
@@ -1331,9 +1331,9 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   /* referenced via sntpOptions.pzShortUsage */
   puts(_("<<>>"));
   /* LIBOPTS-MESSAGES: */
-#line 45 "../autoopts.c"
+#line 67 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 71 "../autoopts.c"
+#line 93 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
@@ -1342,7 +1342,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 #line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 58 "../autoopts.c"
+#line 80 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
 #line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
@@ -1357,9 +1357,9 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("could not locate the 'help' option"));
 #line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 747 "../usage.c"
+#line 748 "../usage.c"
   puts(_("invalid argument type specified"));
-#line 589 "../find.c"
+#line 598 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
@@ -1367,7 +1367,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
-#line 290 "../find.c"
+#line 293 "../find.c"
   puts(_("%s: ambiguous option name: %s (matches %d options)\n"));
 #line 161 "../check.c"
   puts(_("%s: Command line arguments required\n"));
@@ -1384,42 +1384,42 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
        "\t'n' - version and full copyright notice\n"));
 #line 58 "../check.c"
   puts(_("%s error:  the '%s' and '%s' options conflict\n"));
-#line 214 "../find.c"
+#line 217 "../find.c"
   puts(_("%s: The '%s' option has been disabled."));
-#line 421 "../find.c"
+#line 430 "../find.c"
   puts(_("%s: The '%s' option has been disabled."));
 #line 38 "../alias.c"
   puts(_("-equivalence"));
-#line 460 "../find.c"
+#line 469 "../find.c"
   puts(_("%s: illegal option -- %c\n"));
 #line 110 "../reset.c"
   puts(_("%s: illegal option -- %c\n"));
-#line 268 "../find.c"
+#line 271 "../find.c"
   puts(_("%s: illegal option -- %s\n"));
-#line 746 "../find.c"
+#line 755 "../find.c"
   puts(_("%s: illegal option -- %s\n"));
 #line 118 "../reset.c"
   puts(_("%s: illegal option -- %s\n"));
-#line 332 "../find.c"
+#line 335 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
 #line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
 #line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 746 "../usage.c"
+#line 747 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1080 "../usage.c"
+#line 1081 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 379 "../find.c"
+#line 385 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
-#line 518 "../find.c"
+#line 527 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
 #line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
   puts(_("%s error:  The %s option is required\n"));
-#line 623 "../find.c"
+#line 632 "../find.c"
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
@@ -1449,7 +1449,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
 #line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 329 "../usage.c"
+#line 330 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
@@ -1459,17 +1459,17 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
-#line 414 "../usage.c"
+#line 415 "../usage.c"
   puts(_("standard output"));
-#line 624 "../usage.c"
+#line 625 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard error"));
-#line 414 "../usage.c"
+#line 415 "../usage.c"
   puts(_("standard error"));
-#line 624 "../usage.c"
+#line 625 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
@@ -1479,9 +1479,9 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
-#line 413 "../usage.c"
+#line 414 "../usage.c"
   puts(_("write"));
-#line 623 "../usage.c"
+#line 624 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1502,29 +1502,29 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 872 "../usage.c"
+#line 873 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1147 "../usage.c"
+#line 1148 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 923 "../usage.c"
+#line 924 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 836 "../usage.c"
+#line 837 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1116 "../usage.c"
+#line 1117 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1114 "../usage.c"
+#line 1115 "../usage.c"
   puts(_("This option has been disabled"));
-#line 863 "../usage.c"
+#line 864 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1193 "../usage.c"
+#line 1194 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 379 "../usage.c"
+#line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
 #line 916 "../makeshell.c"
@@ -1534,33 +1534,33 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
        "a shell script to parse the options for %s:\n\n"));
 #line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 896 "../usage.c"
+#line 897 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 917 "../usage.c"
+#line 918 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 381 "../usage.c"
+#line 382 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 903 "../usage.c"
+#line 904 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 890 "../usage.c"
+#line 891 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1308 "../usage.c"
+#line 1309 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1244 "../usage.c"
-  puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1302 "../usage.c"
+#line 1245 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
 #line 1303 "../usage.c"
+  puts(_("  Flg Arg Option-Name    Description\n"));
+#line 1304 "../usage.c"
   puts(_(" %3s %s"));
-#line 1309 "../usage.c"
+#line 1310 "../usage.c"
   puts(_(" %3s %s"));
-#line 386 "../usage.c"
+#line 387 "../usage.c"
   puts(_("The '-#' option may omit the hash char\n"));
-#line 382 "../usage.c"
+#line 383 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 970 "../usage.c"
+#line 971 "../usage.c"
   puts(_(" - reading file %s"));
-#line 408 "../usage.c"
+#line 409 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1569,17 +1569,17 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 902 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 943 "../usage.c"
+#line 944 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1191 "../usage.c"
+#line 1192 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 681 "../usage.c"
+#line 682 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 676 "../usage.c"
+#line 677 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1597,28 +1597,28 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 389 "../usage.c"
+#line 390 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 651 "../usage.c"
+#line 652 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 654 "../usage.c"
+#line 655 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1320 "../usage.c"
+#line 1321 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1314 "../usage.c"
+#line 1315 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
 #line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 909 "../usage.c"
+#line 910 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
 #line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1151 "../usage.c"
+#line 1152 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 772 "../usage.c"
+#line 773 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 21a719c51..6a02db584 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *
- *  It has been AutoGen-ed  July 28, 2013 at 11:30:40 AM by AutoGen 5.17.5pre10
+ *  It has been AutoGen-ed  August  1, 2013 at 02:31:22 AM by AutoGen 5.18.1pre3
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 39:0:14 templates.
+ * Generated from AutoOpts 40:1:15 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 159744
+#define AO_TEMPLATE_VERSION 163841
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 4a8dd349b..6931bb1b1 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "28 Jul 2013" "4.2.7p377" "User Commands"
+.TH sntp 1sntpman "01 Aug 2013" "4.2.7p377" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:35 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:33:06 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -56,7 +56,7 @@ Finally, the
 of the host is reported.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " \-\-ipv4
+.BR  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -64,7 +64,7 @@ ipv6.
 Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " \-\-ipv6
+.BR  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -72,7 +72,7 @@ ipv4.
 Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
+.BR  \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
 Enable authentication with the key \fBauth-keynumber\fP.
 This option takes an integer number as its argument.
 .sp
@@ -81,7 +81,7 @@ argument.  The argument of this option is the \fBkeyid\fP, a
 number specified in the \fBkeyfile\fP as this key's identifier.
 See the \fBkeyfile\fP option (\fB-k\fP) for more details.
 .TP
-.BR \-b " \fIbroadcast\-address\fP, " \-\-broadcast "=" \fIbroadcast\-address\fP
+.BR  \-b " \fIbroadcast\-address\fP, " \-\-broadcast "=" \fIbroadcast\-address\fP
 Listen to the address specified for broadcast time sync.
 This option may appear an unlimited number of times.
 .sp
@@ -89,7 +89,7 @@ If specified \fBsntp\fP will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
 can (and probably should) be modified with \fB-t\fP.
 .TP
-.BR \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
+.BR  \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
 .sp
@@ -103,18 +103,18 @@ The \fB-c\fP or \fB--concurrent\fP flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
-.BR \-d ", " \-\-debug\-level
+.BR  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+.BR  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
+.BR  \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
 The gap (in milliseconds) between time requests.
 This option takes an integer number as its argument.
 The default \fImilliseconds\fP for this option is:
@@ -126,7 +126,7 @@ there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
 milliseconds.
 .TP
-.BR \-K " \fIfile\-name\fP, " \-\-kod "=" \fIfile\-name\fP
+.BR  \-K " \fIfile\-name\fP, " \-\-kod "=" \fIfile\-name\fP
 KoD history filename.
 The default \fIfile\-name\fP for this option is:
 .ti +4
@@ -135,7 +135,7 @@ The default \fIfile\-name\fP for this option is:
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .TP
-.BR \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
+.BR  \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
 Look in this file for the key specified with \fB-a\fP.
 .sp
 This option specifies the keyfile.
@@ -143,13 +143,13 @@ This option specifies the keyfile.
 \fIkeyno\fP in this file.  See \fBntp.keys(5)\fP for more
 information.
 .TP
-.BR \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
+.BR  \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
 .sp
 This option causes the client to write log messages to the specified
 \fIlogfile\fP.
 .TP
-.BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
+.BR  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
 Adjustments less than \fBsteplimit\fP msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
@@ -164,7 +164,7 @@ If the time adjustment is less than \fIsteplimit\fP milliseconds,
 slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
 correction using \fBsettimeofday(2)\fP. 
 .TP
-.BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
+.BR  \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send \fBint\fP as our NTP protocol version.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
@@ -181,21 +181,21 @@ The default \fInumber\fP for this option is:
 When sending requests to a remote server, tell them we are running
 NTP protocol version \fIntpversion\fP .
 .TP
-.BR \-r ", " \-\-usereservedport
+.BR  \-r ", " \-\-usereservedport
 Use the NTP Reserved Port (port 123).
 .sp
 Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
-.BR \-S ", " \-\-step
+.BR  \-S ", " \-\-step
 OK to 'step' the time with \fBsettimeofday(2)\fP.
 .sp
 .TP
-.BR \-s ", " \-\-slew
+.BR  \-s ", " \-\-slew
 OK to 'slew' the time with \fBadjtime(2)\fP.
 .sp
 .TP
-.BR \-t " \fIseconds\fP, " \-\-timeout "=" \fIseconds\fP
+.BR  \-t " \fIseconds\fP, " \-\-timeout "=" \fIseconds\fP
 The number of seconds to wait for responses.
 This option takes an integer number as its argument.
 The default \fIseconds\fP for this option is:
@@ -208,7 +208,7 @@ more than enough for a unicast response.  If \fBsntp\fP is
 only waiting for a broadcast response a longer timeout is
 likely needed.
 .TP
-.BR \-\-wait, " \fB\-\-no\-wait\fP"
+.BR  \-\-wait, " \fB\-\-no\-wait\fP"
 Wait for pending replies (if not setting the time).
 The \fIno\-wait\fP form will disable the option.
 This option is enabled by default.
@@ -249,25 +249,6 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .TP
 .BR Li "sntp ntpserver.somewhere"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 9c55b2914..a33737f42 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd July 28 2013
+.Dd August 1 2013
 .Dt SNTP 1sntpmdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:41 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:33:01 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -232,25 +232,6 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Bl -tag -width indent
 .It Li "sntp ntpserver.somewhere"
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 6c8f3d9bf..66a536f4c 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -3,7 +3,7 @@
 Sntp User's Manual
 
 
-
+
 
 
 
@@ -14,18 +14,20 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc { font-variant:small-caps }
-  span.roman { font-family: serif; font-weight: normal; } 
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 -->
 
 
 
Sntp User's Manual

 

+
 

-Next: ,
+Next: ,
 Previous: (dir),
 Up: (dir)
-

+
 

 
 
Simple Network Time Protocol User Manual

@@ -55,9 +57,10 @@ IETF specification.
 
 
 

-

 
-

+

+
+
 

 
 
@@ -76,9 +79,10 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 

-

 
-

+

+
+
 

 
 
Invoking sntp

@@ -134,7 +138,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
 

+
 

-Next: ,
+Next: ,
 Up: sntp Invocation
-

+
 

 
-
sntp help/usage (--help)

+
sntp help/usage (--help)

 
 

 This is the automatically generated usage text for sntp.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
 
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p377
@@ -232,11 +237,12 @@ Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 exit 0
 

   

+
 

-Next: ,
+Next: ,
 Previous: sntp usage,
 Up: sntp Invocation
-

+
 

 
 
ipv4 option (-4)

@@ -253,11 +259,12 @@ ipv6.
   
Force DNS resolution of the following host names on the command line
 to the IPv4 namespace. 
 

+
 

-Next: ,
+Next: ,
 Previous: sntp ipv4,
 Up: sntp Invocation
-

+
 

 
 
ipv6 option (-6)

@@ -274,35 +281,37 @@ ipv4.
   
Force DNS resolution of the following host names on the command line
 to the IPv6 namespace. 
 

+
 

-Next: ,
+Next: ,
 Previous: sntp ipv6,
 Up: sntp Invocation
-

+
 

 
 
authentication option (-a)

 
 

 This is the “enable authentication with the key auth-keynumber” option. 
-This option takes an argument number auth-keynumber. 
+This option takes an argument number auth-keynumber. 
 Enable authentication using the key specified in this option's
-argument.  The argument of this option is the keyid, a
-number specified in the keyfile as this key's identifier. 
-See the keyfile option (-k) for more details. 
+argument.  The argument of this option is the keyid, a
+number specified in the keyfile as this key's identifier. 
+See the keyfile option (-k) for more details. 
 

+
 

-Next: ,
+Next: ,
 Previous: sntp authentication,
 Up: sntp Invocation
-

+
 

 
 
broadcast option (-b)

 
 

 This is the “listen to the address specified for broadcast time sync” option. 
-This option takes an argument string broadcast-address.
+This option takes an argument string broadcast-address.
 
 
This option has some usage constraints.  It:
      
    
@@ -311,20 +320,21 @@ This option takes an argument string broadcast-address
 
   
    If specified sntp will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can (and probably should) be modified with -t. 
+can (and probably should) be modified with -t. 
 
    
+
 
    
-Next: ,
+Next: ,
 Previous: sntp broadcast,
 Up: sntp Invocation
-
    
+
 
    
 
 
    concurrent option (-c)
    
 
 
    
 This is the “concurrently query all ips returned for host-name” option. 
-This option takes an argument string host-name.
+This option takes an argument string host-name.
 
 
    This option has some usage constraints.  It:
      
      
@@ -337,79 +347,84 @@ as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore sntp will send queries to these IPs
 one after another, with a 2-second gap in between each query.
 
-  
      The -c or --concurrent flag says that any IPs
+  
      The -c or --concurrent flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp concurrent,
 Up: sntp Invocation
-
      
+
 
      
 
 
      gap option (-g)
      
 
 
      
 This is the “the gap (in milliseconds) between time requests” option. 
-This option takes an argument number milliseconds. 
+This option takes an argument number milliseconds. 
 Since we're only going to use the first valid response we get and
 there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
 milliseconds. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp gap,
 Up: sntp Invocation
-
      
+
 
      
 
 
      kod option (-K)
      
 
 
      
 This is the “kod history filename” option. 
-This option takes an argument file file-name. 
+This option takes an argument file file-name. 
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp kod,
 Up: sntp Invocation
-
      
+
 
      
 
 
      keyfile option (-k)
      
 
 
      
-This is the “look in this file for the key specified with -a” option. 
-This option takes an argument file file-name. 
+This is the “look in this file for the key specified with -a” option. 
+This option takes an argument file file-name. 
 This option specifies the keyfile. 
-sntp will search for the key specified with -a
-keyno in this file.  See ntp.keys(5) for more
+sntp will search for the key specified with -a
+keyno in this file.  See ntp.keys(5) for more
 information. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp keyfile,
 Up: sntp Invocation
-
      
+
 
      
 
 
      logfile option (-l)
      
 
 
      
 This is the “log to specified logfile” option. 
-This option takes an argument file file-name. 
+This option takes an argument file file-name. 
 This option causes the client to write log messages to the specified
-logfile. 
+logfile. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp logfile,
 Up: sntp Invocation
-
      
+
 
      
 
 
      steplimit option (-M)
      
@@ -417,15 +432,16 @@ Up: sntp Invocation
 
      
 This is the “adjustments less than steplimit msec will be slewed” option. 
 This option takes an argument number. 
-If the time adjustment is less than steplimit milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the
-correction using settimeofday(2). 
+If the time adjustment is less than steplimit milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the
+correction using settimeofday(2). 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp steplimit,
 Up: sntp Invocation
-
      
+
 
      
 
 
      ntpversion option (-o)
      
@@ -434,13 +450,14 @@ Up: sntp Invocation
 This is the “send int as our ntp protocol version” option. 
 This option takes an argument number. 
 When sending requests to a remote server, tell them we are running
-NTP protocol version ntpversion . 
+NTP protocol version ntpversion . 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp ntpversion,
 Up: sntp Invocation
-
      
+
 
      
 
 
      usereservedport option (-r)
      
@@ -450,29 +467,31 @@ This is the “use the ntp reserved port (port 123)” option.
 Use port 123, which is reserved for NTP, for our network
 communications. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp usereservedport,
 Up: sntp Invocation
-
      
+
 
      
 
 
      timeout option (-t)
      
 
 
      
 This is the “the number of seconds to wait for responses” option. 
-This option takes an argument number seconds. 
+This option takes an argument number seconds. 
 When waiting for a reply, sntp will wait the number
 of seconds specified before giving up.  The default should be
 more than enough for a unicast response.  If sntp is
 only waiting for a broadcast response a longer timeout is
 likely needed. 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp timeout,
 Up: sntp Invocation
-
      
+
 
      
 
 
      wait option
      
@@ -488,11 +507,12 @@ This is the “wait for pending replies (if not setting the time)” opt
   
      If we are not setting the time, wait for all pending responses.
 
 
      
+
 
      
-Next: ,
+Next: ,
 Previous: sntp wait,
 Up: sntp Invocation
-
      
+
 
      
 
 
      presetting/configuring sntp
      
@@ -510,9 +530,9 @@ values are treated like option arguments.
 
    • $PWD
 
    
   The environment variables HOME, and PWD
-are expanded and replaced when sntp runs. 
+are expanded and replaced when sntp runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named .ntprc is searched for
+For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
   
    Configuration files may be in a wide variety of formats. 
@@ -554,62 +574,67 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      
    
-
    version
    Only print the version.  This is the default. 
-
    copyright
    Name the copyright usage licensing terms. 
-
    verbose
    Print the full copyright usage licensing terms. 
+
    ‘version’
    Only print the version.  This is the default. 
+
    ‘copyright’
    Name the copyright usage licensing terms. 
+
    ‘verbose’
    Print the full copyright usage licensing terms. 
 
    
 
 
    
+
 
    
-Next: ,
+Next: ,
 Previous: sntp config,
 Up: sntp Invocation
-
    
+
 
    
 
 
    sntp exit status
    
 
 
    One of the following exit values will be returned:
      
    
-
    0 (EXIT_SUCCESS)
    Successful program execution. 
-
    1 (EXIT_FAILURE)
    The operation failed or the command syntax was not valid. 
-
    66 (EX_NOINPUT)
    A specified configuration file could not be loaded. 
-
    70 (EX_SOFTWARE)
    libopts had an internal operational error.  Please report
+
    ‘0 (EXIT_SUCCESS)’
    Successful program execution. 
+
    ‘1 (EXIT_FAILURE)’
    The operation failed or the command syntax was not valid. 
+
    ‘66 (EX_NOINPUT)’
    A specified configuration file could not be loaded. 
+
    ‘70 (EX_SOFTWARE)’
    libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
    
   
    
+
 
    
-Next: ,
+Next: ,
 Previous: sntp exit status,
 Up: sntp Invocation
-
    
+
 
    
 
 
    sntp Usage
    
 
 
    
+
 
    
-Next: ,
+Next: ,
 Previous: sntp Usage,
 Up: sntp Invocation
-
    
+
 
    
 
 
    sntp Authors
    
 
 
    
+
 
    
-Previous: sntp Authors,
+Previous: sntp Authors,
 Up: sntp Invocation
-
    
+
 
    
 
 
    sntp Notes
    
 
 
    
-
    
 
-
    
+
    
+
+
 
    
 
 
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index ff340cfe9..5e1dc83f0 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "28 Jul 2013" "4.2.7p377" "User Commands"
+.TH sntp @SNTP_MS@ "01 Aug 2013" "4.2.7p377" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:35 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:33:06 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -56,7 +56,7 @@ Finally, the
 of the host is reported.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " \-\-ipv4
+.BR  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -64,7 +64,7 @@ ipv6.
 Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " \-\-ipv6
+.BR  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -72,7 +72,7 @@ ipv4.
 Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
+.BR  \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
 Enable authentication with the key \fBauth-keynumber\fP.
 This option takes an integer number as its argument.
 .sp
@@ -81,7 +81,7 @@ argument.  The argument of this option is the \fBkeyid\fP, a
 number specified in the \fBkeyfile\fP as this key's identifier.
 See the \fBkeyfile\fP option (\fB-k\fP) for more details.
 .TP
-.BR \-b " \fIbroadcast\-address\fP, " \-\-broadcast "=" \fIbroadcast\-address\fP
+.BR  \-b " \fIbroadcast\-address\fP, " \-\-broadcast "=" \fIbroadcast\-address\fP
 Listen to the address specified for broadcast time sync.
 This option may appear an unlimited number of times.
 .sp
@@ -89,7 +89,7 @@ If specified \fBsntp\fP will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
 can (and probably should) be modified with \fB-t\fP.
 .TP
-.BR \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
+.BR  \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
 .sp
@@ -103,18 +103,18 @@ The \fB-c\fP or \fB--concurrent\fP flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
-.BR \-d ", " \-\-debug\-level
+.BR  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+.BR  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
+.BR  \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
 The gap (in milliseconds) between time requests.
 This option takes an integer number as its argument.
 The default \fImilliseconds\fP for this option is:
@@ -126,7 +126,7 @@ there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
 milliseconds.
 .TP
-.BR \-K " \fIfile\-name\fP, " \-\-kod "=" \fIfile\-name\fP
+.BR  \-K " \fIfile\-name\fP, " \-\-kod "=" \fIfile\-name\fP
 KoD history filename.
 The default \fIfile\-name\fP for this option is:
 .ti +4
@@ -135,7 +135,7 @@ The default \fIfile\-name\fP for this option is:
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .TP
-.BR \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
+.BR  \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
 Look in this file for the key specified with \fB-a\fP.
 .sp
 This option specifies the keyfile.
@@ -143,13 +143,13 @@ This option specifies the keyfile.
 \fIkeyno\fP in this file.  See \fBntp.keys(5)\fP for more
 information.
 .TP
-.BR \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
+.BR  \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
 .sp
 This option causes the client to write log messages to the specified
 \fIlogfile\fP.
 .TP
-.BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
+.BR  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
 Adjustments less than \fBsteplimit\fP msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
@@ -164,7 +164,7 @@ If the time adjustment is less than \fIsteplimit\fP milliseconds,
 slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
 correction using \fBsettimeofday(2)\fP. 
 .TP
-.BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
+.BR  \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send \fBint\fP as our NTP protocol version.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
@@ -181,21 +181,21 @@ The default \fInumber\fP for this option is:
 When sending requests to a remote server, tell them we are running
 NTP protocol version \fIntpversion\fP .
 .TP
-.BR \-r ", " \-\-usereservedport
+.BR  \-r ", " \-\-usereservedport
 Use the NTP Reserved Port (port 123).
 .sp
 Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
-.BR \-S ", " \-\-step
+.BR  \-S ", " \-\-step
 OK to 'step' the time with \fBsettimeofday(2)\fP.
 .sp
 .TP
-.BR \-s ", " \-\-slew
+.BR  \-s ", " \-\-slew
 OK to 'slew' the time with \fBadjtime(2)\fP.
 .sp
 .TP
-.BR \-t " \fIseconds\fP, " \-\-timeout "=" \fIseconds\fP
+.BR  \-t " \fIseconds\fP, " \-\-timeout "=" \fIseconds\fP
 The number of seconds to wait for responses.
 This option takes an integer number as its argument.
 The default \fIseconds\fP for this option is:
@@ -208,7 +208,7 @@ more than enough for a unicast response.  If \fBsntp\fP is
 only waiting for a broadcast response a longer timeout is
 likely needed.
 .TP
-.BR \-\-wait, " \fB\-\-no\-wait\fP"
+.BR  \-\-wait, " \fB\-\-no\-wait\fP"
 Wait for pending replies (if not setting the time).
 The \fIno\-wait\fP form will disable the option.
 This option is enabled by default.
@@ -249,25 +249,6 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .TP
 .BR Li "sntp ntpserver.somewhere"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 2f8ee7c32..2b3d37be6 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd July 28 2013
+.Dd August 1 2013
 .Dt SNTP @SNTP_MS@ User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:41 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:33:01 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -232,25 +232,6 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Bl -tag -width indent
 .It Li "sntp ntpserver.somewhere"
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index 4c5913208..94a05b848 100644
--- a/util/invoke-ntp-keygen.texi
+++ b/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 #
-# It has been AutoGen-ed  July 28, 2013 at 11:40:15 AM by AutoGen 5.17.5pre10
+# It has been AutoGen-ed  August  1, 2013 at 02:32:52 AM by AutoGen 5.18.1pre3
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 3da919dcf..b4228b9b2 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *
- *  It has been AutoGen-ed  July 28, 2013 at 11:40:02 AM by AutoGen 5.17.5pre10
+ *  It has been AutoGen-ed  August  1, 2013 at 02:32:43 AM by AutoGen 5.18.1pre3
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 39:0:14 templates.
+ * Generated from AutoOpts 40:1:15 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -961,7 +961,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)
-                          | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS,
+                       | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, AOUSE_SAVE_OPTS,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL,  NULL,
@@ -1349,10 +1349,10 @@ translate_option_strings(void)
 static void bogus_function(void) {
   /* TRANSLATORS:
 
-     The following dummy function was crated solely so that xgettext can extract
-     the correct strings.  These strings are actually referenced by a field name
-     in the ntp_keygenOptions structure noted in the comments below.  The
-     literal text is defined in ntp_keygen_opt_strs.
+     The following dummy function was crated solely so that xgettext can
+     extract the correct strings.  These strings are actually referenced
+     by a field name in the ntp_keygenOptions structure noted in the
+     comments below.  The literal text is defined in ntp_keygen_opt_strs.
    
      NOTE: the strings below are segmented with respect to the source string
      ntp_keygen_opt_strs.  The strings above are handed off for translation
@@ -1477,9 +1477,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   /* referenced via ntp_keygenOptions.pzShortUsage */
   puts(_("<<>>"));
   /* LIBOPTS-MESSAGES: */
-#line 45 "../autoopts.c"
+#line 67 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 71 "../autoopts.c"
+#line 93 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
@@ -1488,7 +1488,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
 #line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 58 "../autoopts.c"
+#line 80 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
 #line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
@@ -1503,9 +1503,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("could not locate the 'help' option"));
 #line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 747 "../usage.c"
+#line 748 "../usage.c"
   puts(_("invalid argument type specified"));
-#line 589 "../find.c"
+#line 598 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
@@ -1513,7 +1513,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
-#line 290 "../find.c"
+#line 293 "../find.c"
   puts(_("%s: ambiguous option name: %s (matches %d options)\n"));
 #line 161 "../check.c"
   puts(_("%s: Command line arguments required\n"));
@@ -1530,42 +1530,42 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
        "\t'n' - version and full copyright notice\n"));
 #line 58 "../check.c"
   puts(_("%s error:  the '%s' and '%s' options conflict\n"));
-#line 214 "../find.c"
+#line 217 "../find.c"
   puts(_("%s: The '%s' option has been disabled."));
-#line 421 "../find.c"
+#line 430 "../find.c"
   puts(_("%s: The '%s' option has been disabled."));
 #line 38 "../alias.c"
   puts(_("-equivalence"));
-#line 460 "../find.c"
+#line 469 "../find.c"
   puts(_("%s: illegal option -- %c\n"));
 #line 110 "../reset.c"
   puts(_("%s: illegal option -- %c\n"));
-#line 268 "../find.c"
+#line 271 "../find.c"
   puts(_("%s: illegal option -- %s\n"));
-#line 746 "../find.c"
+#line 755 "../find.c"
   puts(_("%s: illegal option -- %s\n"));
 #line 118 "../reset.c"
   puts(_("%s: illegal option -- %s\n"));
-#line 332 "../find.c"
+#line 335 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
 #line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
 #line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 746 "../usage.c"
+#line 747 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1080 "../usage.c"
+#line 1081 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 379 "../find.c"
+#line 385 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
-#line 518 "../find.c"
+#line 527 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
 #line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
   puts(_("%s error:  The %s option is required\n"));
-#line 623 "../find.c"
+#line 632 "../find.c"
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
@@ -1595,7 +1595,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
 #line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 329 "../usage.c"
+#line 330 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
@@ -1605,17 +1605,17 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
-#line 414 "../usage.c"
+#line 415 "../usage.c"
   puts(_("standard output"));
-#line 624 "../usage.c"
+#line 625 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard error"));
-#line 414 "../usage.c"
+#line 415 "../usage.c"
   puts(_("standard error"));
-#line 624 "../usage.c"
+#line 625 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
@@ -1625,9 +1625,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
-#line 413 "../usage.c"
+#line 414 "../usage.c"
   puts(_("write"));
-#line 623 "../usage.c"
+#line 624 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1648,29 +1648,29 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 872 "../usage.c"
+#line 873 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1147 "../usage.c"
+#line 1148 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 923 "../usage.c"
+#line 924 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 836 "../usage.c"
+#line 837 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1116 "../usage.c"
+#line 1117 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1114 "../usage.c"
+#line 1115 "../usage.c"
   puts(_("This option has been disabled"));
-#line 863 "../usage.c"
+#line 864 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1193 "../usage.c"
+#line 1194 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 379 "../usage.c"
+#line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
 #line 916 "../makeshell.c"
@@ -1680,33 +1680,33 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
        "a shell script to parse the options for %s:\n\n"));
 #line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 896 "../usage.c"
+#line 897 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 917 "../usage.c"
+#line 918 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 381 "../usage.c"
+#line 382 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 903 "../usage.c"
+#line 904 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 890 "../usage.c"
+#line 891 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1308 "../usage.c"
+#line 1309 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1244 "../usage.c"
-  puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1302 "../usage.c"
+#line 1245 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
 #line 1303 "../usage.c"
+  puts(_("  Flg Arg Option-Name    Description\n"));
+#line 1304 "../usage.c"
   puts(_(" %3s %s"));
-#line 1309 "../usage.c"
+#line 1310 "../usage.c"
   puts(_(" %3s %s"));
-#line 386 "../usage.c"
+#line 387 "../usage.c"
   puts(_("The '-#' option may omit the hash char\n"));
-#line 382 "../usage.c"
+#line 383 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 970 "../usage.c"
+#line 971 "../usage.c"
   puts(_(" - reading file %s"));
-#line 408 "../usage.c"
+#line 409 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1715,17 +1715,17 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 902 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 943 "../usage.c"
+#line 944 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1191 "../usage.c"
+#line 1192 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 681 "../usage.c"
+#line 682 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 676 "../usage.c"
+#line 677 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1743,28 +1743,28 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 389 "../usage.c"
+#line 390 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 651 "../usage.c"
+#line 652 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 654 "../usage.c"
+#line 655 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1320 "../usage.c"
+#line 1321 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1314 "../usage.c"
+#line 1315 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
 #line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 909 "../usage.c"
+#line 910 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
 #line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1151 "../usage.c"
+#line 1152 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 772 "../usage.c"
+#line 773 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index cda767650..3443c74f5 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *
- *  It has been AutoGen-ed  July 28, 2013 at 11:40:02 AM by AutoGen 5.17.5pre10
+ *  It has been AutoGen-ed  August  1, 2013 at 02:32:43 AM by AutoGen 5.18.1pre3
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 39:0:14 templates.
+ * Generated from AutoOpts 40:1:15 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 159744
+#define AO_TEMPLATE_VERSION 163841
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index c7fe6260d..2aee8472a 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "28 Jul 2013" "ntp (4.2.7p377)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "01 Aug 2013" "ntp (4.2.7p377)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:10 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:32:53 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -56,9 +56,9 @@ other than Autokey.
 .PP
 Some files used by this program are encrypted using a private password.
 The
-p
+ p
 option specifies the password for local encrypted files and the
-q
+ q
 option the password for encrypted files sent to remote sites.
 If no password is specified, the host name returned by the Unix
 .Fn gethostname
@@ -126,7 +126,7 @@ Run the command on as many hosts as necessary.
 Designate one of them as the trusted host (TH) using
 .B 
 with the
-T
+ T
 option and configure it to synchronize from reliable Internet servers.
 Then configure the other hosts to synchronize to the TH directly or
 indirectly.
@@ -140,13 +140,13 @@ RSA type.
 By default, the host key is also the sign key used to encrypt
 signatures.
 A different sign key can be assigned using the
-S
+ S
 option and this can be either RSA or DSA type.
 By default, the signature
 message digest type is MD5, but any combination of sign key type and
 message digest type supported by the OpenSSL library can be specified
 using the
-c
+ c
 option.
 The rules say cryptographic media should be generated with proventic
 filestamps, which means the host should already be synchronized before
@@ -466,10 +466,10 @@ To insure a fresh fileset, remove all
 files.
 Then run
 .B 
-T
+ T
 to generate keys and a trusted certificate.
 On all other hosts do the same, but leave off the
-T
+ T
 flag to generate keys and nontrusted certificates.
 When complete, start the NTP daemons beginning at the lowest stratum
 and working up the tree.
@@ -480,7 +480,7 @@ If it is necessary to use a different sign key or different digest/signature
 scheme than the default, run
 .B 
 with the
-S Ar type
+ S Ar type
 option, where
 ItypeR
 is either
@@ -492,7 +492,7 @@ If it is necessary to use a different certificate scheme than the default,
 run
 .B 
 with the
-c Ar scheme
+ c Ar scheme
 option and selected
 IschemeR
 as needed.
@@ -545,8 +545,8 @@ only as clients have key files that contain only client keys.
 The PC scheme supports only one trusted host in the group.
 On trusted host alice run
 .B 
-P
-p Ar password
+ P
+ p Ar password
 to generate the host key file
 .Pa ntpkey_RSAkey_ Ns Ar alice.filestamp
 and trusted private certificate file
@@ -569,9 +569,9 @@ and certificates for all group hosts, then for every trusted host in the group,
 generate the IFF parameter file.
 On trusted host alice run
 .B 
-T
-I
-p Ar password
+ T
+ I
+ p Ar password
 to produce her parameter file
 .Pa ntpkey_IFFpar_ Ns Ar alice.filestamp ,
 which includes both server and client keys.
@@ -590,7 +590,7 @@ To eliminate this threat, the client keys can be extracted
 from the parameter file and distributed to all restricted clients.
 After generating the parameter file, on alice run
 .B 
-e
+ e
 and pipe the output to a file or mail program.
 Copy or mail this file to all restricted clients.
 On these clients install a soft link from the generic
@@ -604,9 +604,9 @@ and certificates for all group hosts, then for every trusted host
 in the group, generate the IFF parameter file.
 On trusted host alice run
 .B 
-T
-G
-p Ar password
+ T
+ G
+ p Ar password
 to produce her parameter file
 .Pa ntpkey_GQpar_ Ns Ar alice.filestamp ,
 which includes both server and client keys.
@@ -627,8 +627,8 @@ For illustration assume trish is the TA, alice one of several trusted hosts
 and bob one of her clients.
 On TA trish run
 .B 
-V Ar n
-p Ar password ,
+ V Ar n
+ p Ar password ,
 where
 InR
 is the number of revokable keys (typically 5) to produce
@@ -849,7 +849,7 @@ and
 utilities.
 .SH "OPTIONS"
 .TP
-.BR \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
+.BR  \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
 identity modulus bits.
 This option takes an integer number as its argument.
 The value of \fIimbits\fP is constrained to being:
@@ -862,7 +862,7 @@ in the range  256 through 2048
 .sp
 The number of bits in the identity modulus.  The default is 256.
 .TP
-.BR \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
+.BR  \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp
 scheme is one of
@@ -874,7 +874,7 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 .TP
-.BR \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
+.BR  \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
 privatekey cipher.
 .sp
 Select the cipher which is used to encrypt the files containing
@@ -882,41 +882,41 @@ private keys.  The default is three-key triple DES in CBC mode,
 equivalent to "@code{-C des-ede3-cbc".  The openssl tool lists ciphers
 available in "\fBopenssl \-h\fP" output.
 .TP
-.BR \-d ", " \-\-debug\-level
+.BR  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+.BR  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-e ", " \-\-id\-key
+.BR  \-e ", " \-\-id\-key
 Write IFF or GQ identity keys.
 .sp
 Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
 .TP
-.BR \-G ", " \-\-gq\-params
+.BR  \-G ", " \-\-gq\-params
 Generate GQ parameters and keys.
 .sp
 Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist.
 .TP
-.BR \-H ", " \-\-host\-key
+.BR  \-H ", " \-\-host\-key
 generate RSA host key.
 .sp
 Generate new host keys, obsoleting any that may exist.
 .TP
-.BR \-I ", " \-\-iffkey
+.BR  \-I ", " \-\-iffkey
 generate IFF parameters.
 .sp
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
 .TP
-.BR \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
+.BR  \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
 set Autokey group name.
 .sp
 Set the optional Autokey group name to name.  This is used in
@@ -929,18 +929,18 @@ issuer names in the form \fBhost@group\fP and should match the
 '\fBcrypto ident\fP' or '\fBserver ident\fP' configuration in
 \fBntpd\fP's configuration file. 
 .TP
-.BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
+.BR  \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
 This option takes an integer number as its argument.
 .sp
 Set the certificate expiration to lifetime days from now.
 .TP
-.BR \-M ", " \-\-md5key
+.BR  \-M ", " \-\-md5key
 generate MD5 keys.
 .sp
 Generate MD5 keys, obsoleting any that may exist.
 .TP
-.BR \-m " \fImodulus\fP, " \-\-modulus "=" \fImodulus\fP
+.BR  \-m " \fImodulus\fP, " \-\-modulus "=" \fImodulus\fP
 modulus.
 This option takes an integer number as its argument.
 The value of \fImodulus\fP is constrained to being:
@@ -953,31 +953,31 @@ in the range  256 through 2048
 .sp
 The number of bits in the prime modulus.  The default is 512.
 .TP
-.BR \-P ", " \-\-pvt\-cert
+.BR  \-P ", " \-\-pvt\-cert
 generate PC private certificate.
 .sp
 Generate a private certificate.  By default, the program generates
 public certificates.
 .TP
-.BR \-p " \fIpasswd\fP, " \-\-pvt\-passwd "=" \fIpasswd\fP
+.BR  \-p " \fIpasswd\fP, " \-\-pvt\-passwd "=" \fIpasswd\fP
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
 password and the cipher selected with \fB-C/--cipher\fP.
 .TP
-.BR \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
+.BR  \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
 .sp
 Set the password for reading files to the specified password.
 .TP
-.BR \-S " \fIsign\fP, " \-\-sign\-key "=" \fIsign\fP
+.BR  \-S " \fIsign\fP, " \-\-sign\-key "=" \fIsign\fP
 generate sign key (RSA or DSA).
 .sp
 Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
 .TP
-.BR \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
+.BR  \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
 set host and optionally group name.
 .sp
 Set the Autokey host name, and optionally, group name specified
@@ -991,20 +991,20 @@ subject and issuer fields, as with \fB-i group\fP.  The group name, or
 if not provided, the host name are also used in the file names
 of IFF, GQ, and MV client parameter files.
 .TP
-.BR \-T ", " \-\-trusted\-cert
+.BR  \-T ", " \-\-trusted\-cert
 trusted certificate (TC scheme).
 .sp
 Generate a trusted certificate.  By default, the program generates
 a non-trusted certificate.
 .TP
-.BR \-V " \fInum\fP, " \-\-mv\-params "=" \fInum\fP
+.BR  \-V " \fInum\fP, " \-\-mv\-params "=" \fInum\fP
 generate  MV parameters.
 This option takes an integer number as its argument.
 .sp
 Generate parameters and keys for the Mu-Varadharajan (MV)
 identification scheme.
 .TP
-.BR \-v " \fInum\fP, " \-\-mv\-keys "=" \fInum\fP
+.BR  \-v " \fInum\fP, " \-\-mv\-keys "=" \fInum\fP
 update  MV keys.
 This option takes an integer number as its argument.
 .sp
@@ -1044,30 +1044,11 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 The
-p Ar password
+ p Ar password
 option specifies the write password and
-q Ar password
+ q Ar password
 option the read password for previously encrypted files.
 The
 .B 
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index e3f09869b..9e2435de8 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd July 28 2013
+.Dd August 1 2013
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:17 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:32:48 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1009,25 +1009,6 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 The
 .Fl p Ar password
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 0665df134..427795b4f 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "28 Jul 2013" "ntp (4.2.7p377)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "01 Aug 2013" "ntp (4.2.7p377)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:10 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:32:53 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -56,9 +56,9 @@ other than Autokey.
 .PP
 Some files used by this program are encrypted using a private password.
 The
-p
+ p
 option specifies the password for local encrypted files and the
-q
+ q
 option the password for encrypted files sent to remote sites.
 If no password is specified, the host name returned by the Unix
 .Fn gethostname
@@ -126,7 +126,7 @@ Run the command on as many hosts as necessary.
 Designate one of them as the trusted host (TH) using
 .B 
 with the
-T
+ T
 option and configure it to synchronize from reliable Internet servers.
 Then configure the other hosts to synchronize to the TH directly or
 indirectly.
@@ -140,13 +140,13 @@ RSA type.
 By default, the host key is also the sign key used to encrypt
 signatures.
 A different sign key can be assigned using the
-S
+ S
 option and this can be either RSA or DSA type.
 By default, the signature
 message digest type is MD5, but any combination of sign key type and
 message digest type supported by the OpenSSL library can be specified
 using the
-c
+ c
 option.
 The rules say cryptographic media should be generated with proventic
 filestamps, which means the host should already be synchronized before
@@ -466,10 +466,10 @@ To insure a fresh fileset, remove all
 files.
 Then run
 .B 
-T
+ T
 to generate keys and a trusted certificate.
 On all other hosts do the same, but leave off the
-T
+ T
 flag to generate keys and nontrusted certificates.
 When complete, start the NTP daemons beginning at the lowest stratum
 and working up the tree.
@@ -480,7 +480,7 @@ If it is necessary to use a different sign key or different digest/signature
 scheme than the default, run
 .B 
 with the
-S Ar type
+ S Ar type
 option, where
 ItypeR
 is either
@@ -492,7 +492,7 @@ If it is necessary to use a different certificate scheme than the default,
 run
 .B 
 with the
-c Ar scheme
+ c Ar scheme
 option and selected
 IschemeR
 as needed.
@@ -545,8 +545,8 @@ only as clients have key files that contain only client keys.
 The PC scheme supports only one trusted host in the group.
 On trusted host alice run
 .B 
-P
-p Ar password
+ P
+ p Ar password
 to generate the host key file
 .Pa ntpkey_RSAkey_ Ns Ar alice.filestamp
 and trusted private certificate file
@@ -569,9 +569,9 @@ and certificates for all group hosts, then for every trusted host in the group,
 generate the IFF parameter file.
 On trusted host alice run
 .B 
-T
-I
-p Ar password
+ T
+ I
+ p Ar password
 to produce her parameter file
 .Pa ntpkey_IFFpar_ Ns Ar alice.filestamp ,
 which includes both server and client keys.
@@ -590,7 +590,7 @@ To eliminate this threat, the client keys can be extracted
 from the parameter file and distributed to all restricted clients.
 After generating the parameter file, on alice run
 .B 
-e
+ e
 and pipe the output to a file or mail program.
 Copy or mail this file to all restricted clients.
 On these clients install a soft link from the generic
@@ -604,9 +604,9 @@ and certificates for all group hosts, then for every trusted host
 in the group, generate the IFF parameter file.
 On trusted host alice run
 .B 
-T
-G
-p Ar password
+ T
+ G
+ p Ar password
 to produce her parameter file
 .Pa ntpkey_GQpar_ Ns Ar alice.filestamp ,
 which includes both server and client keys.
@@ -627,8 +627,8 @@ For illustration assume trish is the TA, alice one of several trusted hosts
 and bob one of her clients.
 On TA trish run
 .B 
-V Ar n
-p Ar password ,
+ V Ar n
+ p Ar password ,
 where
 InR
 is the number of revokable keys (typically 5) to produce
@@ -849,7 +849,7 @@ and
 utilities.
 .SH "OPTIONS"
 .TP
-.BR \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
+.BR  \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
 identity modulus bits.
 This option takes an integer number as its argument.
 The value of \fIimbits\fP is constrained to being:
@@ -862,7 +862,7 @@ in the range  256 through 2048
 .sp
 The number of bits in the identity modulus.  The default is 256.
 .TP
-.BR \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
+.BR  \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp
 scheme is one of
@@ -874,7 +874,7 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 .TP
-.BR \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
+.BR  \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
 privatekey cipher.
 .sp
 Select the cipher which is used to encrypt the files containing
@@ -882,41 +882,41 @@ private keys.  The default is three-key triple DES in CBC mode,
 equivalent to "@code{-C des-ede3-cbc".  The openssl tool lists ciphers
 available in "\fBopenssl \-h\fP" output.
 .TP
-.BR \-d ", " \-\-debug\-level
+.BR  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+.BR  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-e ", " \-\-id\-key
+.BR  \-e ", " \-\-id\-key
 Write IFF or GQ identity keys.
 .sp
 Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
 .TP
-.BR \-G ", " \-\-gq\-params
+.BR  \-G ", " \-\-gq\-params
 Generate GQ parameters and keys.
 .sp
 Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist.
 .TP
-.BR \-H ", " \-\-host\-key
+.BR  \-H ", " \-\-host\-key
 generate RSA host key.
 .sp
 Generate new host keys, obsoleting any that may exist.
 .TP
-.BR \-I ", " \-\-iffkey
+.BR  \-I ", " \-\-iffkey
 generate IFF parameters.
 .sp
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
 .TP
-.BR \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
+.BR  \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
 set Autokey group name.
 .sp
 Set the optional Autokey group name to name.  This is used in
@@ -929,18 +929,18 @@ issuer names in the form \fBhost@group\fP and should match the
 '\fBcrypto ident\fP' or '\fBserver ident\fP' configuration in
 \fBntpd\fP's configuration file. 
 .TP
-.BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
+.BR  \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
 This option takes an integer number as its argument.
 .sp
 Set the certificate expiration to lifetime days from now.
 .TP
-.BR \-M ", " \-\-md5key
+.BR  \-M ", " \-\-md5key
 generate MD5 keys.
 .sp
 Generate MD5 keys, obsoleting any that may exist.
 .TP
-.BR \-m " \fImodulus\fP, " \-\-modulus "=" \fImodulus\fP
+.BR  \-m " \fImodulus\fP, " \-\-modulus "=" \fImodulus\fP
 modulus.
 This option takes an integer number as its argument.
 The value of \fImodulus\fP is constrained to being:
@@ -953,31 +953,31 @@ in the range  256 through 2048
 .sp
 The number of bits in the prime modulus.  The default is 512.
 .TP
-.BR \-P ", " \-\-pvt\-cert
+.BR  \-P ", " \-\-pvt\-cert
 generate PC private certificate.
 .sp
 Generate a private certificate.  By default, the program generates
 public certificates.
 .TP
-.BR \-p " \fIpasswd\fP, " \-\-pvt\-passwd "=" \fIpasswd\fP
+.BR  \-p " \fIpasswd\fP, " \-\-pvt\-passwd "=" \fIpasswd\fP
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
 password and the cipher selected with \fB-C/--cipher\fP.
 .TP
-.BR \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
+.BR  \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
 .sp
 Set the password for reading files to the specified password.
 .TP
-.BR \-S " \fIsign\fP, " \-\-sign\-key "=" \fIsign\fP
+.BR  \-S " \fIsign\fP, " \-\-sign\-key "=" \fIsign\fP
 generate sign key (RSA or DSA).
 .sp
 Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
 .TP
-.BR \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
+.BR  \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
 set host and optionally group name.
 .sp
 Set the Autokey host name, and optionally, group name specified
@@ -991,20 +991,20 @@ subject and issuer fields, as with \fB-i group\fP.  The group name, or
 if not provided, the host name are also used in the file names
 of IFF, GQ, and MV client parameter files.
 .TP
-.BR \-T ", " \-\-trusted\-cert
+.BR  \-T ", " \-\-trusted\-cert
 trusted certificate (TC scheme).
 .sp
 Generate a trusted certificate.  By default, the program generates
 a non-trusted certificate.
 .TP
-.BR \-V " \fInum\fP, " \-\-mv\-params "=" \fInum\fP
+.BR  \-V " \fInum\fP, " \-\-mv\-params "=" \fInum\fP
 generate  MV parameters.
 This option takes an integer number as its argument.
 .sp
 Generate parameters and keys for the Mu-Varadharajan (MV)
 identification scheme.
 .TP
-.BR \-v " \fInum\fP, " \-\-mv\-keys "=" \fInum\fP
+.BR  \-v " \fInum\fP, " \-\-mv\-keys "=" \fInum\fP
 update  MV keys.
 This option takes an integer number as its argument.
 .sp
@@ -1044,30 +1044,11 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 The
-p Ar password
+ p Ar password
 option specifies the write password and
-q Ar password
+ q Ar password
 option the read password for previously encrypted files.
 The
 .B 
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index f8f5c722c..7ad0db404 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd July 28 2013
+.Dd August 1 2013
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July 28, 2013 at 11:40:17 AM by AutoGen 5.17.5pre10
+.\"  It has been AutoGen-ed  August  1, 2013 at 02:32:48 AM by AutoGen 5.18.1pre3
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1009,25 +1009,6 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 The
 .Fl p Ar password