Merge upstream version 3.2.0

Makefile.in

@@ -40,7 +40,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	config/depcomp config/install-sh config/ltmain.sh \
 	config/missing config/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

aclocal.m4

@@ -7917,7 +7917,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:59:00 $
+dnl Last Committed:    $Date: 2007-07-19 09:08:39 -0700 (Thu, 19 Jul 2007) $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
@@ -8010,7 +8010,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:59:00 $
+dnl Last Committed:    $Date: 2007-07-19 09:08:39 -0700 (Thu, 19 Jul 2007) $
 
 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

configure

@@ -1520,7 +1520,7 @@ Optional Features:
   --enable-pedantic       Enable gcc's -pedantic option
   --enable-efence         Enable Electric Fence memory debugger
   --enable-gprof          Enable GNU Profiler
-  --enable-64bits         Use 64bit packet counters
+  --disable-64bits        Do not use 64bit packet counters
   --enable-force-bpf      Force using BPF for sending packets
   --enable-force-pf       Force using Linux's PF_PACKET for sending packets
   --enable-force-libnet   Force using libnet for sending packets
@@ -2081,8 +2081,8 @@ fi
 
 
 MAJOR_VERSION=3
-MINOR_VERSION=1
-MICRO_VERSION=1
+MINOR_VERSION=2
+MICRO_VERSION=0
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 TCPREPLAY_RELEASE=1
@@ -25124,10 +25124,15 @@ _ACEOF
 fi
 
 
-use64bit_counters=no
+use64bit_counters=yes
 # Check whether --enable-64bits was given.
 if test "${enable_64bits+set}" = set; then
-  enableval=$enable_64bits;  if test x$enableval = xyes; then
+  enableval=$enable_64bits;
+         { echo "$as_me:$LINENO: Using u_int32_t for packet counters" >&5
+echo "$as_me: Using u_int32_t for packet counters" >&6;}
+
+else
+
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_64BITS 1
@@ -25135,11 +25140,6 @@ _ACEOF
 
          { echo "$as_me:$LINENO: Using u_int64_t for packet counters" >&5
 echo "$as_me: Using u_int64_t for packet counters" >&6;}
-         use64bit_counters=yes
-      else
-         { echo "$as_me:$LINENO: Using u_int32_t for packet counters" >&5
-echo "$as_me: Using u_int32_t for packet counters" >&6;}
-      fi
 
 fi
 
@@ -27202,7 +27202,7 @@ tcpdump_path=no
 # Check whether --with-tcpdump was given.
 if test "${with_tcpdump+set}" = set; then
   withval=$with_tcpdump;  if test -x $withval ; then
-          td=$withval
+          tcpdump_path=$withval
           { echo "$as_me:$LINENO: result: Using tcpdump in $tcpdump_path" >&5
 echo "${ECHO_T}Using tcpdump in $tcpdump_path" >&6; }
       else
@@ -27402,6 +27402,16 @@ else
 echo "${ECHO_T}no" >&6; }
 fi
 
+case "${enable_local_libopts+set}" in
+ set) ;;
+ *) enable_local_libopts=yes ;;
+esac
+
+case "${enable_libopts_install+set}" in
+ set) ;;
+ *) enable_libopts_install=no ;;
+esac
+
 
   NEED_LIBOPTS_DIR=''
 

configure.in

@@ -1,5 +1,5 @@
 
-dnl $Id: configure.in 1886 2007-07-19 16:09:41Z aturner $
+dnl $Id: configure.ac 1892 2007-08-10 03:45:29Z aturner $
 
 AC_INIT(tcpreplay)
 AC_CONFIG_SRCDIR(src/tcpreplay.c)
@@ -10,8 +10,8 @@ AM_WITH_DMALLOC
 
 dnl Set version info here!
 MAJOR_VERSION=3
-MINOR_VERSION=1
-MICRO_VERSION=1
+MINOR_VERSION=2
+MICRO_VERSION=0
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 dnl Release is only used for the RPM spec file
@@ -212,16 +212,15 @@ AC_ARG_ENABLE(gprof,
       fi])
 
 dnl Use 64bits for packet counters
-use64bit_counters=no
+use64bit_counters=yes
 AC_ARG_ENABLE(64bits,
-    AC_HELP_STRING([--enable-64bits], [Use 64bit packet counters]),
-    [ if test x$enableval = xyes; then
+    AC_HELP_STRING([--disable-64bits], [Do not use 64bit packet counters]),
+    [ 
+         AC_MSG_NOTICE([Using u_int32_t for packet counters])
+    ],
+    [
          AC_DEFINE([ENABLE_64BITS], [1], [Use 64bit packet counters])
          AC_MSG_NOTICE([Using u_int64_t for packet counters])
-         use64bit_counters=yes
-      else
-         AC_MSG_NOTICE([Using u_int32_t for packet counters])
-      fi
     ])
 
 
@@ -1003,7 +1002,7 @@ tcpdump_path=no
 AC_ARG_WITH(tcpdump,
     AC_HELP_STRING([--with-tcpdump=FILE], [Path to tcpdump binary]),
     [ if test -x $withval ; then
-          td=$withval
+          tcpdump_path=$withval
           AC_MSG_RESULT([Using tcpdump in $tcpdump_path])
       else
           AC_MSG_RESULT([Error: $withval does not exist or is not executable])
@@ -1114,7 +1113,22 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-LIBOPTS_CHECK
+dnl tcpreplay has (so far) been relying on leading-edge autogen.
+dnl Therefore, by default:
+dnl - use the version we ship with
+dnl - do not install it
+dnl - build a static copy (AC_DISABLE_SHARED - implicitly done earlier)
+case "${enable_local_libopts+set}" in
+ set) ;;
+ *) enable_local_libopts=yes ;;
+esac
+
+case "${enable_libopts_install+set}" in
+ set) ;;
+ *) enable_libopts_install=no ;;
+esac
+
+LIBOPTS_CHECK(libopts)
 
 
 AC_OUTPUT([Makefile

docs/CHANGELOG

@@ -1,4 +1,16 @@
-$Id: CHANGELOG 1886 2007-07-19 16:09:41Z aturner $
+$Id: CHANGELOG 1901 2007-08-26 20:05:14Z aturner $
+
+08/26/2007: Version 3.2
+    - Return a more useful error message when tcpprep fails (#187)
+    - Add Tomahawk test tool client/server detection algorithm (#186)
+    - Improved AutoGen support (#191)
+    - Improved documentation (#164, #198)
+    - Added Doxygen markup (#176)
+    - configure now honors --with-tcpdump flag (#192)
+    - configure now defaults to --enable-64bits which breaks backwards 
+        compatibility in certain situations.  Use --disable-64bits if this
+        concerns you (#195)
+    - Use safe_free() to detect bugs earlier in development (#197)
 
 07/19/2007: Version 3.1.1
     - Upgrade libopts tearoff to 29:0:4 so that everyone else in the world can

docs/Makefile.in

@@ -35,7 +35,7 @@ target_triplet = @target@
 subdir = docs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in INSTALL TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

lib/Makefile.in

@@ -38,7 +38,7 @@ subdir = lib
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

libopts/COPYING.gplv3

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ copyright (c) 2007 by Bruce Korb - all rights reserved
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    copyright (c)  by Bruce Korb - all rights reserved
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  copyright (c)  by Bruce Korb - all rights reserved
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

libopts/COPYING.lgpl

@@ -1,502 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-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
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

libopts/COPYING.lgplv3

@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ copyright (c) 2007 by Bruce Korb - all rights reserved
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

libopts/Makefile.am

@@ -7,20 +7,19 @@ noinst_LTLIBRARIES      = libopts.la
 endif
 libopts_la_SOURCES      = libopts.c
 libopts_la_CPPFLAGS     = -I$(top_srcdir)
-libopts_la_LDFLAGS      = -version-info  29:0:4
+libopts_la_LDFLAGS      = -version-info  30:0:5
 EXTRA_DIST              = \
-    COPYING.lgpl            COPYING.mbsd            MakeDefs.inc  \
-    README                  autoopts/options.h      autoopts/usage-txt.h  \
-    autoopts.c              autoopts.h              boolean.c  \
-    compat/compat.h         compat/pathfind.c       compat/snprintf.c  \
-    compat/strchr.c         compat/strdup.c         compat/windows-config.h  \
-    configfile.c            cook.c                  enumeration.c  \
-    environment.c           genshell.c              genshell.h  \
-    load.c                  m4/libopts.m4           m4/liboptschk.m4  \
-    makeshell.c             nested.c                numeric.c  \
-    pgusage.c               proto.h                 putshell.c  \
-    restore.c               save.c                  sort.c  \
-    stack.c                 streqvcmp.c             text_mmap.c  \
-    tokenize.c              usage.c                 version.c \
-    snprintf.c              strchr.c                pathfind.c \
-    windows-config.h        strdup.c                compat.h
+    COPYING.gplv3           COPYING.lgplv3          COPYING.mbsd  \
+    MakeDefs.inc            README                  autoopts/options.h  \
+    autoopts/usage-txt.h    autoopts.c              autoopts.h  \
+    boolean.c               compat/compat.h         compat/pathfind.c  \
+    compat/snprintf.c       compat/strchr.c         compat/strdup.c  \
+    compat/windows-config.h configfile.c            cook.c  \
+    enumeration.c           environment.c           genshell.c  \
+    genshell.h              load.c                  m4/libopts.m4  \
+    m4/liboptschk.m4        makeshell.c             nested.c  \
+    numeric.c               pgusage.c               proto.h  \
+    putshell.c              restore.c               save.c  \
+    sort.c                  stack.c                 streqvcmp.c  \
+    text_mmap.c             tokenize.c              usage.c  \
+    version.c

libopts/Makefile.in

@@ -36,7 +36,7 @@ target_triplet = @target@
 subdir = libopts
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -211,23 +211,22 @@ MAINTAINERCLEANFILES = Makefile.in
 @INSTALL_LIBOPTS_FALSE@noinst_LTLIBRARIES = libopts.la
 libopts_la_SOURCES = libopts.c
 libopts_la_CPPFLAGS = -I$(top_srcdir)
-libopts_la_LDFLAGS = -version-info  29:0:4
+libopts_la_LDFLAGS = -version-info  30:0:5
 EXTRA_DIST = \
-    COPYING.lgpl            COPYING.mbsd            MakeDefs.inc  \
-    README                  autoopts/options.h      autoopts/usage-txt.h  \
-    autoopts.c              autoopts.h              boolean.c  \
-    compat/compat.h         compat/pathfind.c       compat/snprintf.c  \
-    compat/strchr.c         compat/strdup.c         compat/windows-config.h  \
-    configfile.c            cook.c                  enumeration.c  \
-    environment.c           genshell.c              genshell.h  \
-    load.c                  m4/libopts.m4           m4/liboptschk.m4  \
-    makeshell.c             nested.c                numeric.c  \
-    pgusage.c               proto.h                 putshell.c  \
-    restore.c               save.c                  sort.c  \
-    stack.c                 streqvcmp.c             text_mmap.c  \
-    tokenize.c              usage.c                 version.c \
-    snprintf.c              strchr.c                pathfind.c \
-    windows-config.h        strdup.c                compat.h
+    COPYING.gplv3           COPYING.lgplv3          COPYING.mbsd  \
+    MakeDefs.inc            README                  autoopts/options.h  \
+    autoopts/usage-txt.h    autoopts.c              autoopts.h  \
+    boolean.c               compat/compat.h         compat/pathfind.c  \
+    compat/snprintf.c       compat/strchr.c         compat/strdup.c  \
+    compat/windows-config.h configfile.c            cook.c  \
+    enumeration.c           environment.c           genshell.c  \
+    genshell.h              load.c                  m4/libopts.m4  \
+    m4/liboptschk.m4        makeshell.c             nested.c  \
+    numeric.c               pgusage.c               proto.h  \
+    putshell.c              restore.c               save.c  \
+    sort.c                  stack.c                 streqvcmp.c  \
+    text_mmap.c             tokenize.c              usage.c  \
+    version.c
 
 all: all-am
 

libopts/autoopts.c

@@ -1,55 +1,32 @@
 
 /*
- *  $Id: autoopts.c,v 4.25 2007/04/15 19:01:18 bkorb Exp $
- *  Time-stamp:      "2007-04-15 11:10:40 bkorb"
+ *  $Id: autoopts.c,v 4.27 2007/07/04 21:36:36 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 14:33:39 bkorb"
  *
  *  This file contains all of the routines that must be linked into
  *  an executable to use the generated option processing.  The optional
  *  routines are in separately compiled modules so that they will not
  *  necessarily be linked in.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 static char const zNil[] = "";
@@ -111,7 +88,7 @@ ao_strdup( char const *str )
 {
     char * res = strdup(str);
     if (res == NULL) {
-        fprintf( stderr, "strdup of %d byte string failed\n", (int)strlen(str) );
+        fprintf(stderr, "strdup of %d byte string failed\n", (int)strlen(str));
         exit( EXIT_FAILURE );
     }
     return res;

libopts/autoopts.h

@@ -1,55 +1,31 @@
 
 /*
- *  Time-stamp:      "2007-04-15 09:59:39 bkorb"
+ *  Time-stamp:      "2007-07-04 11:33:08 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.23 2007/04/15 19:01:18 bkorb Exp $
- *  Time-stamp:      "2005-02-14 05:59:50 bkorb"
+ *  autoopts.h  $Id: autoopts.h,v 4.25 2007/07/04 21:36:36 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 #ifndef AUTOGEN_AUTOOPTS_H

libopts/autoopts/options.h

@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Saturday May  5, 2007 at 12:02:34 PM PDT
+ *  It has been AutoGen-ed  Saturday July 28, 2007 at 01:01:42 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -11,24 +11,21 @@
  *
  *  Automated Options copyright 1992-Y 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 by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
+ *  AutoOpts is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU Lesser General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *  
- *  AutoOpts is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *  AutoOpts is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Lesser General Public License for more details.
  *  
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with AutoOpts.  If not, write to:
- *  	The Free Software Foundation, Inc.,
- *  	51 Franklin Street, Fifth Floor
- *  	Boston, MA  02110-1301, USA.
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef AUTOOPTS_OPTIONS_H_GUARD
-#define AUTOOPTS_OPTIONS_H_GUARD
+#define AUTOOPTS_OPTIONS_H_GUARD 1
 #include <sys/types.h>
 
 #if defined(HAVE_STDINT_H)
@@ -68,8 +65,8 @@
  *  values for "opt_name" are available.
  */
 
-#define  OPTIONS_STRUCT_VERSION  118784
-#define  OPTIONS_VERSION_STRING  "29:0:4"
+#define  OPTIONS_STRUCT_VERSION  122880
+#define  OPTIONS_VERSION_STRING  "30:0:5"
 #define  OPTIONS_MINIMUM_VERSION 102400
 #define  OPTIONS_MIN_VER_STRING  "25:0:0"
 
@@ -393,6 +390,8 @@ struct options {
     tOptSpecIndex       specOptIdx;
     int const           optCt;
     int const           presetOptCt;
+    char const *        pzFullUsage;
+    char const *        pzShortUsage;
 };
 
 /*
@@ -447,7 +446,7 @@ extern "C" {
  *  The following routines may be coded into AutoOpts client code:
  */
 
-/* From: tokenize.c line 115
+/* From: tokenize.c line 118
  *
  * ao_string_tokenize - tokenize an input string
  *
@@ -491,7 +490,7 @@ extern "C" {
 extern token_list_t* ao_string_tokenize( char const* );
 
 
-/* From: configfile.c line 113
+/* From: configfile.c line 90
  *
  * configFileLoad - parse a configuration file
  *
@@ -511,7 +510,7 @@ extern token_list_t* ao_string_tokenize( char const* );
 extern const tOptionValue* configFileLoad( char const* );
 
 
-/* From: configfile.c line 883
+/* From: configfile.c line 860
  *
  * optionFileLoad - Load the locatable config files, in order
  *
@@ -541,7 +540,7 @@ extern const tOptionValue* configFileLoad( char const* );
 extern int optionFileLoad( tOptions*, char const* );
 
 
-/* From: configfile.c line 245
+/* From: configfile.c line 222
  *
  * optionFindNextValue - find a hierarcicaly valued option instance
  *
@@ -560,7 +559,7 @@ extern int optionFileLoad( tOptions*, char const* );
 extern const tOptionValue* optionFindNextValue( const tOptDesc*, const tOptionValue*, char const*, char const* );
 
 
-/* From: configfile.c line 171
+/* From: configfile.c line 148
  *
  * optionFindValue - find a hierarcicaly valued option instance
  *
@@ -577,7 +576,7 @@ extern const tOptionValue* optionFindNextValue( const tOptDesc*, const tOptionVa
 extern const tOptionValue* optionFindValue( const tOptDesc*, char const*, char const* );
 
 
-/* From: restore.c line 188
+/* From: restore.c line 165
  *
  * optionFree - free allocated option processing memory
  *
@@ -590,7 +589,7 @@ extern const tOptionValue* optionFindValue( const tOptDesc*, char const*, char c
 extern void optionFree( tOptions* );
 
 
-/* From: configfile.c line 314
+/* From: configfile.c line 291
  *
  * optionGetValue - get a specific value from a hierarcical list
  *
@@ -608,7 +607,7 @@ extern void optionFree( tOptions* );
 extern const tOptionValue* optionGetValue( const tOptionValue*, char const* );
 
 
-/* From: load.c line 521
+/* From: load.c line 498
  *
  * optionLoadLine - process a string for an option name and value
  *
@@ -632,7 +631,7 @@ extern const tOptionValue* optionGetValue( const tOptionValue*, char const* );
 extern void optionLoadLine( tOptions*, char const* );
 
 
-/* From: configfile.c line 373
+/* From: configfile.c line 350
  *
  * optionNextValue - get the next value from a hierarchical list
  *
@@ -651,7 +650,7 @@ extern void optionLoadLine( tOptions*, char const* );
 extern const tOptionValue* optionNextValue( const tOptionValue*, const tOptionValue* );
 
 
-/* From: usage.c line 128
+/* From: usage.c line 107
  *
  * optionOnlyUsage - Print usage text for just the options
  *
@@ -666,7 +665,7 @@ extern const tOptionValue* optionNextValue( const tOptionValue*, const tOptionVa
 extern void optionOnlyUsage( tOptions*, int );
 
 
-/* From: autoopts.c line 1012
+/* From: autoopts.c line 989
  *
  * optionProcess - this is the main option processing routine
  *
@@ -696,7 +695,7 @@ extern void optionOnlyUsage( tOptions*, int );
 extern int optionProcess( tOptions*, int, char** );
 
 
-/* From: restore.c line 145
+/* From: restore.c line 122
  *
  * optionRestore - restore option state from memory copy
  *
@@ -713,7 +712,7 @@ extern int optionProcess( tOptions*, int, char** );
 extern void optionRestore( tOptions* );
 
 
-/* From: save.c line 334
+/* From: save.c line 311
  *
  * optionSaveFile - saves the option state to a file
  *
@@ -730,7 +729,7 @@ extern void optionRestore( tOptions* );
 extern void optionSaveFile( tOptions* );
 
 
-/* From: restore.c line 93
+/* From: restore.c line 70
  *
  * optionSaveState - saves the option state to memory
  *
@@ -752,7 +751,7 @@ extern void optionSaveFile( tOptions* );
 extern void optionSaveState( tOptions* );
 
 
-/* From: nested.c line 559
+/* From: nested.c line 537
  *
  * optionUnloadNested - Deallocate the memory for a nested value
  *
@@ -766,7 +765,7 @@ extern void optionSaveState( tOptions* );
 extern void optionUnloadNested( tOptionValue const * );
 
 
-/* From: version.c line 58
+/* From: version.c line 41
  *
  * optionVersion - return the compiled AutoOpts version number
  *
@@ -778,7 +777,7 @@ extern void optionUnloadNested( tOptionValue const * );
 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
  *
@@ -822,7 +821,7 @@ extern char* pathfind( char const*, char const*, char const* );
 #endif /* HAVE_PATHFIND */
 
 
-/* From: streqvcmp.c line 233
+/* From: streqvcmp.c line 208
  *
  * strequate - map a list of characters to the same value
  *
@@ -837,7 +836,7 @@ extern char* pathfind( char const*, char const*, char const* );
 extern void strequate( char const* );
 
 
-/* From: streqvcmp.c line 143
+/* From: streqvcmp.c line 118
  *
  * streqvcmp - compare two strings with an equivalence mapping
  *
@@ -856,7 +855,7 @@ extern void strequate( char const* );
 extern int streqvcmp( char const*, char const* );
 
 
-/* From: streqvcmp.c line 180
+/* From: streqvcmp.c line 155
  *
  * streqvmap - Set the character mappings for the streqv functions
  *
@@ -884,7 +883,7 @@ extern int streqvcmp( char const*, char const* );
 extern void streqvmap( char, char, int );
 
 
-/* From: streqvcmp.c line 102
+/* From: streqvcmp.c line 77
  *
  * strneqvcmp - compare two strings with an equivalence mapping
  *
@@ -905,7 +904,7 @@ extern void streqvmap( char, char, int );
 extern int strneqvcmp( char const*, char const*, int );
 
 
-/* From: streqvcmp.c line 259
+/* From: streqvcmp.c line 234
  *
  * strtransform - convert a string into its mapped-to value
  *

libopts/autoopts/usage-txt.h

@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Saturday May  5, 2007 at 12:02:33 PM PDT
+ *  It has been AutoGen-ed  Saturday July 28, 2007 at 01:01:39 PM PDT
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
@@ -13,24 +13,21 @@
  *  they may substitute translated strings using a procedure that steps through
  *  all the string pointers.
  *
- *  AutoOpts is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
+ *  AutoOpts is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU Lesser General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *  
- *  AutoOpts is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *  AutoOpts is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Lesser General Public License for more details.
  *  
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with AutoOpts.  If not, write to:
- *  	The Free Software Foundation, Inc.,
- *  	51 Franklin Street, Fifth Floor
- *  	Boston, MA  02110-1301, USA.
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef AUTOOPTS_USAGE_TXT_H_GUARD
-#define AUTOOPTS_USAGE_TXT_H_GUARD
+#define AUTOOPTS_USAGE_TXT_H_GUARD 1
 
 #undef  cch_t
 #define cch_t char const

libopts/boolean.c

@@ -1,55 +1,32 @@
 
 /*
- *  $Id: boolean.c,v 4.10 2007/02/04 17:44:12 bkorb Exp $
- * Time-stamp:      "2007-01-13 10:10:39 bkorb"
+ *  $Id: boolean.c,v 4.12 2007/07/04 21:36:37 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:33:18 bkorb"
  *
  *   Automated Options Paged Usage module.
  *
  *  This routine will run run-on options through a pager so the
  *  user may examine, print or edit them at their leisure.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /*=export_func  optionBooleanVal

libopts/compat.h

@@ -1,319 +0,0 @@
-/*  -*- Mode: C -*-  */
-
-/* --- fake the preprocessor into handlng portability */
-/*
- *  Time-stamp:      "2007-02-03 17:41:06 bkorb"
- *
- * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
- * Created:          Mon Jun 30 15:54:46 1997
- *
- * $Id: compat.h,v 4.16 2007/04/27 01:10:47 bkorb Exp $
- */
-#ifndef COMPAT_H_GUARD
-#define COMPAT_H_GUARD 1
-
-#if defined(HAVE_CONFIG_H)
-#  include <config.h>
-
-#elif defined(_WIN32) && !defined(__CYGWIN__)
-#  include "windows-config.h"
-
-#else
-#  error "compat.h" requires "config.h"
-   choke me.
-#endif
-
-
-#ifndef HAVE_STRSIGNAL
-   char * strsignal( int signo );
-#endif
-
-#define  _GNU_SOURCE    1 /* for strsignal in GNU's libc */
-#define  __USE_GNU      1 /* exact same thing as above   */
-#define  __EXTENSIONS__ 1 /* and another way to call for it */
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  SYSTEM HEADERS:
- */
-#include <sys/types.h>
-#ifdef HAVE_SYS_MMAN_H
-#  include <sys/mman.h>
-#endif
-#include <sys/param.h>
-#if HAVE_SYS_PROCSET_H
-#  include <sys/procset.h>
-#endif
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#if defined( HAVE_SOLARIS_SYSINFO )
-#  include <sys/systeminfo.h>
-#elif defined( HAVE_UNAME_SYSCALL )
-#  include <sys/utsname.h>
-#endif
-
-#ifdef DAEMON_ENABLED
-#  if HAVE_SYS_STROPTS_H
-#  include <sys/stropts.h>
-#  endif
-
-#  if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#  endif
-
-#  if ! defined(HAVE_SYS_POLL_H) && ! defined(HAVE_SYS_SELECT_H)
-#    error This system cannot support daemon processing
-     Choke Me.
-#  endif
-
-#  if HAVE_SYS_POLL_H
-#  include <sys/poll.h>
-#  endif
-
-#  if HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#  endif
-
-#  if HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#  endif
-
-#  if HAVE_SYS_UN_H
-#  include <sys/un.h>
-#  endif
-#endif
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  USER HEADERS:
- */
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-
-/*
- *  Directory opening stuff:
- */
-# if defined (_POSIX_SOURCE)
-/* Posix does not require that the d_ino field be present, and some
-   systems do not provide it. */
-#    define REAL_DIR_ENTRY(dp) 1
-# else /* !_POSIX_SOURCE */
-#    define REAL_DIR_ENTRY(dp) (dp->d_ino != 0)
-# endif /* !_POSIX_SOURCE */
-
-# if defined (HAVE_DIRENT_H)
-#   include <dirent.h>
-#   define D_NAMLEN(dirent) strlen((dirent)->d_name)
-# else /* !HAVE_DIRENT_H */
-#   define dirent direct
-#   define D_NAMLEN(dirent) (dirent)->d_namlen
-#   if defined (HAVE_SYS_NDIR_H)
-#     include <sys/ndir.h>
-#   endif /* HAVE_SYS_NDIR_H */
-#   if defined (HAVE_SYS_DIR_H)
-#     include <sys/dir.h>
-#   endif /* HAVE_SYS_DIR_H */
-#   if defined (HAVE_NDIR_H)
-#     include <ndir.h>
-#   endif /* HAVE_NDIR_H */
-# endif /* !HAVE_DIRENT_H */
-
-#include <errno.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifndef O_NONBLOCK
-# define O_NONBLOCK FNDELAY
-#endif
-
-#if defined(HAVE_LIBGEN) && defined(HAVE_LIBGEN_H)
-#  include <libgen.h>
-#endif
-
-#if defined(HAVE_LIMITS_H)  /* this is also in options.h */
-#  include <limits.h>
-#elif defined(HAVE_SYS_LIMITS_H)
-#  include <sys/limits.h>
-#endif /* HAVE_LIMITS/SYS_LIMITS_H */
-
-#include <memory.h>
-#include <setjmp.h>
-#include <signal.h>
-
-#if defined( HAVE_STDINT_H )
-#  include <stdint.h>
-#elif defined( HAVE_INTTYPES_H )
-#  include <inttypes.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <time.h>
-
-#ifdef HAVE_UTIME_H
-#  include <utime.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  FIXUPS and CONVIENCE STUFF:
- */
-#ifdef __cplusplus
-#   define EXTERN extern "C"
-#else
-#   define EXTERN extern
-#endif
-
-/* some systems #def errno! and others do not declare it!! */
-#ifndef errno
-   extern int errno;
-#endif
-
-/* Some machines forget this! */
-
-# ifndef EXIT_FAILURE
-#   define EXIT_SUCCESS 0
-#   define EXIT_FAILURE 1
-# endif
-
-#ifndef NUL
-#  define NUL '\0'
-#endif
-
-#ifndef NULL
-#  define NULL 0
-#endif
-
-#if !defined (MAXPATHLEN) && defined (HAVE_SYS_PARAM_H)
-#  include <sys/param.h>
-#endif /* !MAXPATHLEN && HAVE_SYS_PARAM_H */
-
-#if !defined (MAXPATHLEN) && defined (PATH_MAX)
-#  define MAXPATHLEN PATH_MAX
-#endif /* !MAXPATHLEN && PATH_MAX */
-
-#if !defined (MAXPATHLEN) && defined(_MAX_PATH)
-#  define PATH_MAX _MAX_PATH
-#  define MAXPATHLEN _MAX_PATH
-#endif
-
-#if !defined (MAXPATHLEN)
-#  define MAXPATHLEN ((size_t)4096)
-#endif /* MAXPATHLEN */
-
-#define AG_PATH_MAX  ((size_t)MAXPATHLEN)
-
-#ifndef LONG_MAX
-#  define LONG_MAX      ~(1L << (8*sizeof(long) -1))
-#  define INT_MAX       ~(1 << (8*sizeof(int) -1))
-#endif
-
-#ifndef ULONG_MAX
-#  define ULONG_MAX     ~(OUL)
-#  define UINT_MAX      ~(OU)
-#endif
-
-#ifndef SHORT_MAX
-#  define SHORT_MAX     ~(1 << (8*sizeof(short) -1))
-#else
-#  define USHORT_MAX    ~(OUS)
-#endif
-
-#ifndef HAVE_INT8_T
-  typedef signed char       int8_t;
-#endif
-#ifndef HAVE_UINT8_T
-  typedef unsigned char     uint8_t;
-#endif
-#ifndef HAVE_INT16_T
-  typedef signed short      int16_t;
-#endif
-#ifndef HAVE_UINT16_T
-  typedef unsigned short    uint16_t;
-#endif
-#ifndef HAVE_UINT_T
-  typedef unsigned int      uint_t;
-#endif
-
-#ifndef HAVE_INT32_T
-# if SIZEOF_INT == 4
-        typedef signed int      int32_t;
-# elif SIZEOF_LONG == 4
-        typedef signed long     int32_t;
-# endif
-#endif
-
-#ifndef HAVE_UINT32_T
-# if SIZEOF_INT == 4
-        typedef unsigned int    uint32_t;
-# elif SIZEOF_LONG == 4
-        typedef unsigned long   uint32_t;
-# else
-#   error Cannot create a uint32_t type.
-    Choke Me.
-# endif
-#endif
-
-#ifndef HAVE_INTPTR_T
-  typedef signed long   intptr_t;
-#endif
-#ifndef HAVE_UINTPTR_T
-  typedef unsigned long uintptr_t;
-#endif
-
-/* redefine these for BSD style string libraries */
-#ifndef HAVE_STRCHR
-#  define strchr        index
-#  define strrchr       rindex
-#endif
-
-#ifdef USE_FOPEN_BINARY
-#  ifndef FOPEN_BINARY_FLAG
-#    define FOPEN_BINARY_FLAG   "b"
-#  endif
-#  ifndef FOPEN_TEXT_FLAG
-#    define FOPEN_TEXT_FLAG     "t"
-#  endif
-#else
-#  ifndef FOPEN_BINARY_FLAG
-#    define FOPEN_BINARY_FLAG
-#  endif
-#  ifndef FOPEN_TEXT_FLAG
-#    define FOPEN_TEXT_FLAG
-#  endif
-#endif
-
-#ifndef STR
-#  define _STR(s) #s
-#  define STR(s)  _STR(s)
-#endif
-
-/* ##### Pointer sized word ##### */
-
-/* FIXME:  the MAX stuff in here is broken! */
-#if SIZEOF_CHARP > SIZEOF_INT
-   typedef long t_word;
-   #define WORD_MAX  LONG_MAX
-   #define WORD_MIN  LONG_MIN
-#else /* SIZEOF_CHARP <= SIZEOF_INT */
-   typedef int t_word;
-   #define WORD_MAX  INT_MAX
-   #define WORD_MIN  INT_MIN
-#endif
-
-#endif /* COMPAT_H_GUARD */
-
-/*
- * Local Variables:
- * mode: C
- * c-file-style: "stroustrup"
- * indent-tabs-mode: nil
- * End:
- * end of compat/compat.h */

libopts/compat/compat.h

@@ -1,13 +1,51 @@
 /*  -*- Mode: C -*-  */
 
-/* --- fake the preprocessor into handlng portability */
-/*
- *  Time-stamp:      "2007-02-03 17:41:06 bkorb"
+/* compat.h --- fake the preprocessor into handlng portability
+ *
+ *  Time-stamp:      "2007-07-04 09:51:34 bkorb"
+ *
+ * $Id: compat.h,v 4.17 2007/07/04 20:51:18 bkorb Exp $
+ *
+ *  compat.h is free software.
+ *  This file is part of AutoGen.
+ *
+ *  AutoGen copyright (c) 1992-2007 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
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AutoGen is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
  *
- * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
- * Created:          Mon Jun 30 15:54:46 1997
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: compat.h,v 4.15 2007/02/04 22:17:39 bkorb Exp $
+ *  As a special exception, Bruce Korb gives permission for additional
+ *  uses of the text contained in the release of compat.h.
+ *
+ *  The exception is that, if you link the compat.h library with other
+ *  files to produce an executable, this does not by itself cause the
+ *  resulting executable to be covered by the GNU General Public License.
+ *  Your use of that executable is in no way restricted on account of
+ *  linking the compat.h library code into it.
+ *
+ *  This exception does not however invalidate any other reasons why
+ *  the executable file might be covered by the GNU General Public License.
+ *
+ *  This exception applies only to the code released by Bruce Korb under
+ *  the name compat.h.  If you copy code from other sources under the
+ *  General Public License into a copy of compat.h, as the General Public
+ *  License permits, the exception does not apply to the code that you add
+ *  in this way.  To avoid misleading anyone as to the status of such
+ *  modified files, you must delete this exception notice from them.
+ *
+ *  If you write modifications of your own for compat.h, it is your choice
+ *  whether to permit this exception to apply to your modifications.
+ *  If you do not wish that, delete this exception notice.
  */
 #ifndef COMPAT_H_GUARD
 #define COMPAT_H_GUARD 1
@@ -199,6 +237,11 @@
 #  define MAXPATHLEN PATH_MAX
 #endif /* !MAXPATHLEN && PATH_MAX */
 
+#if !defined (MAXPATHLEN) && defined(_MAX_PATH)
+#  define PATH_MAX _MAX_PATH
+#  define MAXPATHLEN _MAX_PATH
+#endif
+
 #if !defined (MAXPATHLEN)
 #  define MAXPATHLEN ((size_t)4096)
 #endif /* MAXPATHLEN */

libopts/compat/pathfind.c

@@ -5,11 +5,10 @@
 /*
  * 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/11/27 01:52:23 $
+ * Last Modified:    $Date: 2007/07/04 20:51:18 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.10 2006/11/27 01:52:23 bkorb Exp $
+ * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
  */
 
 /* Code: */

libopts/compat/windows-config.h

@@ -1,8 +1,25 @@
 
 /*
- * Time-stamp:        "2006-10-14 14:55:09 bkorb"
+ * Time-stamp:        "2007-07-04 09:45:44 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2006/10/14 22:39:49 $
+ * Last Committed:    $Date: 2007/07/04 20:51:18 $
+ *
+ *  This file is part of AutoGen.
+ *
+ *  AutoGen copyright (c) 1992-2007 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
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AutoGen is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef WINDOWS_CONFIG_HACKERY
 #define WINDOWS_CONFIG_HACKERY 1
@@ -92,6 +109,7 @@ typedef unsigned long uintptr_t;
 /* Include Windows headers */
 #include <windows.h>
 #include <winsock2.h>
+#include <limits.h>
 
 /*
  * Compatibility declarations for Windows, assuming SYS_WINNT

libopts/configfile.c

@@ -1,51 +1,28 @@
 /*
- *  $Id: configfile.c,v 1.21 2007/04/15 19:01:18 bkorb Exp $
- *  Time-stamp:      "2007-04-15 11:22:46 bkorb"
+ *  $Id: configfile.c,v 1.23 2007/07/04 21:36:37 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 11:33:27 bkorb"
  *
  *  configuration/rc/ini file handling.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /* = = = START-STATIC-FORWARD = = = */
@@ -1248,7 +1225,7 @@ validateOptionsStruct( tOptions* pOpts, char const* pzProgram )
           || (pOpts->structVersion < OPTIONS_MINIMUM_VERSION )
        )  )  {
 
-        fprintf( stderr, zAO_Err, pOpts->origArgVect[0],
+        fprintf( stderr, zAO_Err, pzProgram,
                  NUM_TO_VER( pOpts->structVersion ));
         if (pOpts->structVersion > OPTIONS_STRUCT_VERSION )
             fputs( zAO_Big, stderr );

libopts/cook.c

@@ -1,53 +1,30 @@
 
 /*
- *  $Id: cook.c,v 4.10 2007/02/04 17:44:12 bkorb Exp $
- *  Time-stamp:      "2006-09-24 15:21:02 bkorb"
+ *  $Id: cook.c,v 4.12 2007/07/04 21:36:37 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 11:33:34 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
  *  into an internal format.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /* = = = START-STATIC-FORWARD = = = */

libopts/enumeration.c

@@ -1,55 +1,32 @@
 
 /*
- *  $Id: enumeration.c,v 4.17 2007/02/04 17:44:12 bkorb Exp $
- * Time-stamp:      "2007-01-13 10:22:35 bkorb"
+ *  $Id: enumeration.c,v 4.19 2007/07/04 21:36:37 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:33:42 bkorb"
  *
  *   Automated Options Paged Usage module.
  *
  *  This routine will run run-on options through a pager so the
  *  user may examine, print or edit them at their leisure.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 tSCC*  pz_enum_err_fmt;

libopts/environment.c

@@ -1,55 +1,32 @@
 
 /*
- *  $Id: environment.c,v 4.13 2007/04/15 19:01:18 bkorb Exp $
- * Time-stamp:      "2007-04-15 11:50:35 bkorb"
+ *  $Id: environment.c,v 4.15 2007/07/04 21:36:37 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:33:50 bkorb"
  *
  *  This file contains all of the routines that must be linked into
  *  an executable to use the generated option processing.  The optional
  *  routines are in separately compiled modules so that they will not
  *  necessarily be linked in.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /* = = = START-STATIC-FORWARD = = = */

libopts/genshell.c

@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Saturday May  5, 2007 at 12:02:35 PM PDT
+ *  It has been AutoGen-ed  Saturday July 28, 2007 at 01:01:44 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 30:0:5 templates.
  */
 
 /*
@@ -22,21 +22,18 @@
  *
  * genshellopt copyright 1999-2007 Bruce Korb - all rights reserved
  *
- * genshellopt is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * genshellopt is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * genshellopt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * genshellopt is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with genshellopt.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -51,19 +48,16 @@ extern "C" {
 tSCC zCopyright[] =
        "genshellopt copyright (c) 1999-2007 Bruce Korb, all rights reserved";
 tSCC zCopyrightNotice[] =
-       "genshellopt is free software; you can redistribute it and/or\n\
-modify it under the terms of the GNU Lesser General Public\n\
-License as published by the Free Software Foundation; either\n\
-version 2.1 of the License, or (at your option) any later version.\n\n\
-genshellopt is distributed in the hope that it will be useful,\n\
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n\
-Lesser General Public License for more details.\n\n\
-You should have received a copy of the GNU Lesser General Public\n\
-License along with genshellopt.  If not, write to:\n\
-\tThe Free Software Foundation, Inc.,\n\
-\t51 Franklin Street, Fifth Floor\n\
-\tBoston, MA  02110-1301, USA.";
+       "genshellopt is free software: you can redistribute it and/or modify it\n\
+under the terms of the GNU General Public License as published by the\n\
+Free Software Foundation, either version 3 of the License, or\n\
+(at your option) any later version.\n\n\
+genshellopt is distributed in the hope that it will be useful, but\n\
+WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
+See the GNU General Public License for more details.\n\n\
+You should have received a copy of the GNU General Public License along\n\
+with this program.  If not, see <http://www.gnu.org/licenses/>.";
 extern tUsageProc genshelloptUsage;
 
 #ifndef NULL
@@ -213,7 +207,7 @@ If the script file already exists and contains Automated Option Processing\n\
 text, the second line of the file through the ending tag will be replaced\n\
 by the newly generated text.  The first `#!' line will be regenerated.\n";
 tSCC    zFullVersion[] = GENSHELLOPT_FULL_VERSION;
-/* extracted from optcode.tpl near line 408 */
+/* extracted from optcode.tpl near line 428 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -223,6 +217,8 @@ tSCC    zFullVersion[] = GENSHELLOPT_FULL_VERSION;
 # define translate_option_strings NULL
 #endif /* ENABLE_NLS */
 
+#define genshellopt_full_usage NULL
+#define genshellopt_short_usage NULL
 tOptions genshelloptOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -250,7 +246,8 @@ tOptions genshelloptOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    5 /* full option count */, 2 /* user option count */
+    5 /* full option count */, 2 /* user option count */,
+    genshellopt_full_usage, genshellopt_short_usage
 };
 
 /*
@@ -263,7 +260,7 @@ doUsageOpt(
 {
     USAGE( EXIT_SUCCESS );
 }
-/* extracted from optcode.tpl near line 514 */
+/* extracted from optcode.tpl near line 537 */
 
 #if ENABLE_NLS
 #include <stdio.h>

libopts/genshell.h

@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Saturday May  5, 2007 at 12:02:35 PM PDT
+ *  It has been AutoGen-ed  Saturday July 28, 2007 at 01:01:44 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  *
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 30:0:5 templates.
  */
 
 /*
@@ -22,21 +22,18 @@
  *
  * genshellopt copyright 1999-2007 Bruce Korb - all rights reserved
  *
- * genshellopt is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * genshellopt is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * genshellopt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * genshellopt is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with genshellopt.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /*
  *  This file contains the programmatic interface to the Automated
@@ -45,7 +42,7 @@
  *  "AutoOpts" chapter.  Please refer to that doc for usage help.
  */
 #ifndef AUTOOPTS_GENSHELL_H_GUARD
-#define AUTOOPTS_GENSHELL_H_GUARD
+#define AUTOOPTS_GENSHELL_H_GUARD 1
 #include <autoopts/options.h>
 
 /*
@@ -55,7 +52,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 118784
+#define AO_TEMPLATE_VERSION 122880
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -104,9 +101,9 @@ typedef enum {
 #define VALUE_OPT_SCRIPT         'o'
 #define VALUE_OPT_SHELL          's'
 
-#define VALUE_OPT_VERSION       'v'
 #define VALUE_OPT_HELP          '?'
 #define VALUE_OPT_MORE_HELP     '!'
+#define VALUE_OPT_VERSION       'v'
 /*
  *  Interface defines not associated with particular options
  */
@@ -117,7 +114,7 @@ typedef enum {
                 genshelloptOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*genshelloptOptions.pUsageProc)( &genshelloptOptions, c )
-/* extracted from opthead.tpl near line 360 */
+/* extracted from opthead.tpl near line 380 */
 
 /* * * * * *
  *

libopts/load.c

@@ -1,54 +1,31 @@
 
 /*
- *  $Id: load.c,v 4.20 2007/02/04 22:17:39 bkorb Exp $
- *  Time-stamp:      "2007-02-04 11:54:57 bkorb"
+ *  $Id: load.c,v 4.22 2007/07/04 21:36:37 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 10:22:44 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
  *  for options, either from a NUL-terminated string passed in or from an
  *  rc/ini file.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 tOptionLoadMode option_load_mode = OPTION_LOAD_UNCOOKED;

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 May  5, 2007 at 12:02:37 PM PDT
+dnl It has been AutoGen-ed  Saturday July 28, 2007 at 01:01:51 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -420,14 +420,30 @@ 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:59:00 $
+dnl Time-stamp:        "2007-07-04 11:41:40 bkorb"
+dnl Last Committed:    $Date: 2007/07/04 20:51:20 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
 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
+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
+dnl  Free Software Foundation, either version 3 of the License, or
+dnl  (at your option) any later version.
+dnl
+dnl  AutoGen is distributed in the hope that it will be useful, but
+dnl  WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl  See the GNU General Public License for more details.
+dnl
+dnl  You should have received a copy of the GNU General Public License along
+dnl  with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
 dnl Default to system libopts
 dnl
 AC_DEFUN([LIBOPTS_CHECK],[

libopts/m4/liboptschk.m4

@@ -1,11 +1,11 @@
 # liboptschk.m4 serial 1 (autogen - 5.7.3)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl copyright (c) 2005 by Bruce Korb - all rights reserved
 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: 2006/09/24 02:59:00 $
+dnl Last Committed:    $Date: 2007/07/04 20:51:18 $
 
 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

libopts/makeshell.c

@@ -1,53 +1,30 @@
 
 /*
- *  $Id: makeshell.c,v 4.20 2007/02/04 17:44:12 bkorb Exp $
- * Time-stamp:      "2007-01-27 06:05:45 bkorb"
+ *  $Id: makeshell.c,v 4.22 2007/07/04 21:36:37 bkorb Exp $
+ * Time-stamp:      "2007-07-04 10:22:32 bkorb"
  *
  *  This module will interpret the options set in the tOptions
  *  structure and create a Bourne shell script capable of parsing them.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 tOptions*  pShellParseOptions = NULL;

libopts/nested.c

@@ -1,53 +1,31 @@
 
 /*
- *  $Id: nested.c,v 4.14 2007/02/04 17:44:12 bkorb Exp $
- *  Time-stamp:      "2007-01-26 11:04:35 bkorb"
+ *  $Id: nested.c,v 4.16 2007/07/04 21:36:37 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 10:22:17 bkorb"
  *
  *   Automated Options Nested Values module.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
  *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *  These files have the following md5sums:
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
- *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
+
 /* = = = START-STATIC-FORWARD = = = */
 /* static forward declarations maintained by :mkfwd */
 static void

libopts/numeric.c

@@ -1,50 +1,27 @@
 
 /*
- *  $Id: numeric.c,v 4.11 2007/02/04 17:44:12 bkorb Exp $
- *  Time-stamp:      "2007-01-13 10:28:20 bkorb"
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  $Id: numeric.c,v 4.13 2007/07/04 21:36:37 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 10:21:59 bkorb"
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /*=export_func  optionNumericVal

libopts/pathfind.c

@@ -1,339 +0,0 @@
-/*  -*- Mode: C -*-  */
-
-/* pathfind.c --- find a FILE  MODE along PATH */
-
-/*
- * 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/11/27 01:52:23 $
- *            by: bkorb
- *
- * $Id: pathfind.c,v 4.10 2006/11/27 01:52:23 bkorb Exp $
- */
-
-/* Code: */
-
-#include "compat.h"
-#ifndef HAVE_PATHFIND
-#if defined(__windows__) && !defined(__CYGWIN__)
-char*
-pathfind( char const*  path,
-          char const*  fileName,
-          char const*  mode )
-{
-    return NULL;
-}
-#else
-
-static char* make_absolute( char const *string, char const *dot_path );
-static char* canonicalize_pathname( char *path );
-static char* extract_colon_unit( char* dir, char const *string, int *p_index );
-
-
-/*=export_func pathfind
- *
- * what: fild a file in a list of directories
- *
- * ifndef: HAVE_PATHFIND
- *
- * arg:  + char const* + path + colon separated list of search directories +
- * arg:  + char const* + file + the name of the file to look for +
- * arg:  + char const* + mode + the mode bits that must be set to match +
- *
- * ret_type:  char*
- * ret_desc:  the path to the located file
- *
- * doc:
- *
- * pathfind looks for a a file with name "FILE" and "MODE" access
- * along colon delimited "PATH", and returns the full pathname as a
- * string, or NULL if not found.  If "FILE" contains a slash, then
- * it is treated as a relative or absolute path and "PATH" is ignored.
- *
- * @strong{NOTE}: this function is compiled into @file{libopts} only if
- * it is not natively supplied.
- *
- * The "MODE" argument is a string of option letters chosen from the
- * list below:
- * @example
- *          Letter    Meaning
- *          r         readable
- *          w         writable
- *          x         executable
- *          f         normal file       (NOT IMPLEMENTED)
- *          b         block special     (NOT IMPLEMENTED)
- *          c         character special (NOT IMPLEMENTED)
- *          d         directory         (NOT IMPLEMENTED)
- *          p         FIFO (pipe)       (NOT IMPLEMENTED)
- *          u         set user ID bit   (NOT IMPLEMENTED)
- *          g         set group ID bit  (NOT IMPLEMENTED)
- *          k         sticky bit        (NOT IMPLEMENTED)
- *          s         size nonzero      (NOT IMPLEMENTED)
- * @end example
- *
- * example:
- * To find the "ls" command using the "PATH" environment variable:
- * @example
- *    #include <stdlib.h>
- *    char* pz_ls = pathfind( getenv("PATH"), "ls", "rx" );
- *    <<do whatever with pz_ls>>
- *    free( pz_ls );
- * @end example
- * The path is allocated with @code{malloc(3C)}, so you must @code{free(3C)}
- * the result.  Also, do not use unimplemented file modes.  :-)
- *
- * err:  returns NULL if the file is not found.
-=*/
-char*
-pathfind( char const*  path,
-          char const*  fileName,
-          char const*  mode )
-{
-    int   p_index   = 0;
-    int   mode_bits = 0;
-    char* pathName  = NULL;
-    char  zPath[ AG_PATH_MAX + 1 ];
-
-    if (strchr( mode, 'r' )) mode_bits |= R_OK;
-    if (strchr( mode, 'w' )) mode_bits |= W_OK;
-    if (strchr( mode, 'x' )) mode_bits |= X_OK;
-
-    /*
-     *  FOR each non-null entry in the colon-separated path, DO ...
-     */
-    for (;;) {
-        DIR*  dirP;
-        char* colon_unit = extract_colon_unit( zPath, path, &p_index );
-
-        /*
-         *  IF no more entries, THEN quit
-         */
-        if (colon_unit == NULL)
-            break;
-
-        dirP = opendir( colon_unit );
-
-        /*
-         *  IF the directory is inaccessable, THEN next directory
-         */
-        if (dirP == NULL)
-            continue;
-
-        /*
-         *  FOR every entry in the given directory, ...
-         */
-        for (;;) {
-            struct dirent *entP = readdir( dirP );
-
-            if (entP == (struct dirent*)NULL)
-                break;
-
-            /*
-             *  IF the file name matches the one we are looking for, ...
-             */
-            if (strcmp( entP->d_name, fileName ) == 0) {
-                char* pzFullName = make_absolute( fileName, colon_unit);
-
-                /*
-                 *  Make sure we can access it in the way we want
-                 */
-                if (access( pzFullName, mode_bits ) >= 0) {
-                    /*
-                     *  We can, so normalize the name and return it below
-                     */
-                    pathName = canonicalize_pathname( pzFullName );
-                }
-
-                free( (void*)pzFullName );
-                break;
-            }
-        }
-
-        closedir( dirP );
-
-        if (pathName != NULL)
-            break;
-    }
-
-    return pathName;
-}
-
-/*
- * Turn STRING  (a pathname) into an  absolute  pathname, assuming  that
- * DOT_PATH contains the symbolic location of  `.'.  This always returns
- * a new string, even if STRING was an absolute pathname to begin with.
- */
-static char*
-make_absolute( char const *string, char const *dot_path )
-{
-    char *result;
-    int result_len;
-
-    if (!dot_path || *string == '/') {
-        result = strdup( string );
-    } else {
-        if (dot_path && dot_path[0]) {
-            result = malloc( 2 + strlen( dot_path ) + strlen( string ) );
-            strcpy( result, dot_path );
-            result_len = strlen( result );
-            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';
-            result_len = 2;
-        }
-
-        strcpy( result + result_len, string );
-    }
-
-    return result;
-}
-
-/*
- * Canonicalize PATH, and return a  new path.  The new path differs from
- * PATH in that:
- *
- *    Multiple `/'s     are collapsed to a single `/'.
- *    Leading `./'s     are removed.
- *    Trailing `/.'s    are removed.
- *    Trailing `/'s     are removed.
- *    Non-leading `../'s and trailing `..'s are handled by removing
- *                    portions of the path.
- */
-static char*
-canonicalize_pathname( char *path )
-{
-    int i, start;
-    char stub_char, *result;
-
-    /* The result cannot be larger than the input PATH. */
-    result = strdup( path );
-
-    stub_char = (*path == '/') ? '/' : '.';
-
-    /* Walk along RESULT looking for things to compact. */
-    i = 0;
-    while (result[i]) {
-        while (result[i] != '\0' && result[i] != '/')
-            i++;
-
-        start = i++;
-
-        /* If we didn't find any  slashes, then there is nothing left to
-         * do.
-         */
-        if (!result[start])
-            break;
-
-        /* Handle multiple `/'s in a row. */
-        while (result[i] == '/')
-            i++;
-
-#if !defined (apollo)
-        if ((start + 1) != i)
-#else
-        if ((start + 1) != i && (start != 0 || i != 2))
-#endif /* apollo */
-        {
-            strcpy( result + start + 1, result + i );
-            i = start + 1;
-        }
-
-        /* Handle backquoted `/'. */
-        if (start > 0 && result[start - 1] == '\\')
-            continue;
-
-        /* Check for trailing `/', and `.' by itself. */
-        if ((start && !result[i])
-            || (result[i] == '.' && !result[i+1])) {
-            result[--i] = '\0';
-            break;
-        }
-
-        /* Check for `../', `./' or trailing `.' by itself. */
-        if (result[i] == '.') {
-            /* Handle `./'. */
-            if (result[i + 1] == '/') {
-                strcpy( result + i, result + i + 1 );
-                i = (start < 0) ? 0 : start;
-                continue;
-            }
-
-            /* Handle `../' or trailing `..' by itself. */
-            if (result[i + 1] == '.' &&
-                (result[i + 2] == '/' || !result[i + 2])) {
-                while (--start > -1 && result[start] != '/')
-                    ;
-                strcpy( result + start + 1, result + i + 2 );
-                i = (start < 0) ? 0 : start;
-                continue;
-            }
-        }
-    }
-
-    if (!*result) {
-        *result = stub_char;
-        result[1] = '\0';
-    }
-
-    return result;
-}
-
-/*
- * Given a  string containing units of information separated  by colons,
- * return the next one  pointed to by (P_INDEX), or NULL if there are no
- * more.  Advance (P_INDEX) to the character after the colon.
- */
-static char*
-extract_colon_unit( char* pzDir, char const *string, int *p_index )
-{
-    char*  pzDest = pzDir;
-    int    ix     = *p_index;
-
-    if (string == NULL)
-        return NULL;
-
-    if ((unsigned)ix >= strlen( string ))
-        return NULL;
-
-    {
-        char const* pzSrc = string + ix;
-
-        while (*pzSrc == ':')  pzSrc++;
-
-        for (;;) {
-            char ch = (*(pzDest++) = *(pzSrc++));
-            switch (ch) {
-            case ':':
-                pzDest[-1] = NUL;
-            case NUL:
-                goto copy_done;
-            }
-
-            if ((pzDest - pzDir) >= AG_PATH_MAX)
-                break;
-        } copy_done:;
-
-        ix = pzSrc - string;
-    }
-
-    if (*pzDir == NUL)
-        return NULL;
-
-    *p_index = ix;
-    return pzDir;
-}
-#endif /* __windows__ / __CYGWIN__ */
-#endif /* HAVE_PATHFIND */
-
-/*
- * Local Variables:
- * mode: C
- * c-file-style: "stroustrup"
- * indent-tabs-mode: nil
- * End:
- * end of compat/pathfind.c */

libopts/pgusage.c

@@ -1,55 +1,32 @@
 
 /*
- *  $Id: pgusage.c,v 4.12 2007/04/28 22:19:23 bkorb Exp $
- * Time-stamp:      "2006-07-16 08:13:26 bkorb"
+ *  $Id: pgusage.c,v 4.14 2007/07/04 21:36:38 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:34:23 bkorb"
  *
  *   Automated Options Paged Usage module.
  *
  *  This routine will run run-on options through a pager so the
  *  user may examine, print or edit them at their leisure.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 tePagerState pagerState = PAGER_STATE_INITIAL;

libopts/proto.h

@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Sat May  5 12:02:36 PDT 2007
+ * Generated Sat Jul 28 13:01:46 PDT 2007
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1

libopts/putshell.c

@@ -1,54 +1,31 @@
 
 /*
- *  $Id: putshell.c,v 4.18 2007/02/04 17:44:12 bkorb Exp $
- * Time-stamp:      "2007-01-13 10:29:39 bkorb"
+ *  $Id: putshell.c,v 4.20 2007/07/04 21:36:38 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:34:33 bkorb"
  *
  *  This module will interpret the options set in the tOptions
  *  structure and print them to standard out in a fashion that
  *  will allow them to be interpreted by the Bourne or Korn shells.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /* = = = START-STATIC-FORWARD = = = */

libopts/restore.c

@@ -1,54 +1,31 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.10 2007/02/04 17:44:12 bkorb Exp $
- * Time-stamp:      "2007-01-13 14:13:17 bkorb"
+ *  restore.c  $Id: restore.c,v 4.12 2007/07/04 21:36:38 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:34:40 bkorb"
  *
  *  This module's routines will save the current option state to memory
  *  and restore it.  If saved prior to the initial optionProcess call,
  *  then the initial state will be restored.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
- *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
- *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
- *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
+ *
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
+ *
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
+ *
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
+ *
+ *  These files have the following md5sums:
+ *
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /*

libopts/save.c

@@ -1,54 +1,31 @@
 
 /*
- *  save.c  $Id: save.c,v 4.18 2007/04/15 19:01:18 bkorb Exp $
- * Time-stamp:      "2007-04-15 11:11:10 bkorb"
+ *  save.c  $Id: save.c,v 4.20 2007/07/04 21:36:38 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:34:46 bkorb"
  *
  *  This module's routines will take the currently set options and
  *  store them into an ".rc" file for re-interpretation the next
  *  time the invoking program is run.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 tSCC  zWarn[] = "%s WARNING:  cannot save options - ";

libopts/snprintf.c

@@ -1,60 +0,0 @@
-
-#ifndef HAVE_VPRINTF
-#include "choke-me: no vprintf and no snprintf"
-#endif
-
-#if defined(HAVE_STDARG_H)
-#  include <stdarg.h>
-#  ifndef   VA_START
-#    define VA_START(a, f)  va_start(a, f)
-#    define VA_END(a)       va_end(a)
-#  endif /* VA_START */
-#  define SNV_USING_STDARG_H
-
-#elif defined(HAVE_VARARGS_H)
-#  include <varargs.h>
-#  ifndef   VA_START
-#    define VA_START(a, f) va_start(a)
-#    define VA_END(a)    va_end(a)
-#  endif /* VA_START */
-#  undef  SNV_USING_STDARG_H
-
-#else
-#  include "must-have-stdarg-or-varargs"
-#endif
-
-static int
-snprintf(char *str, size_t n, char const *fmt, ...)
-{
-    va_list ap;
-    int rval;
-
-#ifdef VSPRINTF_CHARSTAR
-    char *rp;
-    VA_START(ap, fmt);
-    rp = vsprintf(str, fmt, ap);
-    VA_END(ap);
-    rval = strlen(rp);
-
-#else
-    VA_START(ap, fmt);
-    rval = vsprintf(str, fmt, ap);
-    VA_END(ap);
-#endif
-
-    if (rval > n) {
-        fprintf(stderr, "snprintf buffer overrun %d > %d\n", rval, (int)n);
-        abort();
-    }
-    return rval;
-}
-
-static int
-vsnprintf( char *str, size_t n, char const *fmt, va_list ap )
-{
-#ifdef VSPRINTF_CHARSTAR
-    return (strlen(vsprintf(str, fmt, ap)));
-#else
-    return (vsprintf(str, fmt, ap));
-#endif
-}

libopts/sort.c

@@ -1,52 +1,29 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.10 2007/04/28 22:19:23 bkorb Exp $
- * Time-stamp:      "2006-10-18 11:29:04 bkorb"
+ *  sort.c  $Id: sort.c,v 4.12 2007/07/04 21:36:38 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /* = = = START-STATIC-FORWARD = = = */

libopts/stack.c

@@ -1,54 +1,31 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.13 2007/02/04 17:44:12 bkorb Exp $
- *  Time-stamp:      "2007-01-13 10:43:21 bkorb"
+ *  $Id: stack.c,v 4.15 2007/07/04 21:36:38 bkorb Exp $
+ *  Time-stamp:      "2007-07-04 11:34:57 bkorb"
  *
  *  This is a special option processing routine that will save the
  *  argument to an option in a FIFO queue.
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 #ifdef WITH_LIBREGEX

libopts/strchr.c

@@ -1,60 +0,0 @@
-/*
-   SYNOPSIS
-       #include <string.h>
-
-       char *strchr(char const *s, int c);
-
-       char *strrchr(char const *s, int c);
-
-   DESCRIPTION
-       The  strchr() function returns a pointer to the first occurrence of the
-       character c in the string s.
-
-       The strrchr() function returns a pointer to the last occurrence of  the
-       character c in the string s.
-
-       Here  "character"  means "byte" - these functions do not work with wide
-       or multi-byte characters.
-
-   RETURN VALUE
-       The strchr() and strrchr() functions return a pointer  to  the  matched
-       character or NULL if the character is not found.
-
-   CONFORMING TO
-       SVID 3, POSIX, BSD 4.3, ISO 9899
-*/
-
-char*
-strchr( char const *s, int c)
-{
-    do {
-        if ((unsigned)*s == (unsigned)c)
-            return s;
-
-    } while (*(++s) != NUL);
-
-    return NULL;
-}
-
-char*
-strrchr( char const *s, int c)
-{
-    char const *e = s + strlen(s);
-
-    for (;;) {
-        if (--e < s)
-            break;
-
-        if ((unsigned)*e == (unsigned)c)
-            return e;
-    }
-    return NULL;
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-file-style: "stroustrup"
- * indent-tabs-mode: nil
- * End:
- * end of compat/strsignal.c */

libopts/strdup.c

@@ -1,19 +0,0 @@
-/*
- * Platforms without strdup ?!?!?!
- */
-
-static char *
-strdup( char const *s )
-{
-    char *cp;
-
-    if (s == NULL)
-        return NULL;
-
-    cp = (char *) AGALOC((unsigned) (strlen(s)+1), "strdup");
-
-    if (cp != NULL)
-        (void) strcpy(cp, s);
-
-    return cp;
-}

libopts/streqvcmp.c

@@ -1,7 +1,7 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.10 2007/04/28 22:19:23 bkorb Exp $
- * Time-stamp:      "2006-07-26 18:25:53 bkorb"
+ *  $Id: streqvcmp.c,v 4.12 2007/07/04 21:36:38 bkorb Exp $
+ * Time-stamp:      "2007-07-04 11:35:12 bkorb"
  *
  *  String Equivalence Comparison
  *
@@ -9,52 +9,27 @@
  *  character before comparison.  In processing long option names,
  *  the characters "-", "_" and "^" all need to be equivalent
  *  (because they are treated so by different development environments).
- */
-
-/*
- *  Automated Options copyright 1992-2007 Bruce Korb
- *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
- *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
- *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
- *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
-
-/*
+ *
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
+ *
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
+ *
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
+ *
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
+ *
+ *  These files have the following md5sums:
+ *
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
+ *
  * This array is designed for mapping upper and lower case letter
  * together for a case independent comparison.  The mappings are
  * based upon ascii character sequences.

libopts/text_mmap.c

@@ -1,7 +1,27 @@
 /*
- * $Id: text_mmap.c,v 4.15 2006/11/27 01:52:23 bkorb Exp $
+ * $Id: text_mmap.c,v 4.17 2007/07/04 21:36:38 bkorb Exp $
  *
- * Time-stamp:      "2006-09-10 14:50:04 bkorb"
+ * Time-stamp:      "2007-07-04 11:35:49 bkorb"
+ *
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
+ *
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
+ *
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
+ *
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
+ *
+ *  These files have the following md5sums:
+ *
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 #ifndef MAP_ANONYMOUS

libopts/tokenize.c

@@ -1,25 +1,28 @@
 /*
  *  This file defines the string_tokenize interface
- * Time-stamp:      "2006-06-24 15:27:49 bkorb"
+ * Time-stamp:      "2007-07-04 10:09:43 bkorb"
  *
- *  string_tokenize copyright 2005 Bruce Korb
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- *  string_tokenize is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- *  string_tokenize is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with string_tokenize; if not, write to:
- *             The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
+ *
+ *  These files have the following md5sums:
+ *
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>

libopts/usage.c

@@ -1,7 +1,7 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.15 2007/04/28 22:19:23 bkorb Exp $
- * Time-stamp:      "2007-04-15 11:02:46 bkorb"
+ *  usage.c  $Id: usage.c,v 4.20 2007/07/16 00:17:31 bkorb Exp $
+ * Time-stamp:      "2007-07-15 09:43:04 bkorb"
  *
  *  This module implements the default usage procedure for
  *  Automated Options.  It may be overridden, of course.
@@ -13,46 +13,25 @@
  */
 
 /*
- *  Automated Options copyright 1992-2007 Bruce Korb
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- *  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  These files have the following md5sums:
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
- *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 #define OPTPROC_L_N_S  (OPTPROC_LONGOPT | OPTPROC_SHORTOPT)
@@ -187,9 +166,32 @@ optionUsage(
      *  Paged usage will preset option_usage_fp to an output file.
      *  If it hasn't already been set, then set it to standard output
      *  on successful exit (help was requested), otherwise error out.
+     *
+     *  Test the version before obtaining pzFullUsage or pzShortUsage.
+     *  These fields do not exist before revision 30.
      */
-    if (option_usage_fp == NULL)
-        option_usage_fp = (actual_exit_code != EXIT_SUCCESS) ? stderr : stdout;
+    {
+        char const * pz;
+
+        if (actual_exit_code == EXIT_SUCCESS) {
+            pz = (pOptions->structVersion >= 30 * 4096)
+                ? pOptions->pzFullUsage : NULL;
+
+            if (option_usage_fp == NULL)
+                option_usage_fp = stdout;
+        } else {
+            pz = (pOptions->structVersion >= 30 * 4096)
+                ? pOptions->pzShortUsage : NULL;
+
+            if (option_usage_fp == NULL)
+                option_usage_fp = stderr;
+        }
+
+        if (pz != NULL) {
+            fputs(pz, option_usage_fp);
+            exit(actual_exit_code);
+        }
+    }
 
     fprintf( option_usage_fp, pOptions->pzUsageTitle, pOptions->pzProgName );
 
@@ -487,20 +489,18 @@ printOneUsage(
          *  when the option argument is required, base the type string on the
          *  argument type.
          */
-        if (OPTST_GET_ARGTYPE(pOD->fOptState) == OPARG_TYPE_NONE) {
-            pzArgType = pAT->pzNo;
-
-        } else if (pOD->fOptState & OPTST_ARG_OPTIONAL) {
+        if (pOD->fOptState & OPTST_ARG_OPTIONAL) {
             pzArgType = pAT->pzOpt;
 
         } else switch (OPTST_GET_ARGTYPE(pOD->fOptState)) {
+        case OPARG_TYPE_NONE:        pzArgType = pAT->pzNo;   break;
         case OPARG_TYPE_ENUMERATION: pzArgType = pAT->pzKey;  break;
         case OPARG_TYPE_MEMBERSHIP:  pzArgType = pAT->pzKeyL; break;
         case OPARG_TYPE_BOOLEAN:     pzArgType = pAT->pzBool; break;
         case OPARG_TYPE_NUMERIC:     pzArgType = pAT->pzNum;  break;
         case OPARG_TYPE_HIERARCHY:   pzArgType = pAT->pzNest; break;
         case OPARG_TYPE_STRING:      pzArgType = pAT->pzStr;  break;
-        default:                     goto bogus_desc;         break;
+        default:                     goto bogus_desc;
         }
 
         snprintf( z, sizeof(z), pAT->pzOptFmt, pzArgType, pOD->pz_Name,

libopts/version.c

@@ -1,52 +1,35 @@
 
-/*  $Id: version.c,v 4.10 2007/04/28 22:19:23 bkorb Exp $
- * Time-stamp:      "2007-04-28 10:08:34 bkorb"
+/*  $Id: version.c,v 4.12 2007/07/04 21:36:39 bkorb Exp $
+ * Time-stamp:      "2007-07-04 13:42:04 bkorb"
  *
  *  This module implements the default usage procedure for
  *  Automated Options.  It may be overridden, of course.
  */
 
 static char const zAOV[] =
-    "Automated Options version %s, copyright (c) 1999-2007 Bruce Korb\n";
+    "Automated Options version %s\n"
+    "\tcopyright (c) 1999-2007 Bruce Korb - all rights reserved\n";
 
-/*  Automated Options is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  Automated Options is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Automated Options.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             51 Franklin Street, Fifth Floor,
- *             Boston, MA  02110-1301, USA.
+/*
+ *  This file is part of AutoOpts, a companion to AutoGen.
+ *  AutoOpts is free software.
+ *  AutoOpts is copyright (c) 1992-2007 by Bruce Korb - all rights reserved
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of AutoOpts.
+ *  AutoOpts is available under any one of two licenses.  The license
+ *  in use must be one of these two and the choice is under the control
+ *  of the user of the license.
  *
- * The exception is that, if you link the AutoOpts library with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the AutoOpts library code into it.
+ *   The GNU Lesser General Public License, version 3 or later
+ *      See the files "COPYING.lgplv3" and "COPYING.gplv3"
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ *   The Modified Berkeley Software Distribution License
+ *      See the file "COPYING.mbsd"
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name AutoOpts.  If you copy code from other sources under the
- * General Public License into a copy of AutoOpts, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ *  These files have the following md5sums:
  *
- * If you write modifications of your own for AutoOpts, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
+ *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
 /* = = = START-STATIC-FORWARD = = = */

libopts/windows-config.h

@@ -1,130 +0,0 @@
-
-/*
- * Time-stamp:        "2006-10-14 14:55:09 bkorb"
- *             by: bkorb
- * Last Committed:    $Date: 2007/04/28 22:19:23 $
- */
-#ifndef WINDOWS_CONFIG_HACKERY
-#define WINDOWS_CONFIG_HACKERY 1
-
-/*
- * The definitions below have been stolen from NTP's config.h for Windows.
- * However, they may be kept here in order to keep libopts independent from
- * the NTP project.
- */
-#ifndef __windows__
-#  define __windows__ 4
-#endif
-
-/*
- * Miscellaneous functions that Microsoft maps
- * to other names
- *
- * #define inline __inline
- * #define vsnprintf _vsnprintf
- */
-#define snprintf _snprintf
-/*
- * #define stricmp _stricmp
- * #define strcasecmp _stricmp
- * #define isascii __isascii
- * #define finite _finite
- * #define random      rand
- * #define srandom     srand
- */
-
-#define SIZEOF_INT   4
-#define SIZEOF_CHARP 4
-#define SIZEOF_LONG  4
-#define SIZEOF_SHORT 2
-
-typedef unsigned long uintptr_t;
-
-/*
- * # define HAVE_NET_IF_H
- * # define QSORT_USES_VOID_P
- * # define HAVE_SETVBUF
- * # define HAVE_VSPRINTF
- * # define HAVE_SNPRINTF
- * # define HAVE_VSNPRINTF
- * # define HAVE_PROTOTYPES             /* from ntpq.mak * /
- * # define HAVE_MEMMOVE
- * # define HAVE_TERMIOS_H
- * # define HAVE_ERRNO_H
- * # define HAVE_STDARG_H
- * # define HAVE_NO_NICE
- * # define HAVE_MKTIME
- * # define TIME_WITH_SYS_TIME
- * # define HAVE_IO_COMPLETION_PORT
- * # define ISC_PLATFORM_NEEDNTOP
- * # define ISC_PLATFORM_NEEDPTON
- * # define NEED_S_CHAR_TYPEDEF
- * # define USE_PROTOTYPES              /* for ntp_types.h * /
- *
- * #define ULONG_CONST(a) a ## UL
- */
-
-#define HAVE_LIMITS_H   1
-#define HAVE_STRDUP     1
-#define HAVE_STRCHR     1
-#define HAVE_FCNTL_H    1
-
-/*
- * VS.NET's version of wspiapi.h has a bug in it
- * where it assigns a value to a variable inside
- * an if statement. It should be comparing them.
- * We prevent inclusion since we are not using this
- * code so we don't have to see the warning messages
- */
-#ifndef _WSPIAPI_H_
-#define _WSPIAPI_H_
-#endif
-
-/* Prevent inclusion of winsock.h in windows.h */
-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_
-#endif
-
-#ifndef __RPCASYNC_H__
-#define __RPCASYNC_H__
-#endif
-
-/* Include Windows headers */
-#include <windows.h>
-#include <winsock2.h>
-#include <limits.h>
-
-/*
- * Compatibility declarations for Windows, assuming SYS_WINNT
- * has been defined.
- */
-#define strdup  _strdup
-#define stat    _stat       /* struct stat from <sys/stat.h> */
-#define unlink  _unlink
-#define fchmod( _x, _y );
-#define ssize_t SSIZE_T
-
-#include <io.h>
-#define open    _open
-#define close   _close
-#define read    _read
-#define write   _write
-#define lseek   _lseek
-#define pipe    _pipe
-#define dup2    _dup2
-
-#define O_RDWR     _O_RDWR
-#define O_RDONLY   _O_RDONLY
-#define O_EXCL     _O_EXCL
-
-#ifndef S_ISREG
-#  define S_IFREG _S_IFREG
-#  define       S_ISREG(mode)   (((mode) & S_IFREG) == S_IFREG)
-#endif
-
-#ifndef S_ISDIR
-#  define S_IFDIR _S_IFDIR
-#  define       S_ISDIR(mode)   (((mode) & S_IFDIR) == S_IFDIR)
-#endif
-
-#endif /* WINDOWS_CONFIG_HACKERY */

scripts/Makefile.in

@@ -37,7 +37,7 @@ noinst_PROGRAMS = man2html$(EXEEXT)
 subdir = scripts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

src/Makefile.in

@@ -44,7 +44,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/defines.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

src/bridge.c

@@ -1,4 +1,4 @@
-/* $Id: bridge.c 1795 2007-04-11 04:51:58Z aturner $ */
+/* $Id: bridge.c 1898 2007-08-25 05:10:51Z aturner $ */
 
 /*
  * Copyright (c) 2001-2005 Aaron Turner.
@@ -59,7 +59,7 @@ extern int debug;
 static int live_callback(struct live_data_t *,
                          struct pcap_pkthdr *, const u_char *);
 
-/*
+/**
  * First, prep our RB Tree which tracks where each (source)
  * MAC really lives so we don't create really nasty network
  * storms.  
@@ -77,12 +77,18 @@ rbmacsrc_comp(struct macsrc_t *a, struct macsrc_t *b)
 RB_PROTOTYPE(macsrc_tree, macsrc_t, node, rbmacsrc_comp)
 RB_GENERATE(macsrc_tree, macsrc_t, node, rbmacsrc_comp)
 
+/**
+ * redblack init
+ */
 void
 rbinit(void)
 {
     RB_INIT(&macsrc_root);
 }
 
+/**
+ * create a new node... Malloc's memory
+ */
 struct macsrc_t *
 new_node(void)
 {
@@ -95,10 +101,9 @@ new_node(void)
 }
 
 
-/*
+/**
  * main loop for bridging mode or unidir
  */
-
 void
 do_bridge(tcpedit_t *tcpedit, pcap_t * pcap1, pcap_t * pcap2)
 {
@@ -188,7 +193,7 @@ do_bridge(tcpedit_t *tcpedit, pcap_t * pcap1, pcap_t * pcap2)
 } /* do_bridge() */
 
 
-/*
+/**
  * This is the callback we use with pcap_dispatch to process
  * each packet recieved by libpcap on the two interfaces.
  */
@@ -321,7 +326,7 @@ live_callback(struct live_data_t *livedata, struct pcap_pkthdr *pkthdr,
 
 
     return (1);
-}                               /* live_callback() */
+} /* live_callback() */
 
 /*
  Local Variables:

src/common/Makefile.in

@@ -39,7 +39,7 @@ subdir = src/common
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

src/common/abort.c

@@ -1,4 +1,4 @@
-/* $Id: abort.c 1795 2007-04-11 04:51:58Z aturner $ */
+/* $Id: abort.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2005 Aaron Turner.
@@ -46,7 +46,7 @@ extern int debug;
 #endif
 
 
-/*
+/**
  * we've got a race condition, this is our workaround
  */
 void
@@ -57,7 +57,7 @@ catcher(int signo)
         didsig = 1;
 }
 
-/*
+/**
  * when we're sending only one packet at a time via <ENTER>
  * then there's no race and we can quit now
  * also called when didsig is set

src/common/cache.c

@@ -1,4 +1,4 @@
-/* $Id: cache.c 1837 2007-04-22 18:18:44Z aturner $ */
+/* $Id: cache.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2005 Aaron Turner.
@@ -50,7 +50,7 @@ extern int debug;
 
 static tcpr_cache_t *new_cache(void);
 
-/*
+/**
  * Takes a single char and returns a ptr to a string representation of the
  * 8 bits that make up that char.  Use BIT_STR() to print it out
  */
@@ -69,7 +69,7 @@ byte2bits(char byte, char *bitstring) {
 }
 #endif
 
-/*
+/**
  * simple function to read in a cache file created with tcpprep this let's us
  * be really damn fast in picking an interface to send the packet out returns
  * number of cache entries read
@@ -148,7 +148,7 @@ read_cache(char **cachedata, const char *cachefile, char **comment)
 }
 
 
-/*
+/**
  * writes out the cache file header, comment and then the
  * contents of *cachedata to out_file and then returns the number 
  * of cache entries written
@@ -235,7 +235,7 @@ write_cache(tcpr_cache_t * cachedata, const int out_file, COUNTER numpackets,
     return (packets);
 }
 
-/*
+/**
  * mallocs a new CACHE struct all pre-set to sane defaults
  */
 
@@ -249,7 +249,7 @@ new_cache(void)
     return (newcache);
 }
 
-/*
+/**
  * adds the cache data for a packet to the given cachedata
  */
 
@@ -339,7 +339,7 @@ add_cache(tcpr_cache_t ** cachedata, const int send, const tcpr_dir_t interface)
 }
 
 
-/*
+/**
  * returns the action for a given packet based on the CACHE
  */
 tcpr_dir_t

src/common/cidr.c

@@ -1,4 +1,4 @@
-/* $Id: cidr.c 1846 2007-04-27 23:28:06Z aturner $ */
+/* $Id: cidr.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2004 Aaron Turner.
@@ -51,7 +51,7 @@ extern int debug;
 
 static tcpr_cidr_t *cidr2cidr(char *);
 
-/*
+/**
  * prints to the given fd all the entries in mycidr
  */
 void
@@ -79,7 +79,7 @@ print_cidr(tcpr_cidr_t * mycidr)
     fprintf(stderr, "\n");
 }
 
-/*
+/**
  * deletes all entries in a cidr and destroys the datastructure
  */
 void
@@ -90,12 +90,12 @@ destroy_cidr(tcpr_cidr_t * cidr)
         if (cidr->next != NULL)
             destroy_cidr(cidr->next);
 
-    free(cidr);
+    safe_free(cidr);
     return;
 
 }
 
-/*
+/**
  * adds a new tcpr_cidr_t entry to cidrdata
  */
 void
@@ -118,7 +118,7 @@ add_cidr(tcpr_cidr_t ** cidrdata, tcpr_cidr_t ** newcidr)
     }
 }
 
-/*
+/**
  * takes in an IP and masklen, and returns a string in
  * cidr format: x.x.x.x/y.  This malloc's memory.
  */
@@ -146,7 +146,7 @@ ip2cidr(const unsigned long ip, const int masklen)
     return (network);
 }
 
-/*
+/**
  * Mallocs and sets to sane defaults a tcpr_cidr_t structure
  */
 
@@ -164,6 +164,9 @@ new_cidr(void)
     return (newcidr);
 }
 
+/**
+ * Creates a new tcpr_cidrmap_t structure.  Malloc's memory
+ */
 tcpr_cidrmap_t *
 new_cidr_map(void)
 {
@@ -178,11 +181,10 @@ new_cidr_map(void)
 }
 
 
-/*
+/**
  * Converts a single cidr (string) in the form of x.x.x.x/y into a
  * tcpr_cidr_t structure.  Will malloc the tcpr_cidr_t structure.
  */
-
 static tcpr_cidr_t *
 cidr2cidr(char *cidr)
 {
@@ -243,13 +245,12 @@ cidr2cidr(char *cidr)
     return NULL;
 }
 
-/*
+/**
  * parses a list of tcpr_cidr_t's input from the user which should be in the form
  * of x.x.x.x/y,x.x.x.x/y...
  * returns 1 for success, or fails to return on failure (exit 1)
  * since we use strtok to process cidr, it gets zeroed out.
  */
-
 int
 parse_cidr(tcpr_cidr_t ** cidrdata, char *cidrin, char *delim)
 {
@@ -278,7 +279,7 @@ parse_cidr(tcpr_cidr_t ** cidrdata, char *cidrin, char *delim)
 
 }
 
-/*
+/**
  * parses a pair of IP addresses: <IP1>:<IP2> and processes it like:
  * -N 0.0.0.0/0:<IP1> -N 0.0.0.0/0:<IP2>
  * returns 1 for success or returns 0 on failure
@@ -311,12 +312,12 @@ parse_endpoints(tcpr_cidrmap_t ** cidrmap1, tcpr_cidrmap_t ** cidrmap2, const ch
     if (! parse_cidr_map(cidrmap2, newmap))
         return 0;
     
-    free(string);
+    safe_free(string);
     return 1; /* success */
 }
 
 
-/*
+/**
  * parses a list of tcpr_cidrmap_t's input from the user which should be in the form
  * of x.x.x.x/y:x.x.x.x/y,...
  * returns 1 for success, or returns 0 on failure
@@ -370,11 +371,11 @@ parse_cidr_map(tcpr_cidrmap_t **cidrmap, const char *optarg)
         ptr->from->next = NULL;
 
     }
-    free(string);
+    safe_free(string);
     return 1; /* success */
 }
 
-/* 
+/**
  * checks to see if the ip address is in the cidr
  * returns 1 for true, 0 for false
  */
@@ -420,7 +421,7 @@ ip_in_cidr(const tcpr_cidr_t * mycidr, const unsigned long ip)
 }
 
 
-/*
+/**
  * iterates over cidrdata to find if a given ip matches
  * returns 1 for true, 0 for false
  */
@@ -462,7 +463,7 @@ check_ip_cidr(tcpr_cidr_t * cidrdata, const unsigned long ip)
 }
 
 
-/*
+/**
  * cidr2ip takes a tcpr_cidr_t and a delimiter
  * and returns a string which lists all the IP addresses in the cidr
  * deliminated by the given char

src/common/err.c

@@ -1,4 +1,4 @@
-/* $Id: err.c 1814 2007-04-16 19:31:50Z aturner $ */
+/* $Id: err.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * err.c
@@ -55,6 +55,9 @@
 extern int debug;
 #endif
 
+/**
+ * writes a notice message to stderr.  Always forces a newline
+ */
 void
 notice(const char *fmt, ...)
 {
@@ -68,6 +71,12 @@ notice(const char *fmt, ...)
     fflush(NULL);
 }
 
+/**
+ * Inner call to dbgx() which prints the function, line & function along
+ * with the message to stderr.  Always forces a newline.
+ * 
+ * You don't actually want to call this!  use dbgx() instead!
+ */
 void
 _our_verbose_dbgx(int dbg_level, const char *fmt, const char *function, 
         const int line, const char *file, ...)
@@ -93,6 +102,12 @@ _our_verbose_dbgx(int dbg_level, const char *fmt, const char *function,
 #endif
 }
 
+/**
+ * Inner call to dbg() which prints the function, line & file along
+ * with the message to stderr.  Always forces a newline.
+ * 
+ * You don't actually want to call this!  use dbg() instead!
+ */
 void
 _our_verbose_dbg(int dbg_level, const char *string, const char *function, const int line, const char *file)
 {
@@ -109,6 +124,10 @@ _our_verbose_dbg(int dbg_level, const char *string, const char *function, const
 }
 
 
+/**
+ * Inner call to err() which when in DEBUG mode, prints the function, line & file
+ * along with the actual error message to stderr.  Alawys forces a newline
+ */
 #ifdef DEBUG
 void
 _our_verbose_err(int eval, const char *string, const char *function, const int line, const char *file) {
@@ -125,6 +144,10 @@ _our_verbose_err(int eval, const char *string) {
     exit(eval);
 }
 
+/**
+ * Inner call to warn() which when in DEBUG mode, prints the function, line & file
+ * along with the actual warning to stderr.  Alawys forces a newline
+ */
 #ifdef DEBUG
 void
 _our_verbose_warn(const char *string, const char *function, const int line, const char *file) {
@@ -139,6 +162,10 @@ _our_verbose_warn(const char *string) {
     fprintf(stderr, "Warning: %s\n", string);
 }
 
+/**
+ * Inner call to errx() which when in DEBUG mode, prints the function, line & file
+ * along with the actual error message to stderr.  Alawys forces a newline
+ */
 #ifdef DEBUG
 void
 _our_verbose_errx(int eval, const char *fmt, const char *function, const int line, const char *file, ...) {
@@ -164,6 +191,10 @@ _our_verbose_errx(int eval, const char *fmt, ...) {
     exit(eval);
 }
 
+/**
+ * Inner call to warnx() which when in DEBUG mode, prints the function, line & file
+ * along with the actual warning to stderr.  Alawys forces a newline
+ */
 #ifdef DEBUG
 void
 _our_verbose_warnx(const char *fmt, const char *function, const int line, const char *file, ...) {

src/common/fakepcap.c

@@ -1,4 +1,4 @@
-/* $Id: fakepcap.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: fakepcap.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2004 Aaron Turner.
@@ -45,6 +45,10 @@
 
 #ifndef HAVE_DLT_VAL_TO_DESC
 
+/**
+ * replacement for libpcap's pcap_datalink_val_to_description()
+ * which doesn't exist in all versions
+ */
 const char *
 pcap_datalink_val_to_description(int dlt)
 {
@@ -55,6 +59,10 @@ pcap_datalink_val_to_description(int dlt)
 
 }
 
+/**
+ * replacement for libpcap's pcap_datalink_val_to_name()
+ * which doesn't exist in all versions
+ */
 const char *
 pcap_datalink_val_to_name(int dlt)
 {

src/common/fakepcapnav.c

@@ -1,4 +1,4 @@
-/* $Id: fakepcapnav.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: fakepcapnav.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2005 Aaron Turner.
@@ -43,14 +43,17 @@
 
 #ifndef HAVE_PCAPNAV
 
-/* pcapnav_init does nothing!  */
+/**
+ * pcapnav_init does nothing!  
+ */
 void
 pcapnav_init(void)
 {
     return;
 }
 
-/* pcapnav_open_offline opens a pcap file, 
+/**
+ * pcapnav_open_offline opens a pcap file, 
  * and creates the struct for our use  
  */
 pcapnav_t *
@@ -72,15 +75,19 @@ pcapnav_open_offline(const char *filename)
     return (pcapnav);
 }
 
-/* closes our pcap file and free's the pcapnav */
+/**
+ * closes our pcap file and free's the pcapnav 
+ */
 void
 pcapnav_close(pcapnav_t * pcapnav)
 {
     pcap_close(pcapnav->pcap);
-    free(pcapnav);
+    safe_free(pcapnav);
 }
 
-/* returns the pcap_t data struct */
+/**
+ * returns the pcap_t data struct 
+ */
 pcap_t *
 pcapnav_pcap(pcapnav_t * pcapnav)
 {

src/common/fakepoll.c

@@ -69,6 +69,10 @@ static void FAKEPOLL(int stop)
 
 #include "util.h"
 
+/**
+ * custom version of poll() using select() in the backend
+ * only used if you don't actually have poll on your system.
+ */
 int
 poll(struct pollfd *ufds, unsigned int nfds, int timeout)
 {

src/common/get.c

@@ -1,4 +1,4 @@
-/* $Id: get.c 1848 2007-04-30 20:59:57Z aturner $ */
+/* $Id: get.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2005 Aaron Turner.
@@ -52,7 +52,7 @@ extern int debug;
 extern const char pcap_version[];
 #endif
 
-/*
+/**
  * Depending on what version of libpcap/WinPcap there are different ways to get the
  * version of the libpcap/WinPcap library.  This presents a unified way to get that
  * information.
@@ -72,7 +72,7 @@ get_pcap_version(void)
     strtok_r(version, " ", &last);
     strtok_r(NULL, " ", &last);
     strlcpy(ourver, strtok_r(NULL, " ", &last), 255);
-    free(version);
+    safe_free(version);
     return ourver;
 #elif defined HAVE_PCAP_VERSION
     return pcap_version;
@@ -83,7 +83,7 @@ get_pcap_version(void)
 
 
 
-/*
+/**
  * returns the L2 protocol (IP, ARP, etc)
  * or 0 for error
  */
@@ -136,7 +136,7 @@ get_l2protocol(const u_char *pktdata, const int datalen, const int datalink)
 
 }
 
-/*
+/**
  * returns the length in number of bytes of the L2 header, or -1 on error
  */
 int
@@ -184,7 +184,7 @@ get_l2len(const u_char *pktdata, const int datalen, const int datalink)
     return -1; /* we shouldn't get here */
 }
 
-/*
+/**
  * returns a ptr to the ip header + data or NULL if it's not IP
  * we may use an extra buffer for the ip header (and above)
  * on stricly aligned systems where the layer 2 header doesn't
@@ -244,7 +244,7 @@ get_ipv4(const u_char *pktdata, int datalen, int datalink, u_char **newbuff)
     return ip_hdr;
 }
 
-/*
+/**
  * returns a pointer to the layer 4 header which is just beyond the IP header
  */
 void *
@@ -258,7 +258,7 @@ get_layer4(const ipv4_hdr_t * ip_hdr)
     return ((void *)ptr);
 }
 
-/*
+/**
  * get_name2addr4()
  * stolen from LIBNET since I didn't want to have to deal with 
  * passing a libnet_t around.  Returns 0xFFFFFFFF (255.255.255.255)
@@ -336,6 +336,10 @@ get_name2addr4(const char *hostname, u_int8_t dnslookup)
     }
 }
 
+/**
+ * Generic wrapper around inet_ntop() and inet_ntoa() depending on whichever
+ * is available on your system
+ */
 const char *
 get_addr2name4(const u_int32_t ip, u_int8_t dnslookup)
 {

src/common/interface.c

@@ -1,4 +1,4 @@
-/* $Id: interface.c 1839 2007-04-22 22:22:54Z aturner $ */
+/* $Id: interface.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2007 Aaron Turner.
@@ -40,7 +40,7 @@
 #include "common.h"
 #include "interface.h"
 
-/*
+/**
  * Method takes a user specified device name and returns
  * the canonical name for that device.  This allows me to 
  * create named interface aliases on platforms like Windows
@@ -75,6 +75,9 @@ get_interface(interface_list_t *list, const char *alias)
     return(NULL);
 }
 
+/** 
+ * Get all available interfaces as an interface_list *
+ */
 interface_list_t *
 get_interface_list(void)
 {
@@ -109,11 +112,14 @@ get_interface_list(void)
         list_ptr->next = (interface_list_t *)safe_malloc(sizeof(interface_list_t));
         list_ptr = list_ptr->next;
     }
-    free(list_ptr); /* free the last entry which was never used */
+    safe_free(list_ptr); /* free the last entry which was never used */
     pcap_freealldevs(pcap_if);
     return(list_head);
 }
 
+/**
+ * Prints all the available interfaces found by get_interface_list()
+ */
 void
 list_interfaces(interface_list_t *list)
 {

src/common/list.c

@@ -1,4 +1,4 @@
-/* $Id: list.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: list.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2004 Aaron Turner.
@@ -49,6 +49,9 @@
 #include <errno.h>
 
 
+/**
+ * Creates a new tcpr_list entry.  Malloc's memory.
+ */
 tcpr_list_t *
 new_list()
 {
@@ -58,7 +61,7 @@ new_list()
     return (newlist);
 }
 
-/*
+/**
  * Processes a string (ourstr) containing the list in human readable
  * format and places the data in **list and finally returns 1 for 
  * success, 0 for fail.
@@ -153,7 +156,7 @@ parse_list(tcpr_list_t ** listdata, char *ourstr)
 
 
 
-/*
+/**
  * Checks to see if the given integer exists in the LIST.
  */
 tcpr_dir_t
@@ -190,7 +193,7 @@ check_list(tcpr_list_t * list, COUNTER value)
 }
 
 
-/*
+/**
  * Free's all the memory associated with the given LIST
  */
 void
@@ -201,7 +204,7 @@ free_list(tcpr_list_t * list)
     if (list->next != NULL)
         free_list(list->next);
 
-    free(list);
+    safe_free(list);
 }
 
 /*

src/common/mac.c

@@ -1,4 +1,4 @@
-/* $Id: mac.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: mac.c 1897 2007-08-25 04:57:38Z aturner $ */
 /* Copyright 2004-2005 Aaron Turner 
  * All rights reserved.
  *
@@ -38,7 +38,7 @@
 
 #include "mac.h"
 
-/*
+/**
  * converts a string representation of a MAC address, based on 
  * non-portable ether_aton() 
  */
@@ -67,7 +67,7 @@ mac2hex(const char *mac, u_char *dst, int len)
     }
 }
 
-/*
+/**
  * converts a string representation of TWO MAC addresses, which
  * are comma deliminated into two hex values.  Either *first or *second 
  * can be NULL if there is nothing before or after the comma.
@@ -111,7 +111,7 @@ dualmac2hex(const char *dualmac, u_char *first, u_char *second, int len)
 
 }
 
-/*
+/**
  * Figures out if a MAC is listed in a comma delimited
  * string of MAC addresses.
  * returns TCPR_DIR_C2S if listed
@@ -148,7 +148,7 @@ macinstring(const char *macstring, const u_char *mac)
     }
 
 EXIT_MACINSTRING:
-    free(ourstring);
+    safe_free(ourstring);
 #ifdef DEBUG
     if (ret == TCPR_DIR_S2C)
        dbg(3, "Packet doesn't match any MAC addresses sending out secondary.\n");

src/common/sendpacket.c

@@ -1,4 +1,4 @@
-/* $Id: sendpacket.c 1863 2007-05-04 05:50:23Z aturner $ */
+/* $Id: sendpacket.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2006 Aaron Turner.
@@ -166,7 +166,7 @@ static void sendpacket_seterr(sendpacket_t *sp, const char *fmt, ...);
 extern volatile int didsig;
 
 
-/*
+/**
  * returns number of bytes sent on success or -1 on error
  * Note: it is theoretically possible to get a return code >0 and < len
  * which for most people would be considered an error (the packet wasn't fully sent)
@@ -266,7 +266,11 @@ TRY_SEND_AGAIN:
     return retcode;
 }
 
-
+/**
+ * Open the given network device name and returns a sendpacket_t struct
+ * pass the error buffer (in case there's a problem) and the direction
+ * that this interface represents
+ */
 sendpacket_t *
 sendpacket_open(const char *device, char *errbuf, tcpr_dir_t direction)
 {
@@ -291,7 +295,9 @@ sendpacket_open(const char *device, char *errbuf, tcpr_dir_t direction)
     return sp;
 }
 
-
+/**
+ * Get packet stats for the given sendpacket_t
+ */
 char *
 sendpacket_getstat(sendpacket_t *sp)
 {
@@ -309,16 +315,19 @@ sendpacket_getstat(sendpacket_t *sp)
     return(buf);
 }
 
+/**
+ * close the given sendpacket
+ */
 int
 sendpacket_close(sendpacket_t *sp)
 {
     assert(sp);
 
-    free(sp);
+    safe_free(sp);
     return 0;
 }
 
-/*
+/**
  * returns the Layer 2 address of the interface current 
  * open.  on error, return NULL
  */
@@ -344,7 +353,7 @@ sendpacket_get_hwaddr(sendpacket_t *sp)
     return addr;
 }
 
-/*
+/**
  * returns the error string
  */
 char *
@@ -354,7 +363,7 @@ sendpacket_geterr(sendpacket_t *sp)
     return sp->errbuf;
 }
 
-/*
+/**
  * Set's the error string
  */
 static void
@@ -374,6 +383,9 @@ sendpacket_seterr(sendpacket_t *sp, const char *fmt, ...)
 
 
 #if defined HAVE_PCAP_INJECT || defined HAVE_PCAP_SENDPACKET
+/**
+ * Inner sendpacket_open() method for using libpcap
+ */
 static sendpacket_t *
 sendpacket_open_pcap(const char *device, char *errbuf)
 {
@@ -406,6 +418,9 @@ sendpacket_open_pcap(const char *device, char *errbuf)
     return sp;
 }
 
+/**
+ * Get the hardware MAC address for the given interface using libpcap
+ */
 static struct tcpr_ether_addr *
 sendpacket_get_hwaddr_pcap(sendpacket_t *sp)
 {
@@ -416,6 +431,9 @@ sendpacket_get_hwaddr_pcap(sendpacket_t *sp)
 #endif /* HAVE_PCAP_INJECT || HAVE_PCAP_SENDPACKET */
 
 #if defined HAVE_LIBNET
+/**
+ * Inner sendpacket_open() method for using libnet
+ */
 static sendpacket_t * 
 sendpacket_open_libnet(const char *device, char *errbuf)
 {
@@ -436,6 +454,9 @@ sendpacket_open_libnet(const char *device, char *errbuf)
     return sp;    
 }
 
+/**
+ * Get the hardware MAC address for the given interface using libnet
+ */
 static struct tcpr_ether_addr *
 sendpacket_get_hwaddr_libnet(sendpacket_t *sp)
 {
@@ -455,6 +476,9 @@ sendpacket_get_hwaddr_libnet(sendpacket_t *sp)
 #endif /* HAVE_LIBNET */
 
 #if defined HAVE_PF_PACKET
+/**
+ * Inner sendpacket_open() method for using Linux's PF_PACKET
+ */
 static sendpacket_t *
 sendpacket_open_pf(const char *device, char *errbuf)
 {
@@ -554,7 +578,9 @@ sendpacket_open_pf(const char *device, char *errbuf)
     return sp;
 }
 
-/* get the interface index (necessary for sending packets w/ PF_PACKET) */
+/** 
+ * get the interface index (necessary for sending packets w/ PF_PACKET) 
+ */
 static int
 get_iface_index(int fd, const int8_t *device, char *errbuf) {
     struct ifreq ifr;
@@ -570,9 +596,8 @@ get_iface_index(int fd, const int8_t *device, char *errbuf) {
     return ifr.ifr_ifindex;
 }              
 
-/*
- * get's the hardware address via Linux's PF packet
- * interface
+/**
+ * get's the hardware address via Linux's PF packet interface
  */
 struct tcpr_ether_addr *
 sendpacket_get_hwaddr_pf(sendpacket_t *sp)
@@ -610,6 +635,9 @@ sendpacket_get_hwaddr_pf(sendpacket_t *sp)
 #endif /* HAVE_PF_PACKET */
 
 #if defined HAVE_BPF
+/**
+ * Inner sendpacket_open() method for using BSD's BPF interface
+ */
 static sendpacket_t *
 sendpacket_open_bpf(const char *device, char *errbuf)
 {
@@ -725,6 +753,9 @@ sendpacket_open_bpf(const char *device, char *errbuf)
     return sp; 
 }
 
+/**
+ * Get the interface hardware MAC address when using BPF
+ */
 struct tcpr_ether_addr *
 sendpacket_get_hwaddr_bpf(sendpacket_t *sp)
 {
@@ -752,7 +783,7 @@ sendpacket_get_hwaddr_bpf(sendpacket_t *sp)
 
     if (sysctl(mib, 6, buf, &len, NULL, 0) == -1) {
         sendpacket_seterr(sp, "%s(): sysctl(): %s", __func__, strerror(errno));
-        free(buf);
+        safe_free(buf);
         return NULL;
     }
     
@@ -767,13 +798,14 @@ sendpacket_get_hwaddr_bpf(sendpacket_t *sp)
             }
         }
     }
-    free(buf);
+    safe_free(buf);
     return(&sp->ether);
 }
 
 #endif /* HAVE_BPF */
 
-/*
+/**
+ * Get the DLT type of the opened sendpacket
  * Return -1 if we can't figure it out, else return the DLT_ value
  */
 int 

src/common/services.c

@@ -1,4 +1,4 @@
-/* $Id: services.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: services.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2004 Aaron Turner.
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-/*
+/**
  * parses /etc/services so we know which ports are service ports
  */
 void

src/common/svn_version.c

@@ -1,4 +1,4 @@
-const char SVN_Version[] = "1887";
+const char SVN_Version[] = "1902";
 const char *svn_version(void) {
 	return SVN_Version;
 }

src/common/tcpdump.c

@@ -1,4 +1,4 @@
-/* $Id: tcpdump.c 1798 2007-04-14 20:49:51Z aturner $ */
+/* $Id: tcpdump.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2004 Aaron Turner.
@@ -69,7 +69,7 @@ char *options_vec[OPTIONS_VEC_SIZE];
 static int tcpdump_fill_in_options(char *opt);
 static int can_exec(const char *filename);
 
-/*
+/**
  * given a packet, print a decode of via tcpdump
  */
 int
@@ -143,7 +143,7 @@ tcpdump_print(tcpdump_t *tcpdump, struct pcap_pkthdr *pkthdr, const u_char *data
     return TRUE;
 }
 
-/*
+/**
  * init our tcpdump handle using the given pcap handle
  * Basically, this starts up tcpdump as a child and communicates
  * to it via a pair of sockets (stdout/stdin)
@@ -256,7 +256,9 @@ tcpdump_open(tcpdump_t *tcpdump, pcap_t *pcap)
     return TRUE;
 }
 
-/* shutdown tcpdump */
+/**
+ * shutdown tcpdump 
+ */
 void
 tcpdump_close(tcpdump_t *tcpdump)
 {
@@ -280,7 +282,9 @@ tcpdump_close(tcpdump_t *tcpdump)
     tcpdump->outfd = 0;
 }
 
-/* forcefully kill tcpdump */
+/** 
+ * forcefully kill tcpdump 
+ */
 void
 tcpdump_kill(tcpdump_t *tcpdump)
 {
@@ -295,12 +299,11 @@ tcpdump_kill(tcpdump_t *tcpdump)
 }
 
 
-/* 
+/**
  * copy the string of args (*opt) to the vector (**opt_vec)
  * for a max of opt_len.  Returns the number of options
  * in the vector
  */
-
 static int
 tcpdump_fill_in_options(char *opt)
 {
@@ -358,7 +361,9 @@ tcpdump_fill_in_options(char *opt)
 }
 
 
-/* can we exec the given file? */
+/**
+ * can we exec the given file? 
+ */
 static int
 can_exec(const char *filename)
 {

src/common/timer.c

@@ -1,4 +1,4 @@
-/* $Id: timer.c 1814 2007-04-16 19:31:50Z aturner $ */
+/* $Id: timer.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2007 Aaron Turner.
@@ -40,7 +40,9 @@
 
 /* Miscellaneous timeval routines */
 
-/* Divide tvp by div, storing the result in tvp */
+/**
+ * Divide tvp by div, storing the result in tvp 
+ */
 void
 timerdiv(struct timeval *tvp, float div)
 {

src/common/utils.c

@@ -1,4 +1,4 @@
-/* $Id: utils.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: utils.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2005 Aaron Turner.
@@ -43,7 +43,7 @@
 extern int debug;
 #endif
 
-/* 
+/**
  * this is wrapped up in a #define safe_malloc
  * This function, detects failures to malloc memory and zeros out the
  * memory before returning
@@ -66,10 +66,12 @@ _our_safe_malloc(size_t len, const char *funcname, const int line, const char *f
     return (void *)ptr;
 }
 
-/* 
+/**
  * this is wrapped up in a #define safe_realloc
  * This function, detects failures to realloc memory and zeros
- * out the NEW memory if len > current len
+ * out the NEW memory if len > current len.  As always, remember
+ * to use it as:
+ * ptr = safe_realloc(ptr, size)
  */
 void *
 _our_safe_realloc(void *ptr, size_t len, const char *funcname, const int line, const char *file)
@@ -84,7 +86,7 @@ _our_safe_realloc(void *ptr, size_t len, const char *funcname, const int line, c
     return ptr;
 }
 
-/* 
+/**
  * this is wrapped up in a #define safe_strdup
  * This function, detects failures to realloc memory
  */
@@ -103,8 +105,22 @@ _our_safe_strdup(const char *str, const char *funcname, const int line, const ch
 
 }
 
+/**
+ * calls free and sets to NULL.
+ */
+void
+_our_safe_free(void *ptr, const char *funcname, const int line, const char *file)
+{
+    if (ptr == NULL)
+        _our_verbose_errx(1, "Unable to call free on a NULL ptr", funcname, line, file);
+            
+    free(ptr);
+    ptr = NULL;
+}
 
-
+/**
+ * Print various packet statistics
+ */
 void
 packet_stats(struct timeval *begin, struct timeval *end, 
         COUNTER bytes_sent, COUNTER pkts_sent, COUNTER failed)
@@ -140,6 +156,11 @@ packet_stats(struct timeval *begin, struct timeval *end,
 
 }
 
+/**
+ * reads a hexstring in the format of xx,xx,xx,xx spits it back into *hex
+ * up to hexlen bytes.  Returns actual number of bytes returned.  On error
+ * it just calls errx() since all errors are fatal.
+ */
 int
 read_hexstring(const char *l2string, u_char *hex, const int hexlen)
 {
@@ -163,7 +184,7 @@ read_hexstring(const char *l2string, u_char *hex, const int hexlen)
     l2byte = strtok_r(string, ",", &token);
     sscanf(l2byte, "%x", &value);
     if (value > 0xff)
-        errx(1, "Invalid hex byte passed to -2: %s", l2byte);
+        errx(1, "Invalid hex string byte: %s", l2byte);
     databyte = (u_char) value;
     memcpy(&hex[numbytes], &databyte, 1);
 
@@ -176,21 +197,23 @@ read_hexstring(const char *l2string, u_char *hex, const int hexlen)
         }
         sscanf(l2byte, "%x", &value);
         if (value > 0xff)
-            errx(1, "Invalid hex byte passed to -2: %s", l2byte);
+            errx(1, "Invalid hex string byte: %s", l2byte);
         databyte = (u_char) value;
         memcpy(&hex[numbytes], &databyte, 1);
     }
 
     numbytes++;
 
-    free(string);
+    safe_free(string);
 
     dbgx(1, "Read %d bytes of hex data", numbytes);
     return (numbytes);
 }
 
-/* whorishly appropriated from fragroute-1.2 */
-
+/**
+ * whorishly appropriated from fragroute-1.2.  Parse a string and 
+ * create an argv[] array.
+ */
 int
 argv_create(char *p, int argc, char *argv[])
 {

src/common/utils.h

@@ -1,4 +1,4 @@
-/* $Id: utils.h 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: utils.h 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2001-2005 Aaron Turner.
@@ -53,6 +53,9 @@ void *_our_safe_realloc(void *ptr, size_t len, const char *, const int, const ch
 #define safe_strdup(x) _our_safe_strdup(x, __FUNCTION__, __LINE__, __FILE__)
 char *_our_safe_strdup(const char *str, const char *, const int, const char *);
 
+#define safe_free(x) _our_safe_free(x, __FUNCTION__, __LINE__, __FILE__)
+void _our_safe_free(void *ptr, const char *, const int, const char *);
+
 #define MAX_ARGS 128
 
 #endif

src/common/xX.c

@@ -1,4 +1,4 @@
-/* $Id: xX.c 1875 2007-07-10 06:04:22Z aturner $ */
+/* $Id: xX.c 1897 2007-08-25 04:57:38Z aturner $ */
 
 /*
  * Copyright (c) 2001-2004 Aaron Turner.
@@ -42,11 +42,10 @@
 #include "defines.h"
 #include "common.h"
 
-/*
+/**
  * returns the include_exclude_mode on success placing the CIDR or LIST in mybuf
  * but on failure, returns xXError
  */
-
 int
 parse_xX_str(tcpr_xX_t *xX, char *str, tcpr_bpf_t *bpf)
 {
@@ -116,12 +115,10 @@ parse_xX_str(tcpr_xX_t *xX, char *str, tcpr_bpf_t *bpf)
 
 
 
-/*
+/**
  * compare the source/destination IP address according to the mode
  * and return 1 if we should send the packet or 0 if not
  */
-
-
 int
 process_xX_by_cidr(int mode, tcpr_cidr_t * cidr, ipv4_hdr_t * ip_hdr)
 {

src/defines.h

@@ -146,11 +146,12 @@ enum tcpprep_mode {
 	REGEX_MODE,		/* single pass, regex */
 	PORT_MODE,		/* single pass, use src/dst ports to split */
 	MAC_MODE,		/* single pass, use src mac to split */
+	FIRST_MODE,     /* single pass, use first seen to split */
 	AUTO_MODE,		/* first pass through in auto mode */
 	ROUTER_MODE,	/* second pass through in router mode */
 	BRIDGE_MODE,	/* second pass through in bridge mode */
 	SERVER_MODE,	/* second pass through in server (router) mode */
-	CLIENT_MODE		/* second pass through in client (router) mode */
+	CLIENT_MODE 	/* second pass through in client (router) mode */
 };
 
 #define BROADCAST_MAC "\xFF\xFF\xFF\xFF\xFF\xFF"

src/defines.h.in

@@ -146,11 +146,12 @@ enum tcpprep_mode {
 	REGEX_MODE,		/* single pass, regex */
 	PORT_MODE,		/* single pass, use src/dst ports to split */
 	MAC_MODE,		/* single pass, use src mac to split */
+	FIRST_MODE,     /* single pass, use first seen to split */
 	AUTO_MODE,		/* first pass through in auto mode */
 	ROUTER_MODE,	/* second pass through in router mode */
 	BRIDGE_MODE,	/* second pass through in bridge mode */
 	SERVER_MODE,	/* second pass through in server (router) mode */
-	CLIENT_MODE		/* second pass through in client (router) mode */
+	CLIENT_MODE 	/* second pass through in client (router) mode */
 };
 
 #define BROADCAST_MAC "\xFF\xFF\xFF\xFF\xFF\xFF"

src/flow/Makefile.in

@@ -38,7 +38,7 @@ subdir = src/flow
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

src/flow/flowbuff.c

@@ -111,10 +111,10 @@ nextbuffpkt(struct session_t *node, u_int32_t len)
      * buffmem counter, the total buffer limit, and free the buffer header
      */
     if (node->sentbuff != NULL) {
-        free(node->sentbuff->packet);
+        safe_free(node->sentbuff->packet);
         node->buffmem -= node->sentbuff->len;
         options.totalbufflim += len;
-        free(node->sentbuff);
+        safe_free(node->sentbuff);
     }
 
     /* relink the list */

src/flow/flownode.c

@@ -132,7 +132,7 @@ newnode(_U_ char proto, u_char * key, ipv4_hdr_t * ip_hdr, void *l4)
 
         /* No new flows for non-Syn packets, unless NoSyn is set */
         if ((tcp_hdr->th_flags != TH_SYN) && (options.nosyn == 0)) {
-            free(newnode);
+            safe_free(newnode);
             warnx("We won't connect (%s:%d -> %s:%d) on non-Syn packets",
                   get_addr2name4(ip_hdr->ip_src.s_addr, DNS_DONT_RESOLVE),
                   ntohs(tcp_hdr->th_sport),
@@ -152,7 +152,7 @@ newnode(_U_ char proto, u_char * key, ipv4_hdr_t * ip_hdr, void *l4)
         newnode->wait = DONT_WAIT;
 
         if ((newnode->socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-            free(newnode);
+            safe_free(newnode);
             warnx("Unable to create new TCP socket: %s", strerror(errno));
             return (NULL);
         }
@@ -197,7 +197,7 @@ newnode(_U_ char proto, u_char * key, ipv4_hdr_t * ip_hdr, void *l4)
         newnode->wait = DONT_WAIT;
 
         if ((newnode->socket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
-            free(newnode);
+            safe_free(newnode);
             warnx("Unable to create new UDP socket: %s", strerror(errno));
             return (NULL);
         }
@@ -223,7 +223,7 @@ newnode(_U_ char proto, u_char * key, ipv4_hdr_t * ip_hdr, void *l4)
     if (connect
         (newnode->socket, (struct sockaddr *)&sa,
          sizeof(struct sockaddr_in)) < 0) {
-        free(newnode);
+        safe_free(newnode);
         warnx("Unable to connect to %s:%hu: %s", get_addr2name4(sa.sin_addr.s_addr, RESOLVE),
               ntohs(sa.sin_port), strerror(errno));
         return (NULL);

src/flowreplay.1

@@ -1,7 +1,7 @@
-.TH FLOWREPLAY 1 2007-07-19 "(flowreplay )" "Programmer's Manual"
+.TH FLOWREPLAY 1 2007-08-26 "(flowreplay )" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (flowreplay.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday July 19, 2007 at 09:17:46 AM PDT
+.\"  It has been AutoGen-ed  Sunday August 26, 2007 at 01:08:05 PM PDT
 .\"  From the definitions    flowreplay_opts.def
 .\"  and the template file   agman1.tpl
 .\"

src/flowreplay_opts.c

@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (flowreplay_opts.c)
  *  
- *  It has been AutoGen-ed  Thursday July 19, 2007 at 09:17:44 AM PDT
+ *  It has been AutoGen-ed  Sunday August 26, 2007 at 01:08:04 PM PDT
  *  From the definitions    flowreplay_opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 30:0:5 templates.
  */
 
 /*
@@ -538,7 +538,7 @@ contact Aaron Turner.\n\n\
 For more details, please see the Tcpreplay Manual at:\n\
 http://tcpreplay.synfin.net/trac/wiki/manual\n";
 #define zFullVersion    NULL
-/* extracted from /opt/local/share/autogen/optcode.tpl near line 408 */
+/* extracted from /opt/local/share/autogen/optcode.tpl near line 428 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -548,6 +548,8 @@ http://tcpreplay.synfin.net/trac/wiki/manual\n";
 # define translate_option_strings NULL
 #endif /* ENABLE_NLS */
 
+#define flowreplay_full_usage NULL
+#define flowreplay_short_usage NULL
 tOptions flowreplayOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -576,7 +578,8 @@ tOptions flowreplayOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       4 /* index of default opt */
     },
-    17 /* full option count */, 13 /* user option count */
+    17 /* full option count */, 13 /* user option count */,
+    flowreplay_full_usage, flowreplay_short_usage
 };
 
 /*
@@ -840,7 +843,7 @@ doOptLess_Help(
 
 }
 
-/* extracted from /opt/local/share/autogen/optcode.tpl near line 514 */
+/* extracted from /opt/local/share/autogen/optcode.tpl near line 537 */
 
 #if ENABLE_NLS
 #include <stdio.h>

src/flowreplay_opts.h

@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (flowreplay_opts.h)
  *  
- *  It has been AutoGen-ed  Thursday July 19, 2007 at 09:17:44 AM PDT
+ *  It has been AutoGen-ed  Sunday August 26, 2007 at 01:08:04 PM PDT
  *  From the definitions    flowreplay_opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 30:0:5 templates.
  */
 
 /*
@@ -55,7 +55,7 @@
  *  "AutoOpts" chapter.  Please refer to that doc for usage help.
  */
 #ifndef AUTOOPTS_FLOWREPLAY_OPTS_H_GUARD
-#define AUTOOPTS_FLOWREPLAY_OPTS_H_GUARD
+#define AUTOOPTS_FLOWREPLAY_OPTS_H_GUARD 1
 #include "config.h"
 #include <autoopts/options.h>
 
@@ -66,7 +66,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 118784
+#define AO_TEMPLATE_VERSION 122880
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -166,7 +166,7 @@ typedef enum {
                 flowreplayOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*flowreplayOptions.pUsageProc)( &flowreplayOptions, c )
-/* extracted from /opt/local/share/autogen/opthead.tpl near line 360 */
+/* extracted from /opt/local/share/autogen/opthead.tpl near line 380 */
 
 /* * * * * *
  *

src/send_packets.c

@@ -1,4 +1,4 @@
-/* $Id: send_packets.c 1874 2007-07-10 05:36:43Z aturner $ */
+/* $Id: send_packets.c 1898 2007-08-25 05:10:51Z aturner $ */
 
 /*
  * Copyright (c) 2001-2007 Aaron Turner.
@@ -73,8 +73,8 @@ static void do_sleep(struct timeval *time, struct timeval *last, int len, int ac
 static u_int32_t sleep_loop(struct timeval time);
 static u_char *get_next_packet(pcap_t *pcap, struct pcap_pkthdr *pkthdr, int file_idx, packet_cache_t **prev_packet);
 
-/*
- * the main loop function.  This is where we figure out
+/**
+ * the main loop function for tcpreplay.  This is where we figure out
  * what to do with each packet
  */
 void
@@ -185,7 +185,7 @@ send_packets(pcap_t *pcap, int cache_file_idx)
 	}
 }
 
-/*
+/**
  * Gets the next packet to be sent out. This will either read from the pcap file
  * or will retrieve the packet from the internal cache.
  *	
@@ -268,13 +268,12 @@ get_next_packet(pcap_t *pcap, struct pcap_pkthdr *pkthdr, int file_idx,
 	return pktdata;
 }
 
-/*
+/**
  * determines based upon the cachedata which interface the given packet 
  * should go out.  Also rewrites any layer 2 data we might need to adjust.
  * Returns a void cased pointer to the options.intfX of the corresponding 
  * interface.
  */
-
 void *
 cache_mode(char *cachedata, COUNTER packet_num)
 {
@@ -305,7 +304,7 @@ cache_mode(char *cachedata, COUNTER packet_num)
 }
 
 
-/*
+/**
  * Given the timestamp on the current packet and the last packet sent,
  * calculate the appropriate amount of time to sleep and do so.
  */
@@ -474,7 +473,7 @@ do_sleep(struct timeval *time, struct timeval *last, int len, int accurate, send
 #endif
 }
 
-/*
+/**
  * this function will keep calling gettimeofday() until it returns
  * >= time.  This should be a lot more accurate then using nanosleep(),
  * but at the cost of being more CPU intensive.

src/signal_handler.c

@@ -1,4 +1,4 @@
-/* $Id: signal_handler.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: signal_handler.c 1898 2007-08-25 05:10:51Z aturner $ */
 
 /*
  * Copyright (c) 2001-2007 Aaron Turner, Jeff Guttenfelder, Nathan Monteleone
@@ -30,15 +30,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
-/*
- * Description: 
- *     This file contains routines relating to signals. 
- *
- * Modifications:
- *      01/24/2003  Added suspend signal support.
- */
-
 #include "config.h"
 #include "defines.h"
 #include "common.h"
@@ -58,7 +49,7 @@ struct timeval suspend_time;
 static struct timeval suspend_start;
 static struct timeval suspend_end;
 
-/*
+/**
  * init_signal_handlers - 
  *     Initialize signal handlers to be used in tcpreplay.
  */
@@ -71,7 +62,7 @@ init_signal_handlers()
     reset_suspend_time();
 }
 
-/*
+/**
  * reset_suspend_time -
  *     Reset time values for suspend signal.
  */
@@ -83,7 +74,7 @@ reset_suspend_time()
     timerclear(&suspend_end);
 }
 
-/*
+/**
  * suspend signal handler -
  *     Signal handler for signal SIGUSR1. SIGSTOP cannot be 
  * caught, so SIGUSR1 is caught and it throws SIGSTOP.
@@ -102,7 +93,7 @@ suspend_handler(int signo)
     kill(getpid(), SIGSTOP);
 }
 
-/*
+/**
  * continue_handler -
  *     Signal handler for continue signal.
  */

src/tcpbridge.1

@@ -1,7 +1,7 @@
-.TH TCPBRIDGE 1 2007-07-19 "(tcpbridge )" "Programmer's Manual"
+.TH TCPBRIDGE 1 2007-08-26 "(tcpbridge )" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (tcpbridge.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday July 19, 2007 at 09:17:46 AM PDT
+.\"  It has been AutoGen-ed  Sunday August 26, 2007 at 01:08:05 PM PDT
 .\"  From the definitions    tcpbridge_opts.def
 .\"  and the template file   agman1.tpl
 .\"

src/tcpbridge_opts.c

@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (tcpbridge_opts.c)
  *  
- *  It has been AutoGen-ed  Thursday July 19, 2007 at 09:17:45 AM PDT
+ *  It has been AutoGen-ed  Sunday August 26, 2007 at 01:08:04 PM PDT
  *  From the definitions    tcpbridge_opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 30:0:5 templates.
  */
 
 /*
@@ -1088,7 +1088,7 @@ Optionally, packets can be edited in a variety of ways according to your needs.\
 For more details, please see the Tcpreplay Manual at:\n\
 http://tcpreplay.synfin.net/trac/wiki/manual\n";
 #define zFullVersion    NULL
-/* extracted from /opt/local/share/autogen/optcode.tpl near line 408 */
+/* extracted from /opt/local/share/autogen/optcode.tpl near line 428 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -1098,6 +1098,8 @@ http://tcpreplay.synfin.net/trac/wiki/manual\n";
 # define translate_option_strings NULL
 #endif /* ENABLE_NLS */
 
+#define tcpbridge_full_usage NULL
+#define tcpbridge_short_usage NULL
 tOptions tcpbridgeOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -1126,7 +1128,8 @@ tOptions tcpbridgeOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       9 /* index of default opt */
     },
-    40 /* full option count */, 36 /* user option count */
+    40 /* full option count */, 36 /* user option count */,
+    tcpbridge_full_usage, tcpbridge_short_usage
 };
 
 /*
@@ -1565,7 +1568,7 @@ doOptLess_Help(
 
 }
 
-/* extracted from /opt/local/share/autogen/optcode.tpl near line 514 */
+/* extracted from /opt/local/share/autogen/optcode.tpl near line 537 */
 
 #if ENABLE_NLS
 #include <stdio.h>

src/tcpbridge_opts.h

@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (tcpbridge_opts.h)
  *  
- *  It has been AutoGen-ed  Thursday July 19, 2007 at 09:17:44 AM PDT
+ *  It has been AutoGen-ed  Sunday August 26, 2007 at 01:08:04 PM PDT
  *  From the definitions    tcpbridge_opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 29:0:4 templates.
+ * Generated from AutoOpts 30:0:5 templates.
  */
 
 /*
@@ -55,7 +55,7 @@
  *  "AutoOpts" chapter.  Please refer to that doc for usage help.
  */
 #ifndef AUTOOPTS_TCPBRIDGE_OPTS_H_GUARD
-#define AUTOOPTS_TCPBRIDGE_OPTS_H_GUARD
+#define AUTOOPTS_TCPBRIDGE_OPTS_H_GUARD 1
 #include "config.h"
 #include <autoopts/options.h>
 
@@ -66,7 +66,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 118784
+#define AO_TEMPLATE_VERSION 122880
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -221,7 +221,7 @@ typedef enum {
                 tcpbridgeOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*tcpbridgeOptions.pUsageProc)( &tcpbridgeOptions, c )
-/* extracted from /opt/local/share/autogen/opthead.tpl near line 360 */
+/* extracted from /opt/local/share/autogen/opthead.tpl near line 380 */
 
 /* * * * * *
  *

src/tcpedit/Makefile.in

@@ -124,7 +124,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/plugins/dlt_user/Makefile.am
 subdir = src/tcpedit
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

src/tcpedit/checksum.c

@@ -1,4 +1,4 @@
-/* $Id: checksum.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: checksum.c 1895 2007-08-22 04:24:33Z aturner $ */
 /*
  * Copyright (c) 2006 Aaron Turner.
  * Copyright (c) 1998 - 2004 Mike D. Schiffman <mike@infonexus.com>
@@ -42,7 +42,7 @@
 static int do_checksum_math(u_int16_t *, int);
 
 
-/*
+/**
  * Returns -1 on error and 0 on success, 1 on warn
  */
 int
@@ -144,7 +144,9 @@ do_checksum(tcpedit_t *tcpedit, u_int8_t *data, int proto, int len) {
     return TCPEDIT_OK;
 }
 
-
+/**
+ * code to do a ones-compliment checksum
+ */
 static int
 do_checksum_math(u_int16_t *data, int len)
 {

src/tcpedit/dlt.c

@@ -1,4 +1,4 @@
-/* $Id: dlt.c 1757 2007-03-22 05:38:56Z aturner $ */
+/* $Id: dlt.c 1895 2007-08-22 04:24:33Z aturner $ */
 
 /*
  * Copyright (c) 2001-2006 Aaron Turner.
@@ -35,7 +35,7 @@
 #include "tcpedit-int.h"
 #include "dlt.h"
 
-/*
+/**
  * takes in a libpcap DLT_ type and returns the length of the layer2 header
  * returns -1 for unsupported DLT
  */
@@ -82,7 +82,7 @@ dlt2layer2len(tcpedit_t *tcpedit, int dlt)
     return len;
 }
 
-/*
+/**
  * each DLT type may require one or more user specified Layer 2 field
  * to be able to rewrite it as plain ethernet DLT_EN10MB
  * returns -1 on error or >= 0 on success
@@ -120,7 +120,7 @@ dltrequires(tcpedit_t *tcpedit, int dlt)
     return req;
 }
 
-/*
+/**
  * returns the default MTU size for the given DLT type.  Returns -1
  * for invalid DLT
  */
@@ -155,7 +155,7 @@ dlt2mtu(tcpedit_t *tcpedit, int dlt)
     return mtu;
 }
 
-/*
+/**
  * Returns the current layer 2 len based on the 
  * DLT of the pcap or the --dlink value or -1 on error.
  * You need to call this function AFTER rewriting the layer 2 header

src/tcpedit/edit_packet.c

@@ -1,4 +1,4 @@
-/* $Id: edit_packet.c 1873 2007-07-10 03:51:46Z aturner $ */
+/* $Id: edit_packet.c 1895 2007-08-22 04:24:33Z aturner $ */
 
 /*
  * Copyright (c) 2001-2007 Aaron Turner.
@@ -51,7 +51,7 @@ static u_int32_t randomize_ipv4_addr(tcpedit_t *tcpedit, u_int32_t ip);
 static u_int32_t remap_ipv4(tcpedit_t *tcpedit, tcpr_cidr_t *cidr, const u_int32_t original);
 static int is_unicast_ipv4(tcpedit_t *tcpedit, u_int32_t ip);
 
-/*
+/**
  * this code re-calcs the IP and Layer 4 checksums
  * the IMPORTANT THING is that the Layer 4 header 
  * is contiguious in memory after *ip_hdr we're actually
@@ -89,7 +89,7 @@ fix_checksums(tcpedit_t *tcpedit, struct pcap_pkthdr *pkthdr, ipv4_hdr_t *ip_hdr
     return TCPEDIT_OK;
 }
 
-/*
+/**
  * returns a new 32bit integer which is the randomized IP 
  * based upon the user specified seed
  */
@@ -106,7 +106,7 @@ randomize_ipv4_addr(tcpedit_t *tcpedit, u_int32_t ip)
 }
 
 
-/*
+/**
  * randomizes the source and destination IP addresses based on a 
  * pseudo-random number which is generated via the seed.
  * return 1 since we changed one or more IP addresses
@@ -156,7 +156,7 @@ randomize_ipv4(tcpedit_t *tcpedit, struct pcap_pkthdr *pkthdr,
 }
 
 
-/*
+/**
  * this code will untruncate a packet via padding it with null
  * or resetting the actual IPv4 packet len to the snaplen - L2 header.  
  * return 0 if no change, 1 if change, -1 on error.
@@ -212,7 +212,7 @@ untrunc_packet(tcpedit_t *tcpedit, struct pcap_pkthdr *pkthdr,
     return(1);
 }
 
-/*
+/**
  * Extracts the layer 7 data from the packet for TCP, UDP, ICMP
  * returns the number of bytes and a pointer to the layer 7 data. 
  * Returns 0 for no data
@@ -294,7 +294,7 @@ extract_data(tcpedit_t *tcpedit, const u_char *pktdata, int caplen,
     return 0;
 }
 
-/*
+/**
  * takes a CIDR notation netblock and uses that to "remap" given IP
  * onto that netblock.  ie: 10.0.0.0/8 and 192.168.55.123 -> 10.168.55.123
  * while 10.150.9.0/24 and 192.168.55.123 -> 10.150.9.123
@@ -330,7 +330,7 @@ remap_ipv4(tcpedit_t *tcpedit, tcpr_cidr_t *cidr, const u_int32_t original)
     return(htonl(result));
 }
 
-/*
+/**
  * rewrite IP address (layer3)
  * uses -N to rewrite (map) one subnet onto another subnet
  * also support --srcipmap and --dstipmap
@@ -416,7 +416,7 @@ rewrite_ipv4l3(tcpedit_t *tcpedit, ipv4_hdr_t *ip_hdr, tcpr_dir_t direction)
     return (diddst + didsrc);
 }
 
-/*
+/**
  * Randomize the IP addresses in an ARP packet based on the user seed
  * return 0 if no change, or 1 for a change
  */
@@ -459,7 +459,7 @@ randomize_iparp(tcpedit_t *tcpedit, struct pcap_pkthdr *pkthdr,
     return 1; /* yes we changed the packet */
 }
 
-/*
+/**
  * rewrite IP address (arp)
  * uses -a to rewrite (map) one subnet onto another subnet
  * pointer must point to the WHOLE and CONTIGOUS memory buffer
@@ -565,7 +565,7 @@ rewrite_iparp(tcpedit_t *tcpedit, arp_hdr_t *arp_hdr, int cache_mode)
     return(didsrc + diddst);
 }
 
-/*
+/**
  * returns 1 if the IP address is a unicast address, otherwise, returns 0
  * for broadcast/multicast addresses.  Returns -1 on error
  */

src/tcpedit/parse_args.c

@@ -1,4 +1,4 @@
-/* $Id: parse_args.c 1873 2007-07-10 03:51:46Z aturner $ */
+/* $Id: parse_args.c 1895 2007-08-22 04:24:33Z aturner $ */
 
 /*
  * Copyright (c) 2006 Aaron Turner.
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 
 
-/*
+/**
  * returns 0 for sucess w/o errors
  * returns 1 for sucess w/ warnings
  * returns -1 for error

src/tcpedit/plugins/dlt_en10mb/en10mb.c

@@ -1,4 +1,4 @@
-/* $Id: en10mb.c 1850 2007-05-01 06:10:58Z aturner $ */
+/* $Id: en10mb.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -145,12 +145,12 @@ dlt_en10mb_cleanup(tcpeditdlt_t *ctx)
         return TCPEDIT_OK;
 
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
 
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }
         

src/tcpedit/plugins/dlt_hdlc/hdlc.c

@@ -1,4 +1,4 @@
-/* $Id: hdlc.c 1856 2007-05-02 04:55:26Z aturner $ */
+/* $Id: hdlc.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -146,12 +146,12 @@ dlt_hdlc_cleanup(tcpeditdlt_t *ctx)
     }
 
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
         
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }
 

src/tcpedit/plugins/dlt_ieee80211/ieee80211.c

@@ -1,4 +1,4 @@
-/* $Id: ieee80211.c 1863 2007-05-04 05:50:23Z aturner $ */
+/* $Id: ieee80211.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -151,12 +151,12 @@ dlt_ieee80211_cleanup(tcpeditdlt_t *ctx)
     }
 
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
         
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }
 

src/tcpedit/plugins/dlt_linuxsll/linuxsll.c

@@ -1,4 +1,4 @@
-/* $Id: linuxsll.c 1842 2007-04-26 04:34:11Z aturner $ */
+/* $Id: linuxsll.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -145,12 +145,12 @@ dlt_linuxsll_cleanup(tcpeditdlt_t *ctx)
 
     /* FIXME: make this function do something if necessary */
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
         
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }
 

src/tcpedit/plugins/dlt_null/null.c

@@ -1,4 +1,4 @@
-/* $Id: null.c 1863 2007-05-04 05:50:23Z aturner $ */
+/* $Id: null.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -162,12 +162,12 @@ dlt_null_cleanup(tcpeditdlt_t *ctx)
     }
 
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
         
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }
 

src/tcpedit/plugins/dlt_plugins.c

@@ -1,4 +1,4 @@
-/* $Id: dlt_plugins.c 1867 2007-05-12 19:50:46Z aturner $ */
+/* $Id: dlt_plugins.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -410,14 +410,13 @@ tcpedit_dlt_cleanup(tcpeditdlt_t *ctx)
         ctx->decoder->plugin_cleanup(ctx);
 
 #ifdef FORCE_ALIGN
-    free(ctx->l3buff);
+    safe_free(ctx->l3buff);
 #endif
 
     if (ctx->decoded_extra != NULL)
-        free(ctx->decoded_extra);
-        
-    free(ctx);
+        safe_free(ctx->decoded_extra);
         
+    safe_free(ctx);
 }
 
 

src/tcpedit/plugins/dlt_radiotap/radiotap.c

@@ -1,4 +1,4 @@
-/* $Id: radiotap.c 1869 2007-05-12 19:53:15Z aturner $ */
+/* $Id: radiotap.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -153,12 +153,12 @@ dlt_radiotap_cleanup(tcpeditdlt_t *ctx)
     }
 
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
         
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }
 

src/tcpedit/plugins/dlt_raw/raw.c

@@ -1,4 +1,4 @@
-/* $Id: raw.c 1863 2007-05-04 05:50:23Z aturner $ */
+/* $Id: raw.c 1893 2007-08-10 04:24:50Z aturner $ */
 
 /*
  * Copyright (c) 2006-2007 Aaron Turner.
@@ -148,12 +148,12 @@ dlt_raw_cleanup(tcpeditdlt_t *ctx)
 
     /* FIXME: make this function do something if necessary */
     if (ctx->decoded_extra != NULL) {
-        free(ctx->decoded_extra);
+        safe_free(ctx->decoded_extra);
         ctx->decoded_extra = NULL;
     }
         
     if (plugin->config != NULL) {
-        free(plugin->config);
+        safe_free(plugin->config);
         plugin->config = NULL;
     }