Upgrade to autogen-5.18.3pre5 and libopts-40.1.15

bk: 5281e3d079mkGaP-qU4RVcHYj5O6Nw

diff --git a/ChangeLog b/ChangeLog
index e05c7eddcf2d158859bb727c45136183f000035b..c0ae2d2b10964e4b587fbdee3b065fd1b5848982 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Upgrade to autogen-5.18.3pre5 and libopts-40.1.15.
 (4.2.7p394) 2013/11/05 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1050] Change ONCORE log message for leap second announcement
   to avoid misunderstandings.

diff --git a/sntp/include/autogen-version.def b/sntp/include/autogen-version.def
index 96b750502ebf7927d0c202a62df7e6b594f7846d..27142154c303be06f21451eedc38922d720de7d1 100644 (file)
--- a/sntp/include/autogen-version.def
+++ b/sntp/include/autogen-version.def
@@ -1,4 +1,4 @@
-#assert (version-compare > autogen-version "5.18")
-// running 5.18.1pre3 right now...
+#assert (version-compare > autogen-version "5.18.2")
+// running 5.18.3pre5 right now...
 // >= is usually what we want.
 guard-option-names;

diff --git a/sntp/libopts/Makefile.am b/sntp/libopts/Makefile.am
index fd879bea9009e677bcd0e3dcb29cf890b389f578..ca2000985a5bfc4de2a45043c8580a78d76faa52 100644 (file)
--- a/sntp/libopts/Makefile.am
+++ b/sntp/libopts/Makefile.am
@@ -12,11 +12,11 @@ EXTRA_DIST              = \
     COPYING.gplv3           COPYING.lgplv3          COPYING.mbsd  \
     MakeDefs.inc            README                  ag-char-map.h  \
     alias.c                 ao-strs.c               ao-strs.h  \
-    autoopts/usage-txt.h    autoopts/project.h      autoopts/options.h  \
+    autoopts/project.h      autoopts/options.h      autoopts/usage-txt.h  \
     autoopts.c              autoopts.h              boolean.c  \
-    check.c                 compat/windows-config.h compat/pathfind.c  \
-    compat/snprintf.c       compat/strchr.c         compat/compat.h  \
-    compat/strdup.c         configfile.c            cook.c  \
+    check.c                 compat/strchr.c         compat/strdup.c  \
+    compat/snprintf.c       compat/pathfind.c       compat/compat.h  \
+    compat/windows-config.h configfile.c            cook.c  \
     enum.c                  env.c                   file.c  \
     find.c                  genshell.c              genshell.h  \
     gettext.h               init.c                  load.c  \

diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h
index 3b89fb7009d8a01cec3152190d475cfd376241c1..bac68304377d53e1d518feacfdaa6bc6dfd8a525 100644 (file)
--- 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/28/13 at 08:25:15
+ *  generated by char-mapper on 11/10/13 at 13:00:35
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
@@ -441,8 +441,7 @@ static ag_char_map_mask_t const ag_char_map_masks[46] = {
     0x00000101, /* MAKE_SCRIPT     */
     0x00000600, /* LOAD_LINE_SKIP  */
 };
-
-#undef  LOCK_SPANNER_TABLES
+#undef LOCK_SPANNER_TABLES
 
 static unsigned char const *
 calc_ag_char_map_spanners(unsigned int mask_ix)

diff --git a/sntp/libopts/ao-strs.c b/sntp/libopts/ao-strs.c
index 5ec883d787de238843e0bccdd473749dc75661aa..2b21e73300a0f13b310fc40cf0af74c92337cb2d 100644 (file)
--- 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 28, 2013 at 08:25:16 AM by AutoGen 5.18.1pre2
+ * It has been AutoGen-ed  November 10, 2013 at 01:00:35 PM by AutoGen 5.18.2
  * 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 1549d10446432fd045a7ab6a03d1fbfcd5d9fb21..4d6ca7d4db72408cc1e9e0f1cd95c73876081038 100644 (file)
--- 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 28, 2013 at 08:25:16 AM by AutoGen 5.18.1pre2
+ * It has been AutoGen-ed  November 10, 2013 at 01:00:35 PM by AutoGen 5.18.2
  * 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 3c013fa42cb1eb1f7a225ecc5be30be569cbce49..36f772b6a1cda1459bc97806ae92ac11ea61ad0a 100644 (file)
--- 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 28, 2013 at 08:25:23 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:42 PM by AutoGen 5.18.2
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -201,59 +201,59 @@ typedef uint32_t opt_state_mask_t;
 
 #define OPTST_ARG_TYPE_SHIFT 12
 /** bits defined for opt_state_mask_t */
-/** opt_state_mask_t - Set via the "SET_OPT()" macro */
+/** Set via the "SET_OPT()" macro */
 #define OPTST_SET              0x0000001U
-/** opt_state_mask_t - Set via an RC/INI file */
+/** Set via an RC/INI file */
 #define OPTST_PRESET           0x0000002U
-/** opt_state_mask_t - Set via a command line option */
+/** Set via a command line option */
 #define OPTST_DEFINED          0x0000004U
-/** opt_state_mask_t - Reset via command line option */
+/** Reset via command line option */
 #define OPTST_RESET            0x0000008U
-/** opt_state_mask_t - selected by equiv'ed option */
+/** selected by equiv'ed option */
 #define OPTST_EQUIVALENCE      0x0000010U
-/** opt_state_mask_t - option is in disabled state */
+/** option is in disabled state */
 #define OPTST_DISABLED         0x0000020U
-/** opt_state_mask_t - pzOptArg was allocated */
+/** pzOptArg was allocated */
 #define OPTST_ALLOC_ARG        0x0000040U
-/** opt_state_mask_t - option cannot be preset */
+/** option cannot be preset */
 #define OPTST_NO_INIT          0x0000100U
-/** opt_state_mask_t - opt value (flag) is any digit */
+/** opt value (flag) is any digit */
 #define OPTST_NUMBER_OPT       0x0000200U
-/** opt_state_mask_t - opt uses optionStackArg proc */
+/** opt uses optionStackArg proc */
 #define OPTST_STACKED          0x0000400U
-/** opt_state_mask_t - option defaults to enabled */
+/** option defaults to enabled */
 #define OPTST_INITENABLED      0x0000800U
-/** opt_state_mask_t - bit 1 of arg type enum */
+/** bit 1 of arg type enum */
 #define OPTST_ARG_TYPE_1       0x0001000U
-/** opt_state_mask_t - bit 2 of arg type enum */
+/** bit 2 of arg type enum */
 #define OPTST_ARG_TYPE_2       0x0002000U
-/** opt_state_mask_t - bit 3 of arg type enum */
+/** bit 3 of arg type enum */
 #define OPTST_ARG_TYPE_3       0x0004000U
-/** opt_state_mask_t - bit 4 of arg type enum */
+/** bit 4 of arg type enum */
 #define OPTST_ARG_TYPE_4       0x0008000U
-/** opt_state_mask_t - the option arg not required */
+/** the option arg not required */
 #define OPTST_ARG_OPTIONAL     0x0010000U
-/** opt_state_mask_t - process opt on first pass */
+/** process opt on first pass */
 #define OPTST_IMM              0x0020000U
-/** opt_state_mask_t - process disablement immed. */
+/** process disablement immed. */
 #define OPTST_DISABLE_IMM      0x0040000U
-/** opt_state_mask_t - compiled out of program */
+/** compiled out of program */
 #define OPTST_OMITTED          0x0080000U
-/** opt_state_mask_t - must be set or pre-set */
+/** must be set or pre-set */
 #define OPTST_MUST_SET         0x0100000U
-/** opt_state_mask_t - opt is for doc only */
+/** opt is for doc only */
 #define OPTST_DOCUMENT         0x0200000U
-/** opt_state_mask_t - process opt twice - imm + reg */
+/** process opt twice - imm + reg */
 #define OPTST_TWICE            0x0400000U
-/** opt_state_mask_t - process disabled option twice */
+/** process disabled option twice */
 #define OPTST_DISABLE_TWICE    0x0800000U
-/** opt_state_mask_t - scaled integer value */
+/** scaled integer value */
 #define OPTST_SCALED_NUM       0x1000000U
-/** opt_state_mask_t - disable from cmd line */
+/** disable from cmd line */
 #define OPTST_NO_COMMAND       0x2000000U
-/** opt_state_mask_t - support is being removed */
+/** support is being removed */
 #define OPTST_DEPRECATED       0x4000000U
-/** opt_state_mask_t - alias for other option */
+/** alias for other option */
 #define OPTST_ALIAS            0x8000000U
 
 /** bits in SET mask:
@@ -333,50 +333,50 @@ typedef uint32_t opt_state_mask_t;
 typedef uint32_t proc_state_mask_t;
 
 /** bits defined for proc_state_mask_t */
-/** proc_state_mask_t - Process long style options */
+/** Process long style options */
 #define OPTPROC_LONGOPT       0x000001U
-/** proc_state_mask_t - Process short style "flags" */
+/** Process short style "flags" */
 #define OPTPROC_SHORTOPT      0x000002U
-/** proc_state_mask_t - Stop on argument errors */
+/** Stop on argument errors */
 #define OPTPROC_ERRSTOP       0x000004U
-/** proc_state_mask_t - Current option is disabled */
+/** Current option is disabled */
 #define OPTPROC_DISABLEDOPT   0x000008U
-/** proc_state_mask_t - no options are required */
+/** no options are required */
 #define OPTPROC_NO_REQ_OPT    0x000010U
-/** proc_state_mask_t - there is a number option */
+/** there is a number option */
 #define OPTPROC_NUM_OPT       0x000020U
-/** proc_state_mask_t - have inits been done? */
+/** have inits been done? */
 #define OPTPROC_INITDONE      0x000040U
-/** proc_state_mask_t - any negation options? */
+/** any negation options? */
 #define OPTPROC_NEGATIONS     0x000080U
-/** proc_state_mask_t - check environment? */
+/** check environment? */
 #define OPTPROC_ENVIRON       0x000100U
-/** proc_state_mask_t - Disallow remaining arguments */
+/** Disallow remaining arguments */
 #define OPTPROC_NO_ARGS       0x000200U
-/** proc_state_mask_t - Require args after options */
+/** Require args after options */
 #define OPTPROC_ARGS_REQ      0x000400U
-/** proc_state_mask_t - reorder operands after opts */
+/** reorder operands after opts */
 #define OPTPROC_REORDER       0x000800U
-/** proc_state_mask_t - emit usage in GNU style */
+/** emit usage in GNU style */
 #define OPTPROC_GNUUSAGE      0x001000U
-/** proc_state_mask_t - Translate strings in tOptions */
+/** Translate strings in tOptions */
 #define OPTPROC_TRANSLATE     0x002000U
-/** proc_state_mask_t - no usage on usage error */
+/** no usage on usage error */
 #define OPTPROC_MISUSE        0x004000U
-/** proc_state_mask_t - immediate options active */
+/** immediate options active */
 #define OPTPROC_IMMEDIATE     0x008000U
-/** proc_state_mask_t - suppress for config only */
+/** suppress for config only */
 #define OPTPROC_NXLAT_OPT_CFG 0x010000U
-/** proc_state_mask_t - suppress xlation always */
+/** suppress xlation always */
 #define OPTPROC_NXLAT_OPT     0x020000U
-/** proc_state_mask_t - vendor options active */
+/** vendor options active */
 #define OPTPROC_VENDOR_OPT    0x040000U
-/** proc_state_mask_t - opt processing in preset state */
+/** opt processing in preset state */
 #define OPTPROC_PRESETTING    0x080000U
-/** proc_state_mask_t - Ignore pzFullUsage, compute usage text */
+/** Ignore pzFullUsage, compute usage text */
 #define OPTPROC_COMPUTE       0x100000U
-/** proc_state_mask_t - Program outputs digested option state for shell scripts.
-Usage text always written to stderr */
+/** Program outputs digested option state for shell scripts.  Usage text
+  * always written to stderr */
 #define OPTPROC_SHELL_OUTPUT  0x200000U
 
 /** bits in NO_XLAT mask:

diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h
index d98904ca6da02440a1f75755391d185932f6f2c8..6e8197fea0b602d214a7a80d3a3903c1a1c3a9b3 100644 (file)
--- 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 28, 2013 at 08:25:20 AM by AutoGen 5.18.1pre2
+ * It has been AutoGen-ed  November 10, 2013 at 01:00:40 PM by AutoGen 5.18.2
  * From the definitions    usage-txt.def
  * and the template file   usage-txt.tpl
  *

diff --git a/sntp/libopts/compat/compat.h b/sntp/libopts/compat/compat.h
index e7b30ea3ab1af28389bf58756f9680ec1b5b6800..ebb3157b8355615c04fb99e334226ca69e83cfe7 100644 (file)
--- a/sntp/libopts/compat/compat.h
+++ b/sntp/libopts/compat/compat.h
@@ -237,7 +237,7 @@
 #endif
 
 #if !defined (MAXPATHLEN)
-#  define MAXPATHLEN ((size_t)4096)
+#  define MAXPATHLEN 4096
 #endif /* MAXPATHLEN */
 
 #define AG_PATH_MAX  ((size_t)MAXPATHLEN)

diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index 1b66257828fb8f6a15ed06cf80f72267d210c751..7c53671e7ebe8e06529a2d5b9cf6dc5ea3a59c7d 100644 (file)
--- 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 28, 2013 at 08:25:19 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:38 PM by AutoGen 5.18.2
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -290,10 +290,11 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     ex_code = GENSHELLOPT_EXIT_SUCCESS;
     genshelloptUsage(&genshelloptOptions, ex_code);
     /* NOTREACHED */
+    exit(1);
     (void)opts;
     (void)od;
 }
-/* extracted from optmain.tlib near line 1266 */
+/* extracted from optmain.tlib near line 1245 */
 
 /**
  * The directory containing the data associated with genshellopt.
@@ -574,7 +575,7 @@ by the newly generated text.  The first '#!' line will be regenerated.\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 598 "../find.c"
   puts(_("defaulted to option with optional arg"));
@@ -623,9 +624,9 @@ by the newly generated text.  The first '#!' line will be regenerated.\n"));
   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 385 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
@@ -666,7 +667,7 @@ by the newly generated text.  The first '#!' line will be regenerated.\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"));
@@ -676,17 +677,17 @@ by the newly generated text.  The first '#!' line will be regenerated.\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"));
@@ -696,9 +697,9 @@ by the newly generated text.  The first '#!' line will be regenerated.\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"));
@@ -719,29 +720,29 @@ by the newly generated text.  The first '#!' line will be regenerated.\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"
@@ -751,33 +752,33 @@ by the newly generated text.  The first '#!' line will be regenerated.\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 '-#<number>' 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"
@@ -786,17 +787,17 @@ by the newly generated text.  The first '#!' line will be regenerated.\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"));
@@ -814,28 +815,28 @@ by the newly generated text.  The first '#!' line will be regenerated.\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/libopts/genshell.h b/sntp/libopts/genshell.h
index 6bc8ec2d0dc8a2c78099ef3e092efeffa3e67b65..640459bbe4b77e3ce3dc986fea7f8100458e60e4 100644 (file)
--- 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 28, 2013 at 08:25:19 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:38 PM by AutoGen 5.18.2
  *  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 a651c3ff0c4d38cc6a1083c90ddfa9308aa9b1ae..be1b54bd0e0c586432d4d90d22fb51943a485791 100644 (file)
--- 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 28, 2013 at 08:25:12 AM by AutoGen 5.18.1pre2
+dnl It has been AutoGen-ed  November 10, 2013 at 01:00:31 PM by AutoGen 5.18.2
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -589,4 +589,3 @@ AC_DEFUN([LIBOPTS_CHECK], [
   m4_popdef([AO_Libopts_Dir])dnl
 # end of AC_DEFUN of LIBOPTS_CHECK
 ])
-

diff --git a/sntp/libopts/option-value-type.c b/sntp/libopts/option-value-type.c
index a89ed691eb61f368bc2a6f7303b5fc84fbc1170d..06fb27998e3ab3ad29d89bcbfcad51dd73506979 100644 (file)
--- 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 28, 2013 at 08:25:18 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:37 PM by AutoGen 5.18.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "option-value-type.h"
-/* ANSI-C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.0.3 */
 /* Command-line: gperf option-value-type.gp  */
 /* Computed positions: -k'1' */
 

diff --git a/sntp/libopts/option-value-type.h b/sntp/libopts/option-value-type.h
index 501e6ac0bda9016d66c927c8bdf2013b5c53cc44..94dca08b7d97de73b840f12e4b733370f9004c3c 100644 (file)
--- 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 28, 2013 at 08:25:18 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:37 PM by AutoGen 5.18.2
  *  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 db31def94cf87580b657251a2630a48751e3e353..5dac112759d501f59bcb6a716c3dac7f22eab081 100644 (file)
--- 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 28, 2013 at 08:25:17 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:36 PM by AutoGen 5.18.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "option-xat-attribute.h"
-/* ANSI-C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.0.3 */
 /* Command-line: gperf option-xat-attribute.gp  */
 /* Computed positions: -k'1' */
 

diff --git a/sntp/libopts/option-xat-attribute.h b/sntp/libopts/option-xat-attribute.h
index 2da4d4e10473be6bebc1448087a8e30291bd9d89..1e3917d8905b98b20c861952fa2f2321968b17aa 100644 (file)
--- 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 28, 2013 at 08:25:17 AM by AutoGen 5.18.1pre2
+ *  It has been AutoGen-ed  November 10, 2013 at 01:00:36 PM by AutoGen 5.18.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *

diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index 5f65ec9ada761251b987a4f8e8faee0ae669788c..ce9c3f0dc613ec9b6928519a1c1f7b2dd47b0723 100644 (file)
--- 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 28 08:25:30 PDT 2013
+ * Generated Sun Nov 10 13:00:49 PST 2013
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1