From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 24 Jul 2009 05:21:05 +0000 (-0400)
Subject: Upgrade to autogen-5.9.9pre2
X-Git-Tag: NTP_4_2_5P192~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7e601a85dd5e81b31437c737b122744aeda3eb2;p=thirdparty%2Fntp.git

Upgrade to autogen-5.9.9pre2

bk: 4a6944c1aCEvWCEqe9uZ_bJcU6_adQ
---

diff --git a/ChangeLog b/ChangeLog
index 4ab99d8d1..25bf98341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Updated to AutoGen-5.9.9pre2.
 (4.2.5p191) 2009/07/21 Released by Harlan Stenn <stenn@ntp.org>
 * Updated to AutoGen-5.9.9pre1.
 (4.2.5p190) 2009/07/20 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/gsoc_sntp/libopts/README b/gsoc_sntp/libopts/README
index 7cbe0b044..03c529d74 100644
--- a/gsoc_sntp/libopts/README
+++ b/gsoc_sntp/libopts/README
@@ -85,7 +85,7 @@ will need to hand craft the rules for building the library.
 
 LICENSING:
 
-This material is copyright 1993-2007 by Bruce Korb.
+This material is copyright (c) 1993-2009 by Bruce Korb.
 You are licensed to use this under the terms of either
 the GNU Lesser General Public License (see: COPYING.lgpl), or,
 at your option, the modified Berkeley Software Distribution
diff --git a/gsoc_sntp/libopts/ag-char-map.h b/gsoc_sntp/libopts/ag-char-map.h
index 6309da4bf..dcdd8b7d7 100644
--- a/gsoc_sntp/libopts/ag-char-map.h
+++ b/gsoc_sntp/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 07/20/09 21:05:27
+ *   Character mapping generated 07/23/09 17:36:47
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
diff --git a/gsoc_sntp/libopts/autoopts.c b/gsoc_sntp/libopts/autoopts.c
index a6cb4bc19..9fcc95adf 100644
--- a/gsoc_sntp/libopts/autoopts.c
+++ b/gsoc_sntp/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.39 2009/01/25 19:31:59 bkorb Exp $
+ *  $Id: autoopts.c,v 4.44 2009/01/25 19:31:56 bkorb Exp $
  *  Time-stamp:      "2009-01-12 02:49:49 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/gsoc_sntp/libopts/autoopts.h b/gsoc_sntp/libopts/autoopts.h
index c4d5b9874..38edd3e9f 100644
--- a/gsoc_sntp/libopts/autoopts.h
+++ b/gsoc_sntp/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2008-11-01 20:08:06 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.30 2009/01/01 16:51:47 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.41 2009/01/01 16:49:26 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
diff --git a/gsoc_sntp/libopts/autoopts/options.h b/gsoc_sntp/libopts/autoopts/options.h
index 453f80039..4aad8f118 100644
--- a/gsoc_sntp/libopts/autoopts/options.h
+++ b/gsoc_sntp/libopts/autoopts/options.h
@@ -2,14 +2,14 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:34 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
  *
- *  Automated Options copyright 1992-Y Bruce Korb
+ *  Automated Options copyright (c) 1992-Y by Bruce Korb
  *
  *  AutoOpts is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU Lesser General Public License as published
diff --git a/gsoc_sntp/libopts/autoopts/usage-txt.h b/gsoc_sntp/libopts/autoopts/usage-txt.h
index eef1ff0c2..83081d5f5 100644
--- a/gsoc_sntp/libopts/autoopts/usage-txt.h
+++ b/gsoc_sntp/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Monday July 20, 2009 at 09:05:13 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:33 PM PDT
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
diff --git a/gsoc_sntp/libopts/boolean.c b/gsoc_sntp/libopts/boolean.c
index 300433ae1..5f9446912 100644
--- a/gsoc_sntp/libopts/boolean.c
+++ b/gsoc_sntp/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.16 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: boolean.c,v 4.15 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-08-03 13:06:02 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/gsoc_sntp/libopts/compat/compat.h b/gsoc_sntp/libopts/compat/compat.h
index 5c73ae8e4..27c1eb45f 100644
--- a/gsoc_sntp/libopts/compat/compat.h
+++ b/gsoc_sntp/libopts/compat/compat.h
@@ -4,7 +4,7 @@
  *
  *  Time-stamp:      "2008-06-14 09:36:25 bkorb"
  *
- * $Id: compat.h,v 4.21 2009/01/01 16:51:52 bkorb Exp $
+ * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/gsoc_sntp/libopts/compat/pathfind.c b/gsoc_sntp/libopts/compat/pathfind.c
index 480674dda..d87bada3a 100644
--- a/gsoc_sntp/libopts/compat/pathfind.c
+++ b/gsoc_sntp/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Time-stamp:       "2006-09-23 19:46:16 bkorb"
- * Last Modified:    $Date: 2007/07/04 20:51:18 $
+ * Last Modified:    $Date: 2007/10/07 16:54:54 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
+ * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $
  */
 
 /* Code: */
diff --git a/gsoc_sntp/libopts/compat/windows-config.h b/gsoc_sntp/libopts/compat/windows-config.h
index 4aa58d3e3..1594f28ca 100644
--- a/gsoc_sntp/libopts/compat/windows-config.h
+++ b/gsoc_sntp/libopts/compat/windows-config.h
@@ -1,12 +1,12 @@
 
 /*
- * Time-stamp:        "2007-07-04 09:45:44 bkorb"
+ * Time-stamp:        "2009-07-22 18:53:59 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2007/07/04 20:51:18 $
+ * Last Committed:    $Date: 2009/07/23 02:05:55 $
  *
  *  This file is part of AutoGen.
  *
- *  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+ *  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved
  *
  *  AutoGen is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
diff --git a/gsoc_sntp/libopts/configfile.c b/gsoc_sntp/libopts/configfile.c
index 8137fae55..92b59860c 100644
--- a/gsoc_sntp/libopts/configfile.c
+++ b/gsoc_sntp/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 1.35 2009/01/18 22:48:51 bkorb Exp $
+ *  $Id: configfile.c,v 4.46 2009/01/18 22:48:51 bkorb Exp $
  *  Time-stamp:      "2009-01-18 10:21:58 bkorb"
  *
  *  configuration/rc/ini file handling.
diff --git a/gsoc_sntp/libopts/cook.c b/gsoc_sntp/libopts/cook.c
index dc44233cb..3a66751ba 100644
--- a/gsoc_sntp/libopts/cook.c
+++ b/gsoc_sntp/libopts/cook.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cook.c,v 4.17 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: cook.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2007-11-16 22:49:11 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
diff --git a/gsoc_sntp/libopts/enumeration.c b/gsoc_sntp/libopts/enumeration.c
index ca219eb6b..6c5bad05a 100644
--- a/gsoc_sntp/libopts/enumeration.c
+++ b/gsoc_sntp/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.25 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: enumeration.c,v 4.25 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:28:01 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/gsoc_sntp/libopts/environment.c b/gsoc_sntp/libopts/environment.c
index b2765ae9b..037140419 100644
--- a/gsoc_sntp/libopts/environment.c
+++ b/gsoc_sntp/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.20 2009/07/21 03:23:12 bkorb Exp $
+ *  $Id: environment.c,v 4.20 2009/07/21 03:21:57 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:12:24 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/gsoc_sntp/libopts/file.c b/gsoc_sntp/libopts/file.c
index 4e198fc01..287119a3d 100644
--- a/gsoc_sntp/libopts/file.c
+++ b/gsoc_sntp/libopts/file.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: file.c,v 1.7 2009/01/01 16:51:47 bkorb Exp $
- *  Time-stamp:      "2008-12-06 10:15:33 bkorb"
+ *  $Id: file.c,v 4.7 2009/01/01 16:49:26 bkorb Exp $
+ *  Time-stamp:      "2009-07-23 17:23:46 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -97,7 +97,8 @@ optionFileCheck(tOptions* pOpts, tOptDesc* pOD,
                 pOpts->pUsageProc(pOpts, EXIT_FAILURE);
                 /* NOTREACHED */
             }
-            *p = '/';
+            if (p != NULL)
+                *p = DIRCH;
             break;
         }
 
diff --git a/gsoc_sntp/libopts/genshell.c b/gsoc_sntp/libopts/genshell.c
index ce8771805..54dddb06a 100644
--- a/gsoc_sntp/libopts/genshell.c
+++ b/gsoc_sntp/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/gsoc_sntp/libopts/genshell.h b/gsoc_sntp/libopts/genshell.h
index 7809702d4..d075431b0 100644
--- a/gsoc_sntp/libopts/genshell.h
+++ b/gsoc_sntp/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/gsoc_sntp/libopts/load.c b/gsoc_sntp/libopts/load.c
index 77302db43..2d8d8b074 100644
--- a/gsoc_sntp/libopts/load.c
+++ b/gsoc_sntp/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.28 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: load.c,v 4.37 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-12-06 10:16:05 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
diff --git a/gsoc_sntp/libopts/m4/libopts.m4 b/gsoc_sntp/libopts/m4/libopts.m4
index ddb16e3c2..8124af147 100644
--- a/gsoc_sntp/libopts/m4/libopts.m4
+++ b/gsoc_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  Monday July 20, 2009 at 09:05:16 PM PDT
+dnl It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:36 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -443,8 +443,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 dnl @synopsis  LIBOPTS_CHECK
 dnl
-dnl Time-stamp:        "2007-07-04 11:41:40 bkorb"
-dnl Last Committed:    $Date: 2007/07/04 20:51:20 $
+dnl Time-stamp:        "2009-07-22 18:50:49 bkorb"
+dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
@@ -452,7 +452,7 @@ dnl the config tests that the library needs.  Invoke the
 dnl "INVOKE_LIBOPTS_MACROS" macro iff we are building libopts.
 dnl
 dnl  This file is part of AutoGen.
-dnl  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+dnl  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved
 dnl
 dnl  AutoGen is free software: you can redistribute it and/or modify it
 dnl  under the terms of the GNU General Public License as published by the
diff --git a/gsoc_sntp/libopts/m4/liboptschk.m4 b/gsoc_sntp/libopts/m4/liboptschk.m4
index 6c64cde44..a2df33c93 100644
--- a/gsoc_sntp/libopts/m4/liboptschk.m4
+++ b/gsoc_sntp/libopts/m4/liboptschk.m4
@@ -1,11 +1,12 @@
 # liboptschk.m4 serial 1 (autogen - 5.7.3)
-dnl copyright (c) 2005 by Bruce Korb - all rights reserved
+dnl copyright (c) 2005-2009 by Bruce Korb - all rights reserved
+dnl
 dnl This file is free software; the Free Software Foundation
 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: 2007/07/04 20:51:18 $
+dnl Time-stamp:        "2009-07-22 18:53:27 bkorb"
+dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
 
 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/gsoc_sntp/libopts/makeshell.c b/gsoc_sntp/libopts/makeshell.c
index 6f2f3c927..dc7627d9a 100644
--- a/gsoc_sntp/libopts/makeshell.c
+++ b/gsoc_sntp/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.28 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: makeshell.c,v 4.29 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-26 16:10:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/gsoc_sntp/libopts/nested.c b/gsoc_sntp/libopts/nested.c
index 9d2c0440b..400335734 100644
--- a/gsoc_sntp/libopts/nested.c
+++ b/gsoc_sntp/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.27 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: nested.c,v 4.31 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-07-28 19:18:28 bkorb"
  *
  *   Automated Options Nested Values module.
diff --git a/gsoc_sntp/libopts/numeric.c b/gsoc_sntp/libopts/numeric.c
index fa94034fa..e336ba151 100644
--- a/gsoc_sntp/libopts/numeric.c
+++ b/gsoc_sntp/libopts/numeric.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: numeric.c,v 4.21 2009/01/17 22:08:07 bkorb Exp $
- *  Time-stamp:      "2009-01-11 18:05:28 bkorb"
+ *  $Id: numeric.c,v 4.20 2009/01/17 22:08:09 bkorb Exp $
+ *  Time-stamp:      "2009-07-23 17:25:39 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -115,15 +115,15 @@ optionNumericVal(tOptions* pOpts, tOptDesc* pOD )
     char* pz;
     long  val;
 
-    if ((pOD->fOptState & OPTST_RESET) != 0)
-        return;
-
     /*
      *  Numeric options may have a range associated with it.
      *  If it does, the usage procedure requests that it be
-     *  emitted by passing a NULL pOD pointer.
+     *  emitted by passing a NULL pOD pointer.  Also bail out
+     *  if there is no option argument or if we are being reset.
      */
-    if ((pOD == NULL) || (pOD->optArg.argString == NULL))
+    if (  (pOD == NULL)
+       || (pOD->optArg.argString == NULL)
+       || ((pOD->fOptState & OPTST_RESET) != 0))
         return;
 
     errno = 0;
@@ -158,7 +158,8 @@ optionNumericVal(tOptions* pOpts, tOptDesc* pOD )
     pOD->optArg.argInt = val;
     return;
 
-bad_number:
+    bad_number:
+
     fprintf( stderr, zNotNumber, pOpts->pzProgName, pOD->optArg.argString );
     if ((pOpts->fOptSet & OPTPROC_ERRSTOP) != 0)
         (*(pOpts->pUsageProc))(pOpts, EXIT_FAILURE);
diff --git a/gsoc_sntp/libopts/pgusage.c b/gsoc_sntp/libopts/pgusage.c
index 22c5d9b83..5f103cdd3 100644
--- a/gsoc_sntp/libopts/pgusage.c
+++ b/gsoc_sntp/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.17 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: pgusage.c,v 4.17 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 21:08:42 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/gsoc_sntp/libopts/proto.h b/gsoc_sntp/libopts/proto.h
index 3b70d359a..af35d1808 100644
--- a/gsoc_sntp/libopts/proto.h
+++ b/gsoc_sntp/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Mon Jul 20 21:05:15 PDT 2009
+ * Generated Thu Jul 23 17:36:35 PDT 2009
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/gsoc_sntp/libopts/putshell.c b/gsoc_sntp/libopts/putshell.c
index 2fd54ad34..9aeaacd52 100644
--- a/gsoc_sntp/libopts/putshell.c
+++ b/gsoc_sntp/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.26 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: putshell.c,v 4.26 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:14:38 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/gsoc_sntp/libopts/reset.c b/gsoc_sntp/libopts/reset.c
index 1796ee73f..d23786349 100644
--- a/gsoc_sntp/libopts/reset.c
+++ b/gsoc_sntp/libopts/reset.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: reset.c,v 4.3 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: reset.c,v 4.6 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-08-02 12:25:18 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
diff --git a/gsoc_sntp/libopts/restore.c b/gsoc_sntp/libopts/restore.c
index 9e7b6a089..2481a02ff 100644
--- a/gsoc_sntp/libopts/restore.c
+++ b/gsoc_sntp/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.14 2009/01/01 16:51:49 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.13 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:40 bkorb"
  *
  *  This module's routines will save the current option state to memory
diff --git a/gsoc_sntp/libopts/save.c b/gsoc_sntp/libopts/save.c
index 290c81765..3b49b69ca 100644
--- a/gsoc_sntp/libopts/save.c
+++ b/gsoc_sntp/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.31 2009/07/21 04:01:29 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.35 2009/07/21 04:01:30 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:40:28 bkorb"
  *
  *  This module's routines will take the currently set options and
diff --git a/gsoc_sntp/libopts/sort.c b/gsoc_sntp/libopts/sort.c
index 3c1ecec8f..4294382f8 100644
--- a/gsoc_sntp/libopts/sort.c
+++ b/gsoc_sntp/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.15 2009/01/01 16:51:49 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
diff --git a/gsoc_sntp/libopts/stack.c b/gsoc_sntp/libopts/stack.c
index d019b3352..10cf18a49 100644
--- a/gsoc_sntp/libopts/stack.c
+++ b/gsoc_sntp/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.18 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: stack.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-07-30 16:56:32 bkorb"
  *
  *  This is a special option processing routine that will save the
diff --git a/gsoc_sntp/libopts/streqvcmp.c b/gsoc_sntp/libopts/streqvcmp.c
index e3dbcfad5..b5971d845 100644
--- a/gsoc_sntp/libopts/streqvcmp.c
+++ b/gsoc_sntp/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.15 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-12-26 10:15:46 bkorb"
  *
  *  String Equivalence Comparison
diff --git a/gsoc_sntp/libopts/text_mmap.c b/gsoc_sntp/libopts/text_mmap.c
index 304e5f776..566644132 100644
--- a/gsoc_sntp/libopts/text_mmap.c
+++ b/gsoc_sntp/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.19 2009/01/01 16:51:49 bkorb Exp $
+ * $Id: text_mmap.c,v 4.20 2009/01/01 16:49:26 bkorb Exp $
  *
  * Time-stamp:      "2007-07-04 11:35:49 bkorb"
  *
diff --git a/gsoc_sntp/libopts/time.c b/gsoc_sntp/libopts/time.c
index 28572d3a1..484fc27e9 100644
--- a/gsoc_sntp/libopts/time.c
+++ b/gsoc_sntp/libopts/time.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: time.c,v 4.3 2009/01/01 16:51:50 bkorb Exp $
+ *  $Id: time.c,v 4.4 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-11-16 14:51:48 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
diff --git a/gsoc_sntp/libopts/usage.c b/gsoc_sntp/libopts/usage.c
index cdedfe0e7..bd64a5949 100644
--- a/gsoc_sntp/libopts/usage.c
+++ b/gsoc_sntp/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.30 2009/01/17 22:08:07 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.29 2009/01/17 22:08:09 bkorb Exp $
  * Time-stamp:      "2009-01-17 13:18:23 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/gsoc_sntp/libopts/value-type.h b/gsoc_sntp/libopts/value-type.h
index 4c1747141..45a36048e 100644
--- a/gsoc_sntp/libopts/value-type.h
+++ b/gsoc_sntp/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009
+ *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/gsoc_sntp/libopts/version.c b/gsoc_sntp/libopts/version.c
index 328a4fa72..a091da51c 100644
--- a/gsoc_sntp/libopts/version.c
+++ b/gsoc_sntp/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.16 2009/01/01 16:51:50 bkorb Exp $
+/*  $Id: version.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/gsoc_sntp/libopts/xat-attribute.h b/gsoc_sntp/libopts/xat-attribute.h
index 0a82a6b18..e081b54f6 100644
--- a/gsoc_sntp/libopts/xat-attribute.h
+++ b/gsoc_sntp/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009
+ *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/libopts/README b/libopts/README
index 7cbe0b044..03c529d74 100644
--- a/libopts/README
+++ b/libopts/README
@@ -85,7 +85,7 @@ will need to hand craft the rules for building the library.
 
 LICENSING:
 
-This material is copyright 1993-2007 by Bruce Korb.
+This material is copyright (c) 1993-2009 by Bruce Korb.
 You are licensed to use this under the terms of either
 the GNU Lesser General Public License (see: COPYING.lgpl), or,
 at your option, the modified Berkeley Software Distribution
diff --git a/libopts/ag-char-map.h b/libopts/ag-char-map.h
index 6309da4bf..dcdd8b7d7 100644
--- a/libopts/ag-char-map.h
+++ b/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 07/20/09 21:05:27
+ *   Character mapping generated 07/23/09 17:36:47
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
diff --git a/libopts/autoopts.c b/libopts/autoopts.c
index a6cb4bc19..9fcc95adf 100644
--- a/libopts/autoopts.c
+++ b/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.39 2009/01/25 19:31:59 bkorb Exp $
+ *  $Id: autoopts.c,v 4.44 2009/01/25 19:31:56 bkorb Exp $
  *  Time-stamp:      "2009-01-12 02:49:49 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/libopts/autoopts.h b/libopts/autoopts.h
index c4d5b9874..38edd3e9f 100644
--- a/libopts/autoopts.h
+++ b/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2008-11-01 20:08:06 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.30 2009/01/01 16:51:47 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.41 2009/01/01 16:49:26 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
diff --git a/libopts/autoopts/options.h b/libopts/autoopts/options.h
index 453f80039..4aad8f118 100644
--- a/libopts/autoopts/options.h
+++ b/libopts/autoopts/options.h
@@ -2,14 +2,14 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:34 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
  *
- *  Automated Options copyright 1992-Y Bruce Korb
+ *  Automated Options copyright (c) 1992-Y by Bruce Korb
  *
  *  AutoOpts is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU Lesser General Public License as published
diff --git a/libopts/autoopts/usage-txt.h b/libopts/autoopts/usage-txt.h
index eef1ff0c2..83081d5f5 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  Monday July 20, 2009 at 09:05:13 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:33 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 300433ae1..5f9446912 100644
--- a/libopts/boolean.c
+++ b/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.16 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: boolean.c,v 4.15 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-08-03 13:06:02 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/compat/compat.h b/libopts/compat/compat.h
index 5c73ae8e4..27c1eb45f 100644
--- a/libopts/compat/compat.h
+++ b/libopts/compat/compat.h
@@ -4,7 +4,7 @@
  *
  *  Time-stamp:      "2008-06-14 09:36:25 bkorb"
  *
- * $Id: compat.h,v 4.21 2009/01/01 16:51:52 bkorb Exp $
+ * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/libopts/compat/pathfind.c b/libopts/compat/pathfind.c
index 480674dda..d87bada3a 100644
--- a/libopts/compat/pathfind.c
+++ b/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Time-stamp:       "2006-09-23 19:46:16 bkorb"
- * Last Modified:    $Date: 2007/07/04 20:51:18 $
+ * Last Modified:    $Date: 2007/10/07 16:54:54 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
+ * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $
  */
 
 /* Code: */
diff --git a/libopts/compat/windows-config.h b/libopts/compat/windows-config.h
index 4aa58d3e3..1594f28ca 100644
--- a/libopts/compat/windows-config.h
+++ b/libopts/compat/windows-config.h
@@ -1,12 +1,12 @@
 
 /*
- * Time-stamp:        "2007-07-04 09:45:44 bkorb"
+ * Time-stamp:        "2009-07-22 18:53:59 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2007/07/04 20:51:18 $
+ * Last Committed:    $Date: 2009/07/23 02:05:55 $
  *
  *  This file is part of AutoGen.
  *
- *  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+ *  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved
  *
  *  AutoGen is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
diff --git a/libopts/configfile.c b/libopts/configfile.c
index 8137fae55..92b59860c 100644
--- a/libopts/configfile.c
+++ b/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 1.35 2009/01/18 22:48:51 bkorb Exp $
+ *  $Id: configfile.c,v 4.46 2009/01/18 22:48:51 bkorb Exp $
  *  Time-stamp:      "2009-01-18 10:21:58 bkorb"
  *
  *  configuration/rc/ini file handling.
diff --git a/libopts/cook.c b/libopts/cook.c
index dc44233cb..3a66751ba 100644
--- a/libopts/cook.c
+++ b/libopts/cook.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cook.c,v 4.17 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: cook.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2007-11-16 22:49:11 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
diff --git a/libopts/enumeration.c b/libopts/enumeration.c
index ca219eb6b..6c5bad05a 100644
--- a/libopts/enumeration.c
+++ b/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.25 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: enumeration.c,v 4.25 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:28:01 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/environment.c b/libopts/environment.c
index b2765ae9b..037140419 100644
--- a/libopts/environment.c
+++ b/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.20 2009/07/21 03:23:12 bkorb Exp $
+ *  $Id: environment.c,v 4.20 2009/07/21 03:21:57 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:12:24 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/libopts/file.c b/libopts/file.c
index 4e198fc01..287119a3d 100644
--- a/libopts/file.c
+++ b/libopts/file.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: file.c,v 1.7 2009/01/01 16:51:47 bkorb Exp $
- *  Time-stamp:      "2008-12-06 10:15:33 bkorb"
+ *  $Id: file.c,v 4.7 2009/01/01 16:49:26 bkorb Exp $
+ *  Time-stamp:      "2009-07-23 17:23:46 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -97,7 +97,8 @@ optionFileCheck(tOptions* pOpts, tOptDesc* pOD,
                 pOpts->pUsageProc(pOpts, EXIT_FAILURE);
                 /* NOTREACHED */
             }
-            *p = '/';
+            if (p != NULL)
+                *p = DIRCH;
             break;
         }
 
diff --git a/libopts/genshell.c b/libopts/genshell.c
index ce8771805..54dddb06a 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  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/libopts/genshell.h b/libopts/genshell.h
index 7809702d4..d075431b0 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  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
diff --git a/libopts/load.c b/libopts/load.c
index 77302db43..2d8d8b074 100644
--- a/libopts/load.c
+++ b/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.28 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: load.c,v 4.37 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-12-06 10:16:05 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 ddb16e3c2..8124af147 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  Monday July 20, 2009 at 09:05:16 PM PDT
+dnl It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:36 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -443,8 +443,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 dnl @synopsis  LIBOPTS_CHECK
 dnl
-dnl Time-stamp:        "2007-07-04 11:41:40 bkorb"
-dnl Last Committed:    $Date: 2007/07/04 20:51:20 $
+dnl Time-stamp:        "2009-07-22 18:50:49 bkorb"
+dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
@@ -452,7 +452,7 @@ dnl the config tests that the library needs.  Invoke the
 dnl "INVOKE_LIBOPTS_MACROS" macro iff we are building libopts.
 dnl
 dnl  This file is part of AutoGen.
-dnl  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+dnl  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved
 dnl
 dnl  AutoGen is free software: you can redistribute it and/or modify it
 dnl  under the terms of the GNU General Public License as published by the
diff --git a/libopts/m4/liboptschk.m4 b/libopts/m4/liboptschk.m4
index 6c64cde44..a2df33c93 100644
--- a/libopts/m4/liboptschk.m4
+++ b/libopts/m4/liboptschk.m4
@@ -1,11 +1,12 @@
 # liboptschk.m4 serial 1 (autogen - 5.7.3)
-dnl copyright (c) 2005 by Bruce Korb - all rights reserved
+dnl copyright (c) 2005-2009 by Bruce Korb - all rights reserved
+dnl
 dnl This file is free software; the Free Software Foundation
 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: 2007/07/04 20:51:18 $
+dnl Time-stamp:        "2009-07-22 18:53:27 bkorb"
+dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
 
 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 6f2f3c927..dc7627d9a 100644
--- a/libopts/makeshell.c
+++ b/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.28 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: makeshell.c,v 4.29 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-26 16:10:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/libopts/nested.c b/libopts/nested.c
index 9d2c0440b..400335734 100644
--- a/libopts/nested.c
+++ b/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.27 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: nested.c,v 4.31 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-07-28 19:18:28 bkorb"
  *
  *   Automated Options Nested Values module.
diff --git a/libopts/numeric.c b/libopts/numeric.c
index fa94034fa..e336ba151 100644
--- a/libopts/numeric.c
+++ b/libopts/numeric.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: numeric.c,v 4.21 2009/01/17 22:08:07 bkorb Exp $
- *  Time-stamp:      "2009-01-11 18:05:28 bkorb"
+ *  $Id: numeric.c,v 4.20 2009/01/17 22:08:09 bkorb Exp $
+ *  Time-stamp:      "2009-07-23 17:25:39 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -115,15 +115,15 @@ optionNumericVal(tOptions* pOpts, tOptDesc* pOD )
     char* pz;
     long  val;
 
-    if ((pOD->fOptState & OPTST_RESET) != 0)
-        return;
-
     /*
      *  Numeric options may have a range associated with it.
      *  If it does, the usage procedure requests that it be
-     *  emitted by passing a NULL pOD pointer.
+     *  emitted by passing a NULL pOD pointer.  Also bail out
+     *  if there is no option argument or if we are being reset.
      */
-    if ((pOD == NULL) || (pOD->optArg.argString == NULL))
+    if (  (pOD == NULL)
+       || (pOD->optArg.argString == NULL)
+       || ((pOD->fOptState & OPTST_RESET) != 0))
         return;
 
     errno = 0;
@@ -158,7 +158,8 @@ optionNumericVal(tOptions* pOpts, tOptDesc* pOD )
     pOD->optArg.argInt = val;
     return;
 
-bad_number:
+    bad_number:
+
     fprintf( stderr, zNotNumber, pOpts->pzProgName, pOD->optArg.argString );
     if ((pOpts->fOptSet & OPTPROC_ERRSTOP) != 0)
         (*(pOpts->pUsageProc))(pOpts, EXIT_FAILURE);
diff --git a/libopts/pgusage.c b/libopts/pgusage.c
index 22c5d9b83..5f103cdd3 100644
--- a/libopts/pgusage.c
+++ b/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.17 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: pgusage.c,v 4.17 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 21:08:42 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/libopts/proto.h b/libopts/proto.h
index 3b70d359a..af35d1808 100644
--- a/libopts/proto.h
+++ b/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Mon Jul 20 21:05:15 PDT 2009
+ * Generated Thu Jul 23 17:36:35 PDT 2009
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/libopts/putshell.c b/libopts/putshell.c
index 2fd54ad34..9aeaacd52 100644
--- a/libopts/putshell.c
+++ b/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.26 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: putshell.c,v 4.26 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:14:38 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/libopts/reset.c b/libopts/reset.c
index 1796ee73f..d23786349 100644
--- a/libopts/reset.c
+++ b/libopts/reset.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: reset.c,v 4.3 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: reset.c,v 4.6 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-08-02 12:25:18 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
diff --git a/libopts/restore.c b/libopts/restore.c
index 9e7b6a089..2481a02ff 100644
--- a/libopts/restore.c
+++ b/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.14 2009/01/01 16:51:49 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.13 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:40 bkorb"
  *
  *  This module's routines will save the current option state to memory
diff --git a/libopts/save.c b/libopts/save.c
index 290c81765..3b49b69ca 100644
--- a/libopts/save.c
+++ b/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.31 2009/07/21 04:01:29 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.35 2009/07/21 04:01:30 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:40:28 bkorb"
  *
  *  This module's routines will take the currently set options and
diff --git a/libopts/sort.c b/libopts/sort.c
index 3c1ecec8f..4294382f8 100644
--- a/libopts/sort.c
+++ b/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.15 2009/01/01 16:51:49 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
diff --git a/libopts/stack.c b/libopts/stack.c
index d019b3352..10cf18a49 100644
--- a/libopts/stack.c
+++ b/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.18 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: stack.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-07-30 16:56:32 bkorb"
  *
  *  This is a special option processing routine that will save the
diff --git a/libopts/streqvcmp.c b/libopts/streqvcmp.c
index e3dbcfad5..b5971d845 100644
--- a/libopts/streqvcmp.c
+++ b/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.15 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-12-26 10:15:46 bkorb"
  *
  *  String Equivalence Comparison
diff --git a/libopts/text_mmap.c b/libopts/text_mmap.c
index 304e5f776..566644132 100644
--- a/libopts/text_mmap.c
+++ b/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.19 2009/01/01 16:51:49 bkorb Exp $
+ * $Id: text_mmap.c,v 4.20 2009/01/01 16:49:26 bkorb Exp $
  *
  * Time-stamp:      "2007-07-04 11:35:49 bkorb"
  *
diff --git a/libopts/time.c b/libopts/time.c
index 28572d3a1..484fc27e9 100644
--- a/libopts/time.c
+++ b/libopts/time.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: time.c,v 4.3 2009/01/01 16:51:50 bkorb Exp $
+ *  $Id: time.c,v 4.4 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-11-16 14:51:48 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
diff --git a/libopts/usage.c b/libopts/usage.c
index cdedfe0e7..bd64a5949 100644
--- a/libopts/usage.c
+++ b/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.30 2009/01/17 22:08:07 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.29 2009/01/17 22:08:09 bkorb Exp $
  * Time-stamp:      "2009-01-17 13:18:23 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/libopts/value-type.h b/libopts/value-type.h
index 4c1747141..45a36048e 100644
--- a/libopts/value-type.h
+++ b/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009
+ *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/libopts/version.c b/libopts/version.c
index 328a4fa72..a091da51c 100644
--- a/libopts/version.c
+++ b/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.16 2009/01/01 16:51:50 bkorb Exp $
+/*  $Id: version.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/libopts/xat-attribute.h b/libopts/xat-attribute.h
index 0a82a6b18..e081b54f6 100644
--- a/libopts/xat-attribute.h
+++ b/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009
+ *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/sntp/libopts/README b/sntp/libopts/README
index 7cbe0b044..03c529d74 100644
--- a/sntp/libopts/README
+++ b/sntp/libopts/README
@@ -85,7 +85,7 @@ will need to hand craft the rules for building the library.
 
 LICENSING:
 
-This material is copyright 1993-2007 by Bruce Korb.
+This material is copyright (c) 1993-2009 by Bruce Korb.
 You are licensed to use this under the terms of either
 the GNU Lesser General Public License (see: COPYING.lgpl), or,
 at your option, the modified Berkeley Software Distribution
diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h
index 6309da4bf..dcdd8b7d7 100644
--- a/sntp/libopts/ag-char-map.h
+++ b/sntp/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 07/20/09 21:05:27
+ *   Character mapping generated 07/23/09 17:36:47
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
diff --git a/sntp/libopts/autoopts.c b/sntp/libopts/autoopts.c
index a6cb4bc19..9fcc95adf 100644
--- a/sntp/libopts/autoopts.c
+++ b/sntp/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.39 2009/01/25 19:31:59 bkorb Exp $
+ *  $Id: autoopts.c,v 4.44 2009/01/25 19:31:56 bkorb Exp $
  *  Time-stamp:      "2009-01-12 02:49:49 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 c4d5b9874..38edd3e9f 100644
--- a/sntp/libopts/autoopts.h
+++ b/sntp/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2008-11-01 20:08:06 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.30 2009/01/01 16:51:47 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.41 2009/01/01 16:49:26 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h
index 453f80039..4aad8f118 100644
--- a/sntp/libopts/autoopts/options.h
+++ b/sntp/libopts/autoopts/options.h
@@ -2,14 +2,14 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:34 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
  *
- *  Automated Options copyright 1992-Y Bruce Korb
+ *  Automated Options copyright (c) 1992-Y by Bruce Korb
  *
  *  AutoOpts is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU Lesser General Public License as published
diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h
index eef1ff0c2..83081d5f5 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  Monday July 20, 2009 at 09:05:13 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:33 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 300433ae1..5f9446912 100644
--- a/sntp/libopts/boolean.c
+++ b/sntp/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.16 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: boolean.c,v 4.15 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-08-03 13:06:02 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/sntp/libopts/compat/compat.h b/sntp/libopts/compat/compat.h
index 5c73ae8e4..27c1eb45f 100644
--- a/sntp/libopts/compat/compat.h
+++ b/sntp/libopts/compat/compat.h
@@ -4,7 +4,7 @@
  *
  *  Time-stamp:      "2008-06-14 09:36:25 bkorb"
  *
- * $Id: compat.h,v 4.21 2009/01/01 16:51:52 bkorb Exp $
+ * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/sntp/libopts/compat/pathfind.c b/sntp/libopts/compat/pathfind.c
index 480674dda..d87bada3a 100644
--- a/sntp/libopts/compat/pathfind.c
+++ b/sntp/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Time-stamp:       "2006-09-23 19:46:16 bkorb"
- * Last Modified:    $Date: 2007/07/04 20:51:18 $
+ * Last Modified:    $Date: 2007/10/07 16:54:54 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
+ * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $
  */
 
 /* Code: */
diff --git a/sntp/libopts/compat/windows-config.h b/sntp/libopts/compat/windows-config.h
index 4aa58d3e3..1594f28ca 100644
--- a/sntp/libopts/compat/windows-config.h
+++ b/sntp/libopts/compat/windows-config.h
@@ -1,12 +1,12 @@
 
 /*
- * Time-stamp:        "2007-07-04 09:45:44 bkorb"
+ * Time-stamp:        "2009-07-22 18:53:59 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2007/07/04 20:51:18 $
+ * Last Committed:    $Date: 2009/07/23 02:05:55 $
  *
  *  This file is part of AutoGen.
  *
- *  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+ *  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved
  *
  *  AutoGen is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
diff --git a/sntp/libopts/configfile.c b/sntp/libopts/configfile.c
index 8137fae55..92b59860c 100644
--- a/sntp/libopts/configfile.c
+++ b/sntp/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 1.35 2009/01/18 22:48:51 bkorb Exp $
+ *  $Id: configfile.c,v 4.46 2009/01/18 22:48:51 bkorb Exp $
  *  Time-stamp:      "2009-01-18 10:21:58 bkorb"
  *
  *  configuration/rc/ini file handling.
diff --git a/sntp/libopts/cook.c b/sntp/libopts/cook.c
index dc44233cb..3a66751ba 100644
--- a/sntp/libopts/cook.c
+++ b/sntp/libopts/cook.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cook.c,v 4.17 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: cook.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2007-11-16 22:49:11 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 ca219eb6b..6c5bad05a 100644
--- a/sntp/libopts/enumeration.c
+++ b/sntp/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.25 2009/01/01 16:51:47 bkorb Exp $
+ *  $Id: enumeration.c,v 4.25 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:28:01 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/sntp/libopts/environment.c b/sntp/libopts/environment.c
index b2765ae9b..037140419 100644
--- a/sntp/libopts/environment.c
+++ b/sntp/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.20 2009/07/21 03:23:12 bkorb Exp $
+ *  $Id: environment.c,v 4.20 2009/07/21 03:21:57 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:12:24 bkorb"
  *
  *  This file contains all of the routines that must be linked into
diff --git a/sntp/libopts/file.c b/sntp/libopts/file.c
index 4e198fc01..287119a3d 100644
--- a/sntp/libopts/file.c
+++ b/sntp/libopts/file.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: file.c,v 1.7 2009/01/01 16:51:47 bkorb Exp $
- *  Time-stamp:      "2008-12-06 10:15:33 bkorb"
+ *  $Id: file.c,v 4.7 2009/01/01 16:49:26 bkorb Exp $
+ *  Time-stamp:      "2009-07-23 17:23:46 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -97,7 +97,8 @@ optionFileCheck(tOptions* pOpts, tOptDesc* pOD,
                 pOpts->pUsageProc(pOpts, EXIT_FAILURE);
                 /* NOTREACHED */
             }
-            *p = '/';
+            if (p != NULL)
+                *p = DIRCH;
             break;
         }
 
diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index ce8771805..54dddb06a 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  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 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 7809702d4..d075431b0 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  Monday July 20, 2009 at 09:05:14 PM PDT
+ *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 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 77302db43..2d8d8b074 100644
--- a/sntp/libopts/load.c
+++ b/sntp/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.28 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: load.c,v 4.37 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-12-06 10:16:05 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 ddb16e3c2..8124af147 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  Monday July 20, 2009 at 09:05:16 PM PDT
+dnl It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:36 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -443,8 +443,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 dnl @synopsis  LIBOPTS_CHECK
 dnl
-dnl Time-stamp:        "2007-07-04 11:41:40 bkorb"
-dnl Last Committed:    $Date: 2007/07/04 20:51:20 $
+dnl Time-stamp:        "2009-07-22 18:50:49 bkorb"
+dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
@@ -452,7 +452,7 @@ dnl the config tests that the library needs.  Invoke the
 dnl "INVOKE_LIBOPTS_MACROS" macro iff we are building libopts.
 dnl
 dnl  This file is part of AutoGen.
-dnl  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+dnl  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved
 dnl
 dnl  AutoGen is free software: you can redistribute it and/or modify it
 dnl  under the terms of the GNU General Public License as published by the
diff --git a/sntp/libopts/m4/liboptschk.m4 b/sntp/libopts/m4/liboptschk.m4
index 6c64cde44..a2df33c93 100644
--- a/sntp/libopts/m4/liboptschk.m4
+++ b/sntp/libopts/m4/liboptschk.m4
@@ -1,11 +1,12 @@
 # liboptschk.m4 serial 1 (autogen - 5.7.3)
-dnl copyright (c) 2005 by Bruce Korb - all rights reserved
+dnl copyright (c) 2005-2009 by Bruce Korb - all rights reserved
+dnl
 dnl This file is free software; the Free Software Foundation
 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: 2007/07/04 20:51:18 $
+dnl Time-stamp:        "2009-07-22 18:53:27 bkorb"
+dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
 
 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 6f2f3c927..dc7627d9a 100644
--- a/sntp/libopts/makeshell.c
+++ b/sntp/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.28 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: makeshell.c,v 4.29 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-26 16:10:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/sntp/libopts/nested.c b/sntp/libopts/nested.c
index 9d2c0440b..400335734 100644
--- a/sntp/libopts/nested.c
+++ b/sntp/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.27 2009/01/01 16:51:48 bkorb Exp $
+ *  $Id: nested.c,v 4.31 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-07-28 19:18:28 bkorb"
  *
  *   Automated Options Nested Values module.
diff --git a/sntp/libopts/numeric.c b/sntp/libopts/numeric.c
index fa94034fa..e336ba151 100644
--- a/sntp/libopts/numeric.c
+++ b/sntp/libopts/numeric.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: numeric.c,v 4.21 2009/01/17 22:08:07 bkorb Exp $
- *  Time-stamp:      "2009-01-11 18:05:28 bkorb"
+ *  $Id: numeric.c,v 4.20 2009/01/17 22:08:09 bkorb Exp $
+ *  Time-stamp:      "2009-07-23 17:25:39 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -115,15 +115,15 @@ optionNumericVal(tOptions* pOpts, tOptDesc* pOD )
     char* pz;
     long  val;
 
-    if ((pOD->fOptState & OPTST_RESET) != 0)
-        return;
-
     /*
      *  Numeric options may have a range associated with it.
      *  If it does, the usage procedure requests that it be
-     *  emitted by passing a NULL pOD pointer.
+     *  emitted by passing a NULL pOD pointer.  Also bail out
+     *  if there is no option argument or if we are being reset.
      */
-    if ((pOD == NULL) || (pOD->optArg.argString == NULL))
+    if (  (pOD == NULL)
+       || (pOD->optArg.argString == NULL)
+       || ((pOD->fOptState & OPTST_RESET) != 0))
         return;
 
     errno = 0;
@@ -158,7 +158,8 @@ optionNumericVal(tOptions* pOpts, tOptDesc* pOD )
     pOD->optArg.argInt = val;
     return;
 
-bad_number:
+    bad_number:
+
     fprintf( stderr, zNotNumber, pOpts->pzProgName, pOD->optArg.argString );
     if ((pOpts->fOptSet & OPTPROC_ERRSTOP) != 0)
         (*(pOpts->pUsageProc))(pOpts, EXIT_FAILURE);
diff --git a/sntp/libopts/pgusage.c b/sntp/libopts/pgusage.c
index 22c5d9b83..5f103cdd3 100644
--- a/sntp/libopts/pgusage.c
+++ b/sntp/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.17 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: pgusage.c,v 4.17 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 21:08:42 bkorb"
  *
  *   Automated Options Paged Usage module.
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index 3b70d359a..af35d1808 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 Mon Jul 20 21:05:15 PDT 2009
+ * Generated Thu Jul 23 17:36:35 PDT 2009
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/sntp/libopts/putshell.c b/sntp/libopts/putshell.c
index 2fd54ad34..9aeaacd52 100644
--- a/sntp/libopts/putshell.c
+++ b/sntp/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.26 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: putshell.c,v 4.26 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:14:38 bkorb"
  *
  *  This module will interpret the options set in the tOptions
diff --git a/sntp/libopts/reset.c b/sntp/libopts/reset.c
index 1796ee73f..d23786349 100644
--- a/sntp/libopts/reset.c
+++ b/sntp/libopts/reset.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: reset.c,v 4.3 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: reset.c,v 4.6 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-08-02 12:25:18 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
diff --git a/sntp/libopts/restore.c b/sntp/libopts/restore.c
index 9e7b6a089..2481a02ff 100644
--- a/sntp/libopts/restore.c
+++ b/sntp/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.14 2009/01/01 16:51:49 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.13 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:40 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 290c81765..3b49b69ca 100644
--- a/sntp/libopts/save.c
+++ b/sntp/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.31 2009/07/21 04:01:29 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.35 2009/07/21 04:01:30 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:40:28 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 3c1ecec8f..4294382f8 100644
--- a/sntp/libopts/sort.c
+++ b/sntp/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.15 2009/01/01 16:51:49 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
diff --git a/sntp/libopts/stack.c b/sntp/libopts/stack.c
index d019b3352..10cf18a49 100644
--- a/sntp/libopts/stack.c
+++ b/sntp/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.18 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: stack.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-07-30 16:56:32 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 e3dbcfad5..b5971d845 100644
--- a/sntp/libopts/streqvcmp.c
+++ b/sntp/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.15 2009/01/01 16:51:49 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-12-26 10:15:46 bkorb"
  *
  *  String Equivalence Comparison
diff --git a/sntp/libopts/text_mmap.c b/sntp/libopts/text_mmap.c
index 304e5f776..566644132 100644
--- a/sntp/libopts/text_mmap.c
+++ b/sntp/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.19 2009/01/01 16:51:49 bkorb Exp $
+ * $Id: text_mmap.c,v 4.20 2009/01/01 16:49:26 bkorb Exp $
  *
  * Time-stamp:      "2007-07-04 11:35:49 bkorb"
  *
diff --git a/sntp/libopts/time.c b/sntp/libopts/time.c
index 28572d3a1..484fc27e9 100644
--- a/sntp/libopts/time.c
+++ b/sntp/libopts/time.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: time.c,v 4.3 2009/01/01 16:51:50 bkorb Exp $
+ *  $Id: time.c,v 4.4 2009/01/01 16:49:26 bkorb Exp $
  *  Time-stamp:      "2008-11-16 14:51:48 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
diff --git a/sntp/libopts/usage.c b/sntp/libopts/usage.c
index cdedfe0e7..bd64a5949 100644
--- a/sntp/libopts/usage.c
+++ b/sntp/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.30 2009/01/17 22:08:07 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.29 2009/01/17 22:08:09 bkorb Exp $
  * Time-stamp:      "2009-01-17 13:18:23 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/sntp/libopts/value-type.h b/sntp/libopts/value-type.h
index 4c1747141..45a36048e 100644
--- a/sntp/libopts/value-type.h
+++ b/sntp/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009
+ *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/sntp/libopts/version.c b/sntp/libopts/version.c
index 328a4fa72..a091da51c 100644
--- a/sntp/libopts/version.c
+++ b/sntp/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.16 2009/01/01 16:51:50 bkorb Exp $
+/*  $Id: version.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
  *
  *  This module implements the default usage procedure for
diff --git a/sntp/libopts/xat-attribute.h b/sntp/libopts/xat-attribute.h
index 0a82a6b18..e081b54f6 100644
--- a/sntp/libopts/xat-attribute.h
+++ b/sntp/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009
+ *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */