From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 Sep 2006 22:21:20 +0000 (-0400)
Subject: libopts-27.4.3
X-Git-Tag: NTP_4_2_3P42~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cef8e8502be8260081195d5e5d4ca247d5fb03c;p=thirdparty%2Fntp.git

libopts-27.4.3

bk: 45033e60YWdXYoh7Pv-Z-mg0UP8FQw
---

diff --git a/libopts/COPYING.lgpl b/libopts/COPYING.lgpl
index 52f31fd54..129c5de4f 100644
--- a/libopts/COPYING.lgpl
+++ b/libopts/COPYING.lgpl
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
diff --git a/libopts/Makefile.am b/libopts/Makefile.am
index 31b312ff8..9c1479cce 100644
--- a/libopts/Makefile.am
+++ b/libopts/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES  = Makefile.in
 lib_LTLIBRARIES       = libopts.la
 libopts_la_SOURCES    = libopts.c
 libopts_la_CPPFLAGS   = -I$(top_srcdir)
-libopts_la_LDFLAGS    = -version-info  27:4:2
+libopts_la_LDFLAGS    = -version-info  27:4:3
 EXTRA_DIST            = \
     COPYING.lgpl            COPYING.mbsd            MakeDefs.inc  \
     README                  autoopts/options.h      autoopts/usage-txt.h  \
diff --git a/libopts/autoopts.c b/libopts/autoopts.c
index 7efe8245b..5c9b337aa 100644
--- a/libopts/autoopts.c
+++ b/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.22 2006/07/15 22:10:21 bkorb Exp $
+ *  $Id: autoopts.c,v 4.13 2006/07/15 22:17:36 bkorb Exp $
  *  Time-stamp:      "2006-07-15 13:54:08 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/libopts/autoopts/options.h b/libopts/autoopts/options.h
index c6027ff57..c55497ca3 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  Saturday July 22, 2006 at 08:36:53 AM PDT
+ *  It has been AutoGen-ed  Saturday September  9, 2006 at 01:15:17 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -260,10 +260,10 @@ struct optSpecIndex {
     const tAoUS         default_opt;
 };
 
-#define  OPTIONS_STRUCT_VERSION  110594
-#define  OPTIONS_VERSION_STRING  "27:4:2"
-#define  OPTIONS_MINIMUM_VERSION 102400
-#define  OPTIONS_MIN_VER_STRING  "25:0:0"
+#define  OPTIONS_STRUCT_VERSION  110595
+#define  OPTIONS_VERSION_STRING  "27:4:3"
+#define  OPTIONS_MINIMUM_VERSION 98304
+#define  OPTIONS_MIN_VER_STRING  "24:0:0"
 
 /*
  *  The procedure generated for translating option text
diff --git a/libopts/autoopts/usage-txt.h b/libopts/autoopts/usage-txt.h
index 93cbdeb08..542a95993 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  Saturday July 22, 2006 at 08:36:51 AM PDT
+ *  It has been AutoGen-ed  Saturday September  9, 2006 at 01:15:15 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 d09833003..b0c40a7fa 100644
--- a/libopts/boolean.c
+++ b/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.6 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: boolean.c,v 4.4 2006/03/31 19:52:10 bkorb Exp $
  * Time-stamp:      "2005-02-14 08:24:12 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/compat/compat.h b/libopts/compat/compat.h
index 8c7f19e6a..cb58336fd 100644
--- a/libopts/compat/compat.h
+++ b/libopts/compat/compat.h
@@ -2,12 +2,12 @@
 
 /* --- fake the preprocessor into handlng portability */
 /*
- *  Time-stamp:      "2006-07-15 08:27:23 bkorb"
+ *  Time-stamp:      "2006-09-07 06:49:09 bkorb"
  *
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Created:          Mon Jun 30 15:54:46 1997
  *
- * $Id: compat.h,v 4.10 2006/07/15 22:10:21 bkorb Exp $
+ * $Id: compat.h,v 4.11 2006/09/07 14:48:05 bkorb Exp $
  */
 #ifndef COMPAT_H_GUARD
 #define COMPAT_H_GUARD 1
@@ -37,7 +37,7 @@
  *  SYSTEM HEADERS:
  */
 #include <sys/types.h>
-#if HAVE_SYS_MMAN_H
+#ifdef HAVE_SYS_MMAN_H
 #  include <sys/mman.h>
 #endif
 #include <sys/param.h>
diff --git a/libopts/compat/pathfind.c b/libopts/compat/pathfind.c
index 010bb2b27..9cfbebb1d 100644
--- a/libopts/compat/pathfind.c
+++ b/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Created:          Tue Jun 24 15:07:31 1997
- * Last Modified:    $Date: 2006/07/15 22:10:21 $
+ * Last Modified:    $Date: 2006/08/22 16:09:02 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.6 2006/07/15 22:10:21 bkorb Exp $
+ * $Id: pathfind.c,v 4.7 2006/08/22 16:09:02 bkorb Exp $
  */
 
 /* Code: */
@@ -148,7 +148,7 @@ pathfind( const char*  path,
                 break;
             }
         }
-        
+
         closedir( dirP );
 
         if (pathName != NULL)
@@ -168,7 +168,7 @@ make_absolute( const char *string, const char *dot_path )
 {
     char *result;
     int result_len;
-  
+
     if (!dot_path || *string == '/') {
         result = strdup( string );
     } else {
@@ -179,7 +179,7 @@ make_absolute( const char *string, const char *dot_path )
             if (result[result_len - 1] != '/') {
                 result[result_len++] = '/';
                 result[result_len] = '\0';
-            }    
+            }
         } else {
             result = malloc( 3 + strlen( string ) );
             result[0] = '.'; result[1] = '/'; result[2] = '\0';
diff --git a/libopts/compat/windows-config.h b/libopts/compat/windows-config.h
index ebacf0419..a88ddbb86 100644
--- a/libopts/compat/windows-config.h
+++ b/libopts/compat/windows-config.h
@@ -71,7 +71,7 @@
 
 /* Prevent inclusion of winsock.h in windows.h */
 #ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_  
+#define _WINSOCKAPI_
 #endif
 
 #ifndef __RPCASYNC_H__
@@ -83,7 +83,7 @@
 #include <winsock2.h>
 
 /*
- * Compatibility declarations for Windows, assuming SYS_WINNT 
+ * Compatibility declarations for Windows, assuming SYS_WINNT
  * has been defined.
  */
 #define strdup  _strdup
@@ -94,7 +94,7 @@
 
 #include <io.h>
 #define open    _open
-#define close   _close 
+#define close   _close
 #define read    _read
 #define write   _write
 #define lseek   _lseek
@@ -102,7 +102,7 @@
 #define dup2    _dup2
 
 #define O_RDWR     _O_RDWR
-#define O_RDONLY   _O_RDONLY 
+#define O_RDONLY   _O_RDONLY
 #define O_EXCL     _O_EXCL
 
 #ifndef	S_ISREG
diff --git a/libopts/configfile.c b/libopts/configfile.c
index e8cd371ac..fa163acf6 100644
--- a/libopts/configfile.c
+++ b/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 4.23 2006/07/01 21:57:23 bkorb Exp $
+ *  $Id: configfile.c,v 1.10 2006/07/14 04:31:37 bkorb Exp $
  *  Time-stamp:      "2006-07-01 12:46:31 bkorb"
  *
  *  configuration/rc/ini file handling.
diff --git a/libopts/cook.c b/libopts/cook.c
index aecd4ec48..134be4cfd 100644
--- a/libopts/cook.c
+++ b/libopts/cook.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: cook.c,v 4.6 2006/06/24 23:34:51 bkorb Exp $
+ *  $Id: cook.c,v 4.4 2006/06/24 23:36:07 bkorb Exp $
  *  Time-stamp:      "2006-06-24 11:29:58 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
diff --git a/libopts/enumeration.c b/libopts/enumeration.c
index 0dbe56614..cf5d6d117 100644
--- a/libopts/enumeration.c
+++ b/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.11 2006/06/24 23:34:51 bkorb Exp $
+ *  $Id: enumeration.c,v 4.9 2006/06/24 23:36:08 bkorb Exp $
  * Time-stamp:      "2006-06-24 10:46:02 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/environment.c b/libopts/environment.c
index caaa712ba..d7e9e8c74 100644
--- a/libopts/environment.c
+++ b/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.10 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: environment.c,v 4.7 2006/03/31 19:52:10 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 d32d55c88..430ff2b73 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  Saturday July 22, 2006 at 08:36:53 AM PDT
+ *  It has been AutoGen-ed  Saturday September  9, 2006 at 01:15:18 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  */
diff --git a/libopts/genshell.h b/libopts/genshell.h
index 657e49ea3..9694e0ffe 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  Saturday July 22, 2006 at 08:36:53 AM PDT
+ *  It has been AutoGen-ed  Saturday September  9, 2006 at 01:15:18 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  */
@@ -76,11 +76,11 @@ typedef enum {
 #define GENSHELLOPT_FULL_VERSION  "genshellopt - Generate Shell Option Processing Script - Ver. 1"
 
 /*
- *  Interface defines for all options.  Replace "n" with
- *  the UPPER_CASED option name (as in the teOptIndex
- *  enumeration above).  e.g. HAVE_OPT( SCRIPT )
+ *  Interface defines for all options.  Replace "n" with the UPPER_CASED
+ *  option name (as in the teOptIndex enumeration above).
+ *  e.g. HAVE_OPT( SCRIPT )
  */
-#define        DESC(n) genshelloptOptions.pOptDesc[INDEX_OPT_ ## n]
+#define         DESC(n) genshelloptOptions.pOptDesc[INDEX_OPT_ ## n]
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
 #define      OPT_ARG(n) (DESC(n).pzLastArg)
 #define    STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK)
@@ -115,7 +115,7 @@ typedef enum {
                 genshelloptOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*genshelloptOptions.pUsageProc)( &genshelloptOptions, c )
-/* extracted from opthead near line 288 */
+/* extracted from opthead near line 311 */
 
 /* * * * * *
  *
diff --git a/libopts/load.c b/libopts/load.c
index 19edbcd34..350f8208e 100644
--- a/libopts/load.c
+++ b/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.23 2006/07/01 21:57:23 bkorb Exp $
+ *  $Id: load.c,v 4.11 2006/07/14 04:31:37 bkorb Exp $
  *  Time-stamp:      "2006-07-01 12:43:03 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 a044564ed..4edf4ad4a 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  Saturday August 12, 2006 at 10:36:56 AM PDT
+dnl It has been AutoGen-ed  Saturday September  9, 2006 at 01:15:14 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
diff --git a/libopts/makeshell.c b/libopts/makeshell.c
index dbb4ff590..171cb23b8 100644
--- a/libopts/makeshell.c
+++ b/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.14 2006/07/27 02:51:47 bkorb Exp $
+ *  $Id: makeshell.c,v 4.10 2006/07/27 02:59:08 bkorb Exp $
  * Time-stamp:      "2006-07-24 21:30:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/libopts/nested.c b/libopts/nested.c
index 00b88691a..f8b612519 100644
--- a/libopts/nested.c
+++ b/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.9 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: nested.c,v 4.4 2006/03/31 19:52:10 bkorb Exp $
  *  Time-stamp:      "2005-07-27 10:10:28 bkorb"
  *
  *   Automated Options Nested Values module.
diff --git a/libopts/numeric.c b/libopts/numeric.c
index 26790df3c..08c520be1 100644
--- a/libopts/numeric.c
+++ b/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.7 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: numeric.c,v 4.5 2006/03/31 19:52:10 bkorb Exp $
  *  Time-stamp:      "2005-02-14 08:22:56 bkorb"
  */
 
diff --git a/libopts/pgusage.c b/libopts/pgusage.c
index 61684555d..4dc707541 100644
--- a/libopts/pgusage.c
+++ b/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.12 2006/07/16 15:27:50 bkorb Exp $
+ *  $Id: pgusage.c,v 4.10 2006/07/16 15:29:31 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 fc0536637..ea67c63db 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 Jul 27 21:15:11 PDT 2006
+ * Generated Sat Sep  9 13:16:02 PDT 2006
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/libopts/putshell.c b/libopts/putshell.c
index f98f75260..1f7a611ce 100644
--- a/libopts/putshell.c
+++ b/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.12 2006/07/16 15:27:50 bkorb Exp $
+ *  $Id: putshell.c,v 4.9 2006/07/16 15:29:31 bkorb Exp $
  * Time-stamp:      "2006-07-16 08:13:24 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/libopts/restore.c b/libopts/restore.c
index ce788b330..798614cee 100644
--- a/libopts/restore.c
+++ b/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.7 2006/03/25 19:23:28 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.5 2006/03/31 19:52:11 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 d225c27b4..9c73057e4 100644
--- a/libopts/save.c
+++ b/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.16 2006/07/16 15:27:50 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.8 2006/07/16 15:29:31 bkorb Exp $
  * Time-stamp:      "2006-07-16 08:13:22 bkorb"
  *
  *  This module's routines will take the currently set options and
diff --git a/libopts/sort.c b/libopts/sort.c
index de0bd5634..90c81a8c9 100644
--- a/libopts/sort.c
+++ b/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.10 2006/06/24 23:34:51 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.7 2006/06/24 23:36:08 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 5f51f37db..65db828eb 100644
--- a/libopts/stack.c
+++ b/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.10 2006/07/14 04:20:17 bkorb Exp $
+ *  $Id: stack.c,v 4.7 2006/07/14 04:31:38 bkorb Exp $
  *  Time-stamp:      "2006-07-13 21:11:29 bkorb"
  *
  *  This is a special option processing routine that will save the
diff --git a/libopts/streqvcmp.c b/libopts/streqvcmp.c
index 42336dc97..f66ddd804 100644
--- a/libopts/streqvcmp.c
+++ b/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.10 2006/07/27 02:51:47 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.7 2006/07/27 02:59:08 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 a8d06b3a6..643989f2c 100644
--- a/libopts/text_mmap.c
+++ b/libopts/text_mmap.c
@@ -1,14 +1,14 @@
 /*
- * $Id: text_mmap.c,v 4.11 2006/06/24 23:34:51 bkorb Exp $
+ * $Id: text_mmap.c,v 4.10 2006/08/22 16:09:02 bkorb Exp $
  *
- * Time-stamp:      "2006-06-24 10:54:43 bkorb"
+ * Time-stamp:      "2006-08-22 07:17:49 bkorb"
  */
 
-#ifndef MAP_ANONYMOUS 
-#  ifdef   MAP_ANON 
-#  define  MAP_ANONYMOUS   MAP_ANON 
-#  endif 
-#endif 
+#ifndef MAP_ANONYMOUS
+#  ifdef   MAP_ANON
+#  define  MAP_ANONYMOUS   MAP_ANON
+#  endif
+#endif
 
 /*
  *  Some weird systems require that a specifically invalid FD number
diff --git a/libopts/version.c b/libopts/version.c
index e01809a80..dd50ec4d8 100644
--- a/libopts/version.c
+++ b/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.9 2006/07/27 02:51:47 bkorb Exp $
+/*  $Id: version.c,v 4.7 2006/07/27 02:59:08 bkorb Exp $
  * Time-stamp:      "2006-07-26 18:38:16 bkorb"
  *
  *  This module implements the default usage procedure for