From: Harlan Stenn Date: Fri, 8 Aug 2014 09:24:12 +0000 (+0000) Subject: autogen-5.18.4pre12 X-Git-Tag: NTP_4_2_7P457~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f95736849a90b4c7930b5074000066e30edaaa6;p=thirdparty%2Fntp.git autogen-5.18.4pre12 bk: 53e4973c2ru08S25Qgmi9DUZDUfBvQ --- diff --git a/sntp/libopts/Makefile.am b/sntp/libopts/Makefile.am index 0cdd91363..de7815375 100644 --- a/sntp/libopts/Makefile.am +++ b/sntp/libopts/Makefile.am @@ -9,23 +9,18 @@ libopts_la_SOURCES = libopts.c libopts_la_CPPFLAGS = -I$(srcdir) libopts_la_LDFLAGS = -version-info 41:0:16 -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that -# need it. This is ensured by the applicability 'all' defined above. +libopts.c: $(BUILT_SOURCES) + @: do-nothing rule to avoid default SCCS get -_NORETURN_H=$(srcdir)/compat/_Noreturn.h - -EXTRA_DIST= -BUILT_SOURCES= -MOSTLYCLEANFILES= +EXTRA_DIST = +BUILT_SOURCES = +MOSTLYCLEANFILES = +# Makefile fragment from gnulib-s stdnoreturn module: +# +_NORETURN_H=$(srcdir)/compat/_Noreturn.h EXTRA_DIST += $(srcdir)/compat/_Noreturn.h - - BUILT_SOURCES += $(STDNORETURN_H) - -# We need the following in order to create when the system -# doesn't have one that works. if GL_GENERATE_STDNORETURN_H stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H) $(AM_V_GEN)rm -f $@-t $@ && \ @@ -39,10 +34,9 @@ stdnoreturn.h: $(top_builddir)/config.status rm -f $@ endif MOSTLYCLEANFILES += stdnoreturn.h stdnoreturn.h-t - EXTRA_DIST += stdnoreturn.in.h -EXTRA_DIST += \ +EXTRA_DIST += \ COPYING.gplv3 COPYING.lgplv3 COPYING.mbsd \ MakeDefs.inc README ag-char-map.h \ alias.c ao-strs.c ao-strs.h \ @@ -54,14 +48,13 @@ EXTRA_DIST += \ cook.c enum.c env.c \ file.c find.c genshell.c \ genshell.h gettext.h init.c \ - intprops.h \ - load.c m4/stdnoreturn.m4 m4/liboptschk.m4 \ - m4/libopts.m4 makeshell.c nested.c \ - numeric.c option-value-type.c option-value-type.h \ - option-xat-attribute.c option-xat-attribute.h parse-duration.c \ - parse-duration.h pgusage.c proto.h \ - putshell.c reset.c restore.c \ - save.c sort.c stack.c \ - stdnoreturn.in.h streqvcmp.c text_mmap.c \ - time.c tokenize.c usage.c \ - version.c + intprops.h load.c m4/stdnoreturn.m4 \ + m4/liboptschk.m4 m4/libopts.m4 makeshell.c \ + nested.c numeric.c option-value-type.c \ + option-value-type.h option-xat-attribute.c option-xat-attribute.h \ + parse-duration.c parse-duration.h pgusage.c \ + proto.h putshell.c reset.c \ + restore.c save.c sort.c \ + stack.c stdnoreturn.in.h streqvcmp.c \ + text_mmap.c time.c tokenize.c \ + usage.c version.c diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h index 6f8901abe..4ad49e418 100644 --- a/sntp/libopts/ag-char-map.h +++ b/sntp/libopts/ag-char-map.h @@ -1,6 +1,6 @@ /* * 29 bits for 46 character classifications - * generated by char-mapper on 07/06/14 at 14:01:26 + * generated by char-mapper on 08/03/14 at 10:44:39 * * This file contains the character classifications * used by AutoGen and AutoOpts for identifying tokens. diff --git a/sntp/libopts/ao-strs.c b/sntp/libopts/ao-strs.c index f77ad3837..e58e45b98 100644 --- a/sntp/libopts/ao-strs.c +++ b/sntp/libopts/ao-strs.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ao-strs.c) * - * It has been AutoGen-ed July 6, 2014 at 02:01:27 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:39 AM by AutoGen 5.18.4pre11 * From the definitions ao-strs.def * and the template file strings * diff --git a/sntp/libopts/ao-strs.h b/sntp/libopts/ao-strs.h index f8e507d0f..7826c55d3 100644 --- a/sntp/libopts/ao-strs.h +++ b/sntp/libopts/ao-strs.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ao-strs.h) * - * It has been AutoGen-ed July 6, 2014 at 02:01:27 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:39 AM by AutoGen 5.18.4pre11 * From the definitions ao-strs.def * and the template file strings * diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h index 89f4270af..0d6f2c371 100644 --- a/sntp/libopts/autoopts/options.h +++ b/sntp/libopts/autoopts/options.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (options.h) * - * It has been AutoGen-ed July 6, 2014 at 02:01:34 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:46 AM by AutoGen 5.18.4pre11 * From the definitions funcs.def * and the template file options_h * @@ -957,6 +957,31 @@ extern const tOptionValue* optionNextValue(const tOptionValue*, const tOptionVal extern void optionOnlyUsage(tOptions*, int); +/** + * optionPrintVersion - Print the program version + * + * This routine will print the version to stdout. + * + * @param opts program options descriptor + * @param od the descriptor for this arg + */ +extern void optionPrintVersion(tOptions*, tOptDesc*); + + +/** + * optionPrintVersionAndReturn - Print the program version + * + * This routine will print the version to stdout and return + * instead of exiting. Please see the source for the + * @code{print_ver} funtion for details on selecting how + * verbose to be after this function returns. + * + * @param opts program options descriptor + * @param od the descriptor for this arg + */ +extern void optionPrintVersionAndReturn(tOptions*, tOptDesc*); + + /** * optionProcess - this is the main option processing routine * @@ -1189,10 +1214,6 @@ extern void optionParseShell(tOptions*); extern void optionPrintParagraphs(char const *, bool, FILE *); -extern void optionPrintVersion(tOptions*, tOptDesc*); - -extern void optionPrintVersionAndReturn(tOptions*, tOptDesc*); - extern void optionPutShell(tOptions*); extern char const * optionQuoteString(char const *, char const *); diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h index aa213a907..0c72d32d5 100644 --- a/sntp/libopts/autoopts/usage-txt.h +++ b/sntp/libopts/autoopts/usage-txt.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (usage-txt.h) * - * It has been AutoGen-ed July 6, 2014 at 02:01:31 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:44 AM by AutoGen 5.18.4pre11 * From the definitions usage-txt.def * and the template file usage-txt.tpl * diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c index 4fe0873c6..b7a8c7d6c 100644 --- a/sntp/libopts/genshell.c +++ b/sntp/libopts/genshell.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.c) * - * It has been AutoGen-ed July 6, 2014 at 02:01:30 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:43 AM by AutoGen 5.18.4pre11 * From the definitions genshell.def * and the template file options * diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h index 3f575d195..66f62f55c 100644 --- a/sntp/libopts/genshell.h +++ b/sntp/libopts/genshell.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.h) * - * It has been AutoGen-ed July 6, 2014 at 02:01:30 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:43 AM by AutoGen 5.18.4pre11 * From the definitions genshell.def * and the template file options * diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 index e293dce3b..4a4ca181b 100644 --- a/sntp/libopts/m4/libopts.m4 +++ b/sntp/libopts/m4/libopts.m4 @@ -2,7 +2,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro: dnl dnl DO NOT EDIT THIS FILE (libopts.m4) dnl -dnl It has been AutoGen-ed July 6, 2014 at 02:01:22 PM by AutoGen 5.18.4pre8 +dnl It has been AutoGen-ed August 3, 2014 at 10:44:34 AM by AutoGen 5.18.4pre11 dnl From the definitions libopts.def dnl and the template file conftest.tpl dnl diff --git a/sntp/libopts/option-value-type.c b/sntp/libopts/option-value-type.c index 18ef1ab2a..bd21344ea 100644 --- a/sntp/libopts/option-value-type.c +++ b/sntp/libopts/option-value-type.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (stdin.c) * - * It has been AutoGen-ed July 6, 2014 at 02:01:29 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:42 AM by AutoGen 5.18.4pre11 * From the definitions stdin * and the template file str2enum * diff --git a/sntp/libopts/option-value-type.h b/sntp/libopts/option-value-type.h index 20957c97f..dec2fcc66 100644 --- a/sntp/libopts/option-value-type.h +++ b/sntp/libopts/option-value-type.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (stdin.h) * - * It has been AutoGen-ed July 6, 2014 at 02:01:29 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:41 AM by AutoGen 5.18.4pre11 * From the definitions stdin * and the template file str2enum * diff --git a/sntp/libopts/option-xat-attribute.c b/sntp/libopts/option-xat-attribute.c index e271677a0..9f13acccd 100644 --- a/sntp/libopts/option-xat-attribute.c +++ b/sntp/libopts/option-xat-attribute.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (stdin.c) * - * It has been AutoGen-ed July 6, 2014 at 02:01:28 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:40 AM by AutoGen 5.18.4pre11 * From the definitions stdin * and the template file str2enum * diff --git a/sntp/libopts/option-xat-attribute.h b/sntp/libopts/option-xat-attribute.h index 1eabb1d3d..892b51e76 100644 --- a/sntp/libopts/option-xat-attribute.h +++ b/sntp/libopts/option-xat-attribute.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (stdin.h) * - * It has been AutoGen-ed July 6, 2014 at 02:01:28 PM by AutoGen 5.18.4pre8 + * It has been AutoGen-ed August 3, 2014 at 10:44:40 AM by AutoGen 5.18.4pre11 * From the definitions stdin * and the template file str2enum * diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h index 34410d7c9..c97d8319d 100644 --- a/sntp/libopts/proto.h +++ b/sntp/libopts/proto.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for autoopts - * Generated Sun Jul 6 14:01:42 PDT 2014 + * Generated Sun Aug 3 10:44:54 PDT 2014 */ #ifndef AUTOOPTS_PROTO_H_GUARD #define AUTOOPTS_PROTO_H_GUARD 1 diff --git a/sntp/libopts/version.c b/sntp/libopts/version.c index 2fa15b96b..1516c147f 100644 --- a/sntp/libopts/version.c +++ b/sntp/libopts/version.c @@ -179,7 +179,6 @@ print_ver(tOptions * opts, tOptDesc * od, FILE * fp, bool call_exit) } /*=export_func optionPrintVersion - * private: * * what: Print the program version * arg: + tOptions* + opts + program options descriptor + @@ -195,7 +194,6 @@ optionPrintVersion(tOptions * opts, tOptDesc * od) } /*=export_func optionPrintVersionAndReturn - * private: * * what: Print the program version * arg: + tOptions* + opts + program options descriptor + diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 75b6b93ba..8a9261cd2 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 August 7, 2014 at 09:23:52 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:42 AM by AutoGen 5.18.4pre12 * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -70,7 +70,7 @@ extern FILE * option_usage_fp; * static const strings for sntp options */ static char const sntp_opt_strs[2499] = -/* 0 */ "sntp 4.2.7p456\n" +/* 0 */ "sntp 4.2.7p454\n" "Copyright (C) 1970-2014 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" @@ -154,7 +154,7 @@ static char const sntp_opt_strs[2499] = /* 2244 */ "LOAD_OPTS\0" /* 2254 */ "no-load-opts\0" /* 2267 */ "SNTP\0" -/* 2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p456\n" +/* 2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ hostname-or-IP ...]\n\0" /* 2433 */ "$HOME\0" @@ -162,7 +162,7 @@ static char const sntp_opt_strs[2499] = /* 2441 */ ".ntprc\0" /* 2448 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2482 */ "\n\0" -/* 2484 */ "sntp 4.2.7p456"; +/* 2484 */ "sntp 4.2.7p454"; /** * ipv4 option description with @@ -1227,7 +1227,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via sntpOptions.pzCopyright */ - puts(_("sntp 4.2.7p456\n\ + puts(_("sntp 4.2.7p454\n\ Copyright (C) 1970-2014 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\ @@ -1316,7 +1316,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via sntpOptions.pzUsageTitle */ - puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p456\n\ + puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ hostname-or-IP ...]\n")); @@ -1324,7 +1324,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via sntpOptions.pzFullVersion */ - puts(_("sntp 4.2.7p456")); + puts(_("sntp 4.2.7p454")); /* referenced via sntpOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index f2698748c..ac04b4d18 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 August 7, 2014 at 09:23:51 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:42 AM by AutoGen 5.18.4pre12 * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 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 163842 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -91,9 +91,9 @@ typedef enum { /** count of all options for sntp */ #define OPTION_CT 23 /** sntp version */ -#define SNTP_VERSION "4.2.7p456" +#define SNTP_VERSION "4.2.7p454" /** Full sntp version text */ -#define SNTP_FULL_VERSION "sntp 4.2.7p456" +#define SNTP_FULL_VERSION "sntp 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -283,15 +283,15 @@ typedef enum { DESC(WAIT).fOptState &= OPTST_PERSISTENT_MASK; \ DESC(WAIT).fOptState |= OPTST_SET | OPTST_DISABLED; \ DESC(WAIT).optArg.argString = NULL ) -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1002 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for save-opts-value option */ #define VALUE_OPT_SAVE_OPTS '>' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for load-opts-value option */ #define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ @@ -328,11 +328,11 @@ extern tOptions sntpOptions; # include # endif -# ifndef __attribute__ -# define __attribute__(_a) +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) # endif -static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz);