From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 13 Oct 2006 02:42:48 +0000 (-0400)
Subject: autogen-5.8.7 upgrade
X-Git-Tag: NTP_4_2_3P57~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc53437fdb0b0b44996ec9eed4918cbef9b84c41;p=thirdparty%2Fntp.git

autogen-5.8.7 upgrade

bk: 452efd28n-2_0Bhdsf8idRfWsaZzLg
---

diff --git a/libopts/autoopts.c b/libopts/autoopts.c
index a97083e49..c44f7b423 100644
--- a/libopts/autoopts.c
+++ b/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.27 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: autoopts.c,v 4.17 2006/10/05 03:48:56 bkorb Exp $
  *  Time-stamp:      "2006-10-04 19:32:32 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/libopts/autoopts.h b/libopts/autoopts.h
index b7805fe74..15fee722f 100644
--- a/libopts/autoopts.h
+++ b/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2006-09-10 14:43:25 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.29 2006/09/24 02:10:45 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.17 2006/09/24 02:11:16 bkorb Exp $
  *  Time-stamp:      "2005-02-14 05:59:50 bkorb"
  *
  *  This file defines all the global structures and special values
diff --git a/libopts/autoopts/options.h b/libopts/autoopts/options.h
index 97814ee3f..ec4d0e408 100644
--- a/libopts/autoopts/options.h
+++ b/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Thursday October  5, 2006 at 09:15:13 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:45 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -785,7 +785,7 @@ extern void optionUnloadNested( const tOptionValue* );
 extern char const* optionVersion( void );
 
 
-/* From: ../compat/pathfind.c line 34
+/* From: ../compat/pathfind.c line 33
  *
  * pathfind - fild a file in a list of directories
  *
diff --git a/libopts/autoopts/usage-txt.h b/libopts/autoopts/usage-txt.h
index 9c7079b8c..02b12fc7c 100644
--- a/libopts/autoopts/usage-txt.h
+++ b/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Thursday October  5, 2006 at 09:15:10 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:43 PM PDT
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
diff --git a/libopts/boolean.c b/libopts/boolean.c
index 7549113fe..2f8326a29 100644
--- a/libopts/boolean.c
+++ b/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: boolean.c,v 4.6 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:13:34 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/compat/compat.h b/libopts/compat/compat.h
index 38e38d583..5a7298551 100644
--- a/libopts/compat/compat.h
+++ b/libopts/compat/compat.h
@@ -7,7 +7,7 @@
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Created:          Mon Jun 30 15:54:46 1997
  *
- * $Id: compat.h,v 4.14 2006/09/24 02:10:45 bkorb Exp $
+ * $Id: compat.h,v 4.13 2006/09/24 02:11:16 bkorb Exp $
  */
 #ifndef COMPAT_H_GUARD
 #define COMPAT_H_GUARD 1
diff --git a/libopts/compat/pathfind.c b/libopts/compat/pathfind.c
index e74a8f63f..87ac2b7a7 100644
--- a/libopts/compat/pathfind.c
+++ b/libopts/compat/pathfind.c
@@ -4,12 +4,11 @@
 
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
- * Time-stamp:       "2006-09-23 19:46:16 bkorb"
  * Created:          Tue Jun 24 15:07:31 1997
- * Last Modified:    $Date: 2006/09/24 02:57:02 $
+ * Last Modified:    $Date: 2006/09/24 02:11:16 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.10 2006/09/24 02:57:02 bkorb Exp $
+ * $Id: pathfind.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  */
 
 /* Code: */
diff --git a/libopts/compat/windows-config.h b/libopts/compat/windows-config.h
index 02f81160d..005582f49 100644
--- a/libopts/compat/windows-config.h
+++ b/libopts/compat/windows-config.h
@@ -1,8 +1,8 @@
 
 /*
- * Time-stamp:        "2006-09-23 19:44:29 bkorb"
+ * Time-stamp:        "2006-10-12 17:42:52 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2006/09/24 02:57:02 $
+ * Last Committed:    $Date: 2006/10/13 00:44:35 $
  */
 #ifndef WINDOWS_CONFIG_HACKERY
 #define WINDOWS_CONFIG_HACKERY 1
@@ -35,6 +35,12 @@
 
 #define SIZEOF_INT 4
 
+#define SIZEOF_CHARP 4
+#define SIZEOF_LONG  4
+#define SIZEOF_SHORT 4
+
+typedef unsigned long uintptr_t;
+
 /*
  * # define HAVE_NET_IF_H
  * # define QSORT_USES_VOID_P
diff --git a/libopts/configfile.c b/libopts/configfile.c
index 59037d6b2..f6f421ac4 100644
--- a/libopts/configfile.c
+++ b/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 4.29 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: configfile.c,v 1.15 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:18:51 bkorb"
  *
  *  configuration/rc/ini file handling.
diff --git a/libopts/cook.c b/libopts/cook.c
index 56d4c0408..de671a213 100644
--- a/libopts/cook.c
+++ b/libopts/cook.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: cook.c,v 4.9 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: cook.c,v 4.7 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:21:02 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
diff --git a/libopts/enumeration.c b/libopts/enumeration.c
index dd51b1111..85f087c1c 100644
--- a/libopts/enumeration.c
+++ b/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.14 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: enumeration.c,v 4.12 2006/10/06 05:29:00 bkorb Exp $
  * Time-stamp:      "2006-10-05 21:10:21 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/environment.c b/libopts/environment.c
index 1ac3fe8eb..185c3fb7e 100644
--- a/libopts/environment.c
+++ b/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: environment.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2005-10-29 13:23:59 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/libopts/genshell.c b/libopts/genshell.c
index c7331f49f..8f31d2590 100644
--- a/libopts/genshell.c
+++ b/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Thursday October  5, 2006 at 09:15:14 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:47 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/libopts/genshell.h b/libopts/genshell.h
index e7c524eab..1a900a647 100644
--- a/libopts/genshell.h
+++ b/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Thursday October  5, 2006 at 09:15:14 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:47 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/libopts/load.c b/libopts/load.c
index 45fb53a47..8eccf7aa7 100644
--- a/libopts/load.c
+++ b/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.26 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: load.c,v 4.14 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:23:01 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
index 4c6f71151..6a04ef5f6 100644
--- a/libopts/m4/libopts.m4
+++ b/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  Thursday October  5, 2006 at 09:15:16 PM PDT
+dnl It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:50 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -401,7 +401,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 dnl @synopsis  LIBOPTS_CHECK
 dnl
 dnl Time-stamp:        "2006-09-23 19:36:24 bkorb"
-dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+dnl Last Committed:    $Date: 2006/09/24 02:59:00 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
diff --git a/libopts/m4/liboptschk.m4 b/libopts/m4/liboptschk.m4
index 2c473a08a..14e7f27c8 100644
--- a/libopts/m4/liboptschk.m4
+++ b/libopts/m4/liboptschk.m4
@@ -5,7 +5,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Time-stamp:        "2006-09-23 19:42:31 bkorb"
-dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+dnl Last Committed:    $Date: 2006/09/24 02:59:00 $
 
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
diff --git a/libopts/makeshell.c b/libopts/makeshell.c
index 088df02f9..27fe19f0e 100644
--- a/libopts/makeshell.c
+++ b/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.18 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: makeshell.c,v 4.14 2006/10/06 05:29:00 bkorb Exp $
  * Time-stamp:      "2006-10-05 20:41:23 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/libopts/nested.c b/libopts/nested.c
index 0989cec17..f5cfe268b 100644
--- a/libopts/nested.c
+++ b/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.14 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: nested.c,v 4.8 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:27:32 bkorb"
  *
  *   Automated Options Nested Values module.
diff --git a/libopts/numeric.c b/libopts/numeric.c
index a186984e6..d42efb25f 100644
--- a/libopts/numeric.c
+++ b/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.10 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: numeric.c,v 4.8 2006/10/05 03:48:57 bkorb Exp $
  *  Time-stamp:      "2006-10-04 16:12:34 bkorb"
  */
 
diff --git a/libopts/pgusage.c b/libopts/pgusage.c
index 85b558c0d..384ef257a 100644
--- a/libopts/pgusage.c
+++ b/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.13 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: pgusage.c,v 4.11 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-07-16 08:13:26 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/proto.h b/libopts/proto.h
index 70a421b10..dfe4167f4 100644
--- a/libopts/proto.h
+++ b/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Thu Oct  5 21:15:15 PDT 2006
+ * Generated Thu Oct 12 17:44:48 PDT 2006
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/libopts/putshell.c b/libopts/putshell.c
index a9ff3ef42..4f5834ba6 100644
--- a/libopts/putshell.c
+++ b/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.16 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: putshell.c,v 4.14 2006/10/06 05:29:01 bkorb Exp $
  * Time-stamp:      "2006-10-05 20:37:42 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/libopts/restore.c b/libopts/restore.c
index c5d56f9c7..a93d44505 100644
--- a/libopts/restore.c
+++ b/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.9 2006/10/05 03:39:53 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.7 2006/10/05 03:48:57 bkorb Exp $
  * Time-stamp:      "2005-02-23 15:10:20 bkorb"
  *
  *  This module's routines will save the current option state to memory
diff --git a/libopts/save.c b/libopts/save.c
index 573508c56..16f57b710 100644
--- a/libopts/save.c
+++ b/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.20 2006/10/05 03:39:53 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.12 2006/10/06 05:29:01 bkorb Exp $
  * Time-stamp:      "2006-10-05 21:09:18 bkorb"
  *
  *  This module's routines will take the currently set options and
diff --git a/libopts/sort.c b/libopts/sort.c
index 3b5eafd42..5e4bfbe9c 100644
--- a/libopts/sort.c
+++ b/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.11 2006/09/24 02:10:45 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.8 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-06-24 10:53:35 bkorb"
  *
  *  This module implements argument sorting.
diff --git a/libopts/stack.c b/libopts/stack.c
index 9d8f3a3d9..247436ce7 100644
--- a/libopts/stack.c
+++ b/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.13 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: stack.c,v 4.10 2006/10/05 03:48:57 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:13:19 bkorb"
  *
  *  This is a special option processing routine that will save the
diff --git a/libopts/streqvcmp.c b/libopts/streqvcmp.c
index 257ce8840..166ba8abd 100644
--- a/libopts/streqvcmp.c
+++ b/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-07-26 18:25:53 bkorb"
  *
  *  String Equivalence Comparison
diff --git a/libopts/text_mmap.c b/libopts/text_mmap.c
index ef70a9c11..130521007 100644
--- a/libopts/text_mmap.c
+++ b/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.16 2006/09/24 02:10:45 bkorb Exp $
+ * $Id: text_mmap.c,v 4.14 2006/09/24 02:11:16 bkorb Exp $
  *
  * Time-stamp:      "2006-09-10 14:50:04 bkorb"
  */
diff --git a/libopts/usage.c b/libopts/usage.c
index f4798af17..276c19c9e 100644
--- a/libopts/usage.c
+++ b/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.17 2006/09/24 02:10:45 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.12 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-07-01 12:41:02 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/libopts/version.c b/libopts/version.c
index f528699d3..a3936540f 100644
--- a/libopts/version.c
+++ b/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
+/*  $Id: version.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:15:00 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/sntp/libopts/autoopts.c b/sntp/libopts/autoopts.c
index a97083e49..c44f7b423 100644
--- a/sntp/libopts/autoopts.c
+++ b/sntp/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.27 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: autoopts.c,v 4.17 2006/10/05 03:48:56 bkorb Exp $
  *  Time-stamp:      "2006-10-04 19:32:32 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/sntp/libopts/autoopts.h b/sntp/libopts/autoopts.h
index b7805fe74..15fee722f 100644
--- a/sntp/libopts/autoopts.h
+++ b/sntp/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2006-09-10 14:43:25 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.29 2006/09/24 02:10:45 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.17 2006/09/24 02:11:16 bkorb Exp $
  *  Time-stamp:      "2005-02-14 05:59:50 bkorb"
  *
  *  This file defines all the global structures and special values
diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h
index 97814ee3f..ec4d0e408 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  Thursday October  5, 2006 at 09:15:13 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:45 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -785,7 +785,7 @@ extern void optionUnloadNested( const tOptionValue* );
 extern char const* optionVersion( void );
 
 
-/* From: ../compat/pathfind.c line 34
+/* From: ../compat/pathfind.c line 33
  *
  * pathfind - fild a file in a list of directories
  *
diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h
index 9c7079b8c..02b12fc7c 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  Thursday October  5, 2006 at 09:15:10 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:43 PM PDT
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
diff --git a/sntp/libopts/boolean.c b/sntp/libopts/boolean.c
index 7549113fe..2f8326a29 100644
--- a/sntp/libopts/boolean.c
+++ b/sntp/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: boolean.c,v 4.6 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:13:34 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/sntp/libopts/compat/compat.h b/sntp/libopts/compat/compat.h
index 38e38d583..5a7298551 100644
--- a/sntp/libopts/compat/compat.h
+++ b/sntp/libopts/compat/compat.h
@@ -7,7 +7,7 @@
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Created:          Mon Jun 30 15:54:46 1997
  *
- * $Id: compat.h,v 4.14 2006/09/24 02:10:45 bkorb Exp $
+ * $Id: compat.h,v 4.13 2006/09/24 02:11:16 bkorb Exp $
  */
 #ifndef COMPAT_H_GUARD
 #define COMPAT_H_GUARD 1
diff --git a/sntp/libopts/compat/pathfind.c b/sntp/libopts/compat/pathfind.c
index e74a8f63f..87ac2b7a7 100644
--- a/sntp/libopts/compat/pathfind.c
+++ b/sntp/libopts/compat/pathfind.c
@@ -4,12 +4,11 @@
 
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
- * Time-stamp:       "2006-09-23 19:46:16 bkorb"
  * Created:          Tue Jun 24 15:07:31 1997
- * Last Modified:    $Date: 2006/09/24 02:57:02 $
+ * Last Modified:    $Date: 2006/09/24 02:11:16 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.10 2006/09/24 02:57:02 bkorb Exp $
+ * $Id: pathfind.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  */
 
 /* Code: */
diff --git a/sntp/libopts/compat/windows-config.h b/sntp/libopts/compat/windows-config.h
index 02f81160d..005582f49 100644
--- a/sntp/libopts/compat/windows-config.h
+++ b/sntp/libopts/compat/windows-config.h
@@ -1,8 +1,8 @@
 
 /*
- * Time-stamp:        "2006-09-23 19:44:29 bkorb"
+ * Time-stamp:        "2006-10-12 17:42:52 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2006/09/24 02:57:02 $
+ * Last Committed:    $Date: 2006/10/13 00:44:35 $
  */
 #ifndef WINDOWS_CONFIG_HACKERY
 #define WINDOWS_CONFIG_HACKERY 1
@@ -35,6 +35,12 @@
 
 #define SIZEOF_INT 4
 
+#define SIZEOF_CHARP 4
+#define SIZEOF_LONG  4
+#define SIZEOF_SHORT 4
+
+typedef unsigned long uintptr_t;
+
 /*
  * # define HAVE_NET_IF_H
  * # define QSORT_USES_VOID_P
diff --git a/sntp/libopts/configfile.c b/sntp/libopts/configfile.c
index 59037d6b2..f6f421ac4 100644
--- a/sntp/libopts/configfile.c
+++ b/sntp/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 4.29 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: configfile.c,v 1.15 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:18:51 bkorb"
  *
  *  configuration/rc/ini file handling.
diff --git a/sntp/libopts/cook.c b/sntp/libopts/cook.c
index 56d4c0408..de671a213 100644
--- a/sntp/libopts/cook.c
+++ b/sntp/libopts/cook.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: cook.c,v 4.9 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: cook.c,v 4.7 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:21:02 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
diff --git a/sntp/libopts/enumeration.c b/sntp/libopts/enumeration.c
index dd51b1111..85f087c1c 100644
--- a/sntp/libopts/enumeration.c
+++ b/sntp/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.14 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: enumeration.c,v 4.12 2006/10/06 05:29:00 bkorb Exp $
  * Time-stamp:      "2006-10-05 21:10:21 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/sntp/libopts/environment.c b/sntp/libopts/environment.c
index 1ac3fe8eb..185c3fb7e 100644
--- a/sntp/libopts/environment.c
+++ b/sntp/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: environment.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2005-10-29 13:23:59 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index c7331f49f..8f31d2590 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  Thursday October  5, 2006 at 09:15:14 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:47 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h
index e7c524eab..1a900a647 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  Thursday October  5, 2006 at 09:15:14 PM PDT
+ *  It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:47 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/sntp/libopts/load.c b/sntp/libopts/load.c
index 45fb53a47..8eccf7aa7 100644
--- a/sntp/libopts/load.c
+++ b/sntp/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.26 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: load.c,v 4.14 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:23:01 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index 4c6f71151..6a04ef5f6 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  Thursday October  5, 2006 at 09:15:16 PM PDT
+dnl It has been AutoGen-ed  Thursday October 12, 2006 at 05:44:50 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -401,7 +401,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 dnl @synopsis  LIBOPTS_CHECK
 dnl
 dnl Time-stamp:        "2006-09-23 19:36:24 bkorb"
-dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+dnl Last Committed:    $Date: 2006/09/24 02:59:00 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
diff --git a/sntp/libopts/m4/liboptschk.m4 b/sntp/libopts/m4/liboptschk.m4
index 2c473a08a..14e7f27c8 100644
--- a/sntp/libopts/m4/liboptschk.m4
+++ b/sntp/libopts/m4/liboptschk.m4
@@ -5,7 +5,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Time-stamp:        "2006-09-23 19:42:31 bkorb"
-dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+dnl Last Committed:    $Date: 2006/09/24 02:59:00 $
 
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
diff --git a/sntp/libopts/makeshell.c b/sntp/libopts/makeshell.c
index 088df02f9..27fe19f0e 100644
--- a/sntp/libopts/makeshell.c
+++ b/sntp/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.18 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: makeshell.c,v 4.14 2006/10/06 05:29:00 bkorb Exp $
  * Time-stamp:      "2006-10-05 20:41:23 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/sntp/libopts/nested.c b/sntp/libopts/nested.c
index 0989cec17..f5cfe268b 100644
--- a/sntp/libopts/nested.c
+++ b/sntp/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.14 2006/09/28 01:26:16 bkorb Exp $
+ *  $Id: nested.c,v 4.8 2006/09/28 01:26:33 bkorb Exp $
  *  Time-stamp:      "2006-09-24 15:27:32 bkorb"
  *
  *   Automated Options Nested Values module.
diff --git a/sntp/libopts/numeric.c b/sntp/libopts/numeric.c
index a186984e6..d42efb25f 100644
--- a/sntp/libopts/numeric.c
+++ b/sntp/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.10 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: numeric.c,v 4.8 2006/10/05 03:48:57 bkorb Exp $
  *  Time-stamp:      "2006-10-04 16:12:34 bkorb"
  */
 
diff --git a/sntp/libopts/pgusage.c b/sntp/libopts/pgusage.c
index 85b558c0d..384ef257a 100644
--- a/sntp/libopts/pgusage.c
+++ b/sntp/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.13 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: pgusage.c,v 4.11 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-07-16 08:13:26 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index 70a421b10..dfe4167f4 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 Thu Oct  5 21:15:15 PDT 2006
+ * Generated Thu Oct 12 17:44:48 PDT 2006
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/sntp/libopts/putshell.c b/sntp/libopts/putshell.c
index a9ff3ef42..4f5834ba6 100644
--- a/sntp/libopts/putshell.c
+++ b/sntp/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.16 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: putshell.c,v 4.14 2006/10/06 05:29:01 bkorb Exp $
  * Time-stamp:      "2006-10-05 20:37:42 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/sntp/libopts/restore.c b/sntp/libopts/restore.c
index c5d56f9c7..a93d44505 100644
--- a/sntp/libopts/restore.c
+++ b/sntp/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.9 2006/10/05 03:39:53 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.7 2006/10/05 03:48:57 bkorb Exp $
  * Time-stamp:      "2005-02-23 15:10:20 bkorb"
  *
  *  This module's routines will save the current option state to memory
diff --git a/sntp/libopts/save.c b/sntp/libopts/save.c
index 573508c56..16f57b710 100644
--- a/sntp/libopts/save.c
+++ b/sntp/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.20 2006/10/05 03:39:53 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.12 2006/10/06 05:29:01 bkorb Exp $
  * Time-stamp:      "2006-10-05 21:09:18 bkorb"
  *
  *  This module's routines will take the currently set options and
diff --git a/sntp/libopts/sort.c b/sntp/libopts/sort.c
index 3b5eafd42..5e4bfbe9c 100644
--- a/sntp/libopts/sort.c
+++ b/sntp/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.11 2006/09/24 02:10:45 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.8 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-06-24 10:53:35 bkorb"
  *
  *  This module implements argument sorting.
diff --git a/sntp/libopts/stack.c b/sntp/libopts/stack.c
index 9d8f3a3d9..247436ce7 100644
--- a/sntp/libopts/stack.c
+++ b/sntp/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.13 2006/10/05 03:39:53 bkorb Exp $
+ *  $Id: stack.c,v 4.10 2006/10/05 03:48:57 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:13:19 bkorb"
  *
  *  This is a special option processing routine that will save the
diff --git a/sntp/libopts/streqvcmp.c b/sntp/libopts/streqvcmp.c
index 257ce8840..166ba8abd 100644
--- a/sntp/libopts/streqvcmp.c
+++ b/sntp/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-07-26 18:25:53 bkorb"
  *
  *  String Equivalence Comparison
diff --git a/sntp/libopts/text_mmap.c b/sntp/libopts/text_mmap.c
index ef70a9c11..130521007 100644
--- a/sntp/libopts/text_mmap.c
+++ b/sntp/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.16 2006/09/24 02:10:45 bkorb Exp $
+ * $Id: text_mmap.c,v 4.14 2006/09/24 02:11:16 bkorb Exp $
  *
  * Time-stamp:      "2006-09-10 14:50:04 bkorb"
  */
diff --git a/sntp/libopts/usage.c b/sntp/libopts/usage.c
index f4798af17..276c19c9e 100644
--- a/sntp/libopts/usage.c
+++ b/sntp/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.17 2006/09/24 02:10:45 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.12 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-07-01 12:41:02 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/sntp/libopts/version.c b/sntp/libopts/version.c
index f528699d3..a3936540f 100644
--- a/sntp/libopts/version.c
+++ b/sntp/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
+/*  $Id: version.c,v 4.9 2006/09/24 02:11:16 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:15:00 bkorb"
  *
  *  This module implements the default usage procedure for