From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Nov 2010 05:18:39 +0000 (-0500)
Subject: autogen-5.11.3 upgrade
X-Git-Tag: NTP_4_2_7P84~8^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb876b43c313f8ba3e763d2f3de9524d19493896;p=thirdparty%2Fntp.git

autogen-5.11.3 upgrade

bk: 4ce75a2f1_r0y384fCpl36glggpUrg
---

diff --git a/sntp/libopts/Makefile.am b/sntp/libopts/Makefile.am
index 43dfb0abc..11c6078cc 100644
--- a/sntp/libopts/Makefile.am
+++ b/sntp/libopts/Makefile.am
@@ -13,11 +13,11 @@ EXTRA_DIST              = \
     MakeDefs.inc            README                  ag-char-map.h  \
     autoopts/usage-txt.h    autoopts/options.h      autoopts.c  \
     autoopts.h              boolean.c               compat/strchr.c  \
-    compat/windows-config.h compat/strdup.c         compat/compat.h  \
-    compat/snprintf.c       compat/pathfind.c       configfile.c  \
+    compat/strdup.c         compat/compat.h         compat/windows-config.h  \
+    compat/pathfind.c       compat/snprintf.c       configfile.c  \
     cook.c                  enumeration.c           environment.c  \
     file.c                  genshell.c              genshell.h  \
-    load.c                  m4/libopts.m4           m4/liboptschk.m4  \
+    load.c                  m4/liboptschk.m4        m4/libopts.m4  \
     makeshell.c             nested.c                numeric.c  \
     parse-duration.c        parse-duration.h        pgusage.c  \
     proto.h                 putshell.c              reset.c  \
diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h
index 3ce10de6b..33c931d99 100644
--- a/sntp/libopts/ag-char-map.h
+++ b/sntp/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 11/16/10 17:41:46
+ *   Character mapping generated 11/18/10 11:54:12
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
diff --git a/sntp/libopts/configfile.c b/sntp/libopts/configfile.c
index 1fbe201a6..2ee062a8e 100644
--- a/sntp/libopts/configfile.c
+++ b/sntp/libopts/configfile.c
@@ -1,7 +1,7 @@
 /**
  * \file configfile.c
  *
- *  Time-stamp:      "2010-11-07 14:43:09 bkorb"
+ *  Time-stamp:      "2010-11-18 08:24:46 bkorb"
  *
  *  configuration/rc/ini file handling.
  *
@@ -647,11 +647,13 @@ aoflags_directive(tOptions * pOpts, char * pzText)
 static char *
 program_directive(tOptions * pOpts, char * pzText)
 {
-    char * ttl;
-    size_t ttl_len  = asprintf(&ttl, "<?%s", zCfgProg);
+    static char const ttlfmt[] = "<?";
+    size_t ttl_len  = sizeof(ttlfmt) + strlen(zCfgProg);
+    char * ttl      = AGALOC(ttl_len, "prog title");
     size_t name_len = strlen(pOpts->pzProgName);
 
-    (void) ttl_len;
+    memcpy(ttl, ttlfmt, sizeof(ttlfmt) - 1);
+    strcpy(ttl + sizeof(ttlfmt) - 1, zCfgProg);
 
     do  {
         while (IS_WHITESPACE_CHAR(*++pzText))  ;
@@ -665,7 +667,7 @@ program_directive(tOptions * pOpts, char * pzText)
         pzText = strstr(pzText, ttl);
     } while (pzText != NULL);
 
-    free(ttl);
+    AGFREE(ttl);
     if (pzText != NULL)
         for (;;) {
             if (*pzText == NUL) {
diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index af9db94ac..059f8869c 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  November 16, 2010 at 05:41:46 PM by AutoGen 5.11.2pre7
+ *  It has been AutoGen-ed  November 18, 2010 at 11:54:12 AM by AutoGen 5.11.2
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h
index d547ea1a2..507788b34 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  November 16, 2010 at 05:41:46 PM by AutoGen 5.11.2pre7
+ *  It has been AutoGen-ed  November 18, 2010 at 11:54:12 AM by AutoGen 5.11.2
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index bc4a49f03..13ce379a6 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 Tue Nov 16 17:41:54 PST 2010
+ * Generated Thu Nov 18 11:54:20 PST 2010
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/sntp/libopts/value-type.h b/sntp/libopts/value-type.h
index 955bceeea..16975e6b9 100644
--- a/sntp/libopts/value-type.h
+++ b/sntp/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Tue Nov 16 17:41:46 PST 2010
+ *  Generated header for gperf generated source Thu Nov 18 11:54:12 PST 2010
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/sntp/libopts/xat-attribute.h b/sntp/libopts/xat-attribute.h
index ea3e9a623..2e6ca6684 100644
--- a/sntp/libopts/xat-attribute.h
+++ b/sntp/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Tue Nov 16 17:41:46 PST 2010
+ *  Generated header for gperf generated source Thu Nov 18 11:54:12 PST 2010
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */