fix license badge

- fix regex match padding
- fix key copying
- add more unit tests

.woodpecker/build.yaml

@@ -6,13 +6,106 @@ labels:
   platform: ${platform}
     
 steps:
-  build-n-test:
+  build-berkeley:
     when:
       event: [push]
     image: alpine:latest
     commands:
       - apk update
-      - apk add --no-cache bash build-base words-en gdb perl autoconf automake pcre pcre-dev gdbm gdbm-dev pkgconfig
-      - ./autogen.sh
-      - ./configure
-      - make
+      - apk add --no-cache bash build-base gdb perl pcre2 pcre2-dev db db-dev pkgconfig meson ninja
+      - meson setup --reconfigure build
+      - ninja -C build
+
+  test-berkeley:
+    when:
+      event: [push]
+    image: alpine:latest
+    commands:
+      - apk update
+      - apk add --no-cache bash build-base pcre2 pcre2-dev db db-dev
+      - rm -f test.db
+      # insert keys
+      - build/dbtool -d test.db -i -k test -v blah
+      - build/dbtool -d test.db -i -k foo  -v bar
+      # look if the appear in the dump
+      - build/dbtool -d test.db -D | grep blah
+      # count 'em
+      - build/dbtool -d test.db -D | wc -l | grep 2
+      # search for key
+      - build/dbtool -d test.db -s -k test
+      # search for key regex
+      - build/dbtool -d test.db -S -k 't$'
+      # remove key
+      - build/dbtool -d test.db -r -k foo
+      # count must match
+      - build/dbtool -d test.db -D | wc -l | grep 1
+      # modify a key
+      - build/dbtool -d test.db -u -k test -v modified
+      # check modified key
+      - build/dbtool -d test.db -s -k test | grep modified
+      # use splitting with regex
+      - echo today:100 | build/dbtool -d test.db -i -f -t '^([^:]*):([^:]*)'
+      # check if it works
+      - build/dbtool -d test.db -s -k today | grep 100
+      # use splitting with regex reverse
+      - echo today:cold | build/dbtool -d test.db -R -i -f -t '^([^:]*):([^:]*)'
+      # check if it works
+      - build/dbtool -d test.db -s -k cold | grep today
+      # check encryption
+      - build/dbtool -d test.db -i -k borg -v sevenofnine -p -P foobar
+      - build/dbtool -d test.db -s -k borg -p -P foobar | grep sevenofnine
+
+      
+
+  build-gdbm:
+    when:
+      event: [push]
+    image: alpine:latest
+    commands:
+      - apk update
+      - apk add --no-cache bash build-base perl pcre2 pcre2-dev gdbm gdbm-dev pkgconfig meson ninja
+      - meson setup --reconfigure build
+      - ninja -C build
+      - rm -f test.db
+      - build/dbtool -d test.db -i -k "test" -v "blah blah blah"
+      - build/dbtool -d test.db -D | grep blah
+
+  test-gdbm:
+    when:
+      event: [push]
+    image: alpine:latest
+    commands:
+      - apk update
+      - apk add --no-cache bash build-base pcre2 pcre2-dev gdbm gdbm-dev
+      - rm -f test.db
+      # insert keys
+      - build/dbtool -d test.db -i -k test -v blah
+      - build/dbtool -d test.db -i -k foo  -v bar
+      # look if the appear in the dump
+      - build/dbtool -d test.db -D | grep blah
+      # count 'em
+      - build/dbtool -d test.db -D | wc -l | grep 2
+      # search for key
+      - build/dbtool -d test.db -s -k test
+      # search for key regex
+      - build/dbtool -d test.db -S -k 't$'
+      # remove key
+      - build/dbtool -d test.db -r -k foo
+      # count must match
+      - build/dbtool -d test.db -D | wc -l | grep 1
+      # modify a key
+      - build/dbtool -d test.db -u -k test -v modified
+      # check modified key
+      - build/dbtool -d test.db -s -k test | grep modified
+      # use splitting with regex
+      - echo today:100 | build/dbtool -d test.db -i -f -t '^([^:]*):([^:]*)'
+      # check if it works
+      - build/dbtool -d test.db -s -k today | grep 100
+      # use splitting with regex reverse
+      - echo today:cold | build/dbtool -d test.db -R -i -f -t '^([^:]*):([^:]*)'
+      # check if it works
+      - build/dbtool -d test.db -s -k cold | grep today
+      # check encryption
+      - build/dbtool -d test.db -i -k borg -v sevenofnine -p -P foobar
+      - build/dbtool -d test.db -s -k borg -p -P foobar | grep sevenofnine
+

.woodpecker/release.sh

@@ -50,5 +50,5 @@ fi
 for file in "$@"; do
     https --ignore-stdin --check-status -A bearer -a "$DEPLOY_TOKEN" -f POST \
           "https://codeberg.org/api/v1/repos/${CI_REPO_OWNER}/${CI_REPO_NAME}/releases/$ID/assets" \
-          "name=${file}-${version}" "attachment@${file}"
+          "name=${file}" "attachment@${file}"
 done

.woodpecker/release.yaml

@@ -6,23 +6,26 @@ labels:
 steps:
   compile:
     when:
-      event: [manual]
+      event: [tag,manual]
     image: alpine:latest
     commands:
       - apk update
-      - apk add --no-cache bash build-base
-      - make static
-      - file dicepwgen_static
-      - mv dicepwgen_static dicepwgen-linux-amd64
+      - apk add --no-cache bash build-base words-en gdb perl pcre2-static pcre2-dev gdbm gdbm-dev pkgconfig meson ninja git
+      - meson setup --reconfigure --prefer-static  -Dcpp_link_args="-static" --buildtype=release build
+      - ninja -C build
+      - meson dist -C build --formats xztar,gztar,zip
+      - file build/dbtool
+      - mv build/dbtool dbtool-linux-amd64-$CI_COMMIT_TAG
+      - mv build/meson-dist/* .
 
   release:
     image: alpine:latest
     when:
-      event: [manual]
+      event: [tag,manual]
     environment:
       DEPLOY_TOKEN:
         from_secret: DEPLOY_TOKEN
     commands:
       - apk update
       - apk add --no-cache bash httpie jq git
-      - .woodpecker/release.sh dicepwgen-linux-amd64
+      - .woodpecker/release.sh dbtool-*

.woodpecker/test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+yq '.steps.test-gdbm.commands' < .woodpecker/build.yaml \
+    | grep -- - | grep -v apk | sed 's/^\- //' \
+ | while read COMMAND; do
+    echo "$COMMAND" | bash -e > debug.log 2>&1
+    if test $? -ne 0; then
+        echo "fail - $COMMAND"
+        if test -s debug.log; then
+            cat debug.log
+        else
+            echo exit 1
+        fi
+    else
+        echo "ok   - $COMMAND"
+    fi
+done
+
+rm -f debug.log

AUTHORS

@@ -1 +0,0 @@
-T.v. Dein <tlinden@cpan.org>

COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. 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 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.
-
-		     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
-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 program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2 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, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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 Library General
-Public License instead of this License.

INSTALL

@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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) <year>  <name of author>
+
+    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 <https://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) <year>  <name of author>
+    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
+<https://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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Makefile

@@ -0,0 +1,22 @@
+#
+# convenience wrapper around meson and ninja. Forgive me, I'm old :
+
+.PHONY: all static install test clean debug
+all:
+	meson setup --reconfigure build
+	ninja -C build
+
+install: all
+	sudo ninja -C install
+
+clean:
+	rm -rf build dbtool*core* dbtool.1 test.db clean
+
+test:
+	@.woodpecker/test.sh
+
+debug: all
+	rm -f test.db
+	build/dbtool -d test.db -i -k borg -v sevenofnine -p -P foobar
+	build/dbtool -d test.db -s -k borg -p -P foobar
+

Makefile.am

@@ -1,9 +0,0 @@
-ACLOCAL_AMFLAGS = -I config
-bin_PROGRAMS = dbtool
-dbtool_SOURCES = cipher.cc  config.cc  dbtool.cc  digest.cc  engine.cc  rijndael.cc
-man_MANS = dbtool.1
-EXTRA_DIST = $(man_MANS)
-
-clean:
-	rm -rf autom4te.cache dbtool *.o *~ config.log config.status Makefile .deps
-

README

@@ -1,83 +0,0 @@
-README for dbtool 1.9 (14/05/2015)
-============================================================
-
-dbtool can be used to store and retrieve data in a key/value
-format in a hash database. Perl compatible regular expressions
-are supported both for storing and retrieving of data. It's
-main advantages are the ability to maintain huge amounts of
-data and speed.
-
- 
-
-
-Requirements
-============================================================
-
-You need either the GNU gdbm library or the Berkeley database
-system. You can find gdbm at:
-  http://www.gnu.org/software/gdbm/gdbm.html
-And the berkeley library at: http://www.sleepycat.com.
-
-
-
-Installation from source
-============================================================
-
-If you build  directly from the git repo, you'll  need to generate the
-configure script first with 'autogen.sh'.
-
-For installation run:
-
-% ./configure
-% make
-% su
-# make install
-
-You can supply some additional parameters to configure,
-type ./configure --help for details.
-
-
-
-
-Documentation
-============================================================
-
-After successfully installation read the installed man-
-page:
-
-% man dbtool
-
-
-
-
-License and Disclaimer
-============================================================
-
-dbtool is Copyright (c) 2001-2015 by T.v. Dein. dbtool may be
-used and distributed under the terms of the GNU General Public
-License. All other brand and product names are trademarks,
-registered trademarks or service marks of their respective
-holders.
-
-These programs are 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 distribution; if not, write to the 
-  Free Software Foundation, Inc.
-  59 Temple Place
-  Suite 330
-  Boston, MA 02111
-  USA
-
-
-
-
-
-============================================================
-
-T.v. Dein <tlinden@cpan.org>
-http://www.daemon.de/DBTOOL
-

README.md

@@ -0,0 +1,89 @@
+[![status-badge](https://ci.codeberg.org/api/badges/15585/status.svg)](https://ci.codeberg.org/repos/15585)
+[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://codeberg.org/scip/dbtool/raw/branch/main/LICENSE)
+
+# README for dbtool 1.9.2 (21/11/2025)
+
+dbtool can be used to store and retrieve data in a key/value
+format in a hash database. Perl compatible regular expressions
+are supported both for storing and retrieving of data. It's
+main advantages are the ability to maintain huge amounts of
+data and speed.
+
+ 
+
+
+# Requirements
+
+You need either the GNU gdbm library or the Berkeley database
+system. You can find gdbm at:
+  http://www.gnu.org/software/gdbm/gdbm.html
+And the berkeley library at: https://libdb.org/.
+
+You will also need `meson` and `ninja`: https://mesonbuild.com/.
+
+If you want to build the manual page, you'll need perl as well.
+
+
+
+# Installation from source
+
+Check out the source and execute:
+
+```default
+meson setup build
+ninja -C build
+```
+
+You can supply some additional parameters to meson,
+type `meson configuration` for details.
+
+To install, execute:
+
+```default
+sudo ninja -C install
+```
+
+
+# Documentation
+
+After successfully installation read the installed man-
+page:
+
+```default
+man dbtool
+```
+
+You can also read the manual page [online](dbtool.pod).
+
+# Report bugs
+
+[Please open an issue](https://codeberg.org/scip/dbtool/issues). Thanks!
+
+
+# License and Disclaimer
+
+dbtool is Copyright (c) 2001-2025 by T.v. Dein. dbtool may be
+used and distributed under the terms of the GNU General Public
+License. All other brand and product names are trademarks,
+registered trademarks or service marks of their respective
+holders.
+
+These programs are 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 distribution; if not, write to the
+
+
+    Free Software Foundation, Inc.
+    59 Temple Place
+    Suite 330
+    Boston, MA 02111
+    USA
+
+
+
+
+

VERSION

@@ -1 +0,0 @@
-1.9.1

autogen.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case $1 in
-    clean)
-	rm -rf .deps *~ config.cache config.status *.o \
-	    dbtool Makefile Makefile.in autom4te.cache .libs depcomp install-sh libtool \
-	    dbtool.1 missing mkinstalldirs platform.h stamp* \
-	    config/[cdilm]* config.cache aclocal.m4 configure
-	;;
-    *)
-	pod2man dbtool.pod \
-	    | sed -e 's#\.TH DBTOOL 1 "....-..-.." "perl v.\..\.." "User Contributed Perl Documentation"#\.TH DBTOOL 1#g' > dbtool.1
-	mkdir -p config
-	autoreconf --install --force --verbose -I config
-	;;
-esac

cipher.cc

@@ -56,11 +56,8 @@ void cipher::init(const string& phrase) {
   dig.initDigest();
   dig.putDigest( (unsigned char *)phrase.c_str(), phrase.length() );
   __key = dig.stringDigest(); // this is a 32 byte long string, as Rijndael:: expects
-  
-  /* convert the key to unsigned char[] */
-  for(int i=0; i<32; i++) {
-    key[i] = __key[i];
-  }
+
+  memcpy(key, __key, 32);
 }
 
 
@@ -79,18 +76,22 @@ string cipher::encrypt(const string& source) {
   rijn.init(Rijndael::CBC,  Rijndael::Encrypt, key, Rijndael::Key32Bytes);
 
   /* encrypt the source */
-  unsigned char output[size + 16];
+  unsigned char *output = (unsigned char *)malloc(size + 16);
   int res = rijn.padEncrypt(plainText, (int)size, output);
 
   /* convert the result back to char[] */
-  char outText[res];
+  char *outText = (char *)malloc(res);
   for(int y=0; y<(res); y++) {
     outText[y] = output[y];
   }
 
+  free(output);
+  
   /* return the crypted string */
-  if (res >= 0) {
-    return string(outText, res);
+  if(res >= 0) {
+    string text = string(outText, res);
+    free(outText);
+    return text;
   }
   else {
     cerr << "Failed to encrypt: " << error(res) << "!" << endl;
@@ -113,18 +114,23 @@ string cipher::decrypt(const string& source) {
   rijn.init(Rijndael::CBC,  Rijndael::Decrypt, key, Rijndael::Key32Bytes);
 
   /* decrypt the source */
-  unsigned char output[size];
+  unsigned char *output = (unsigned char *)malloc(size);
   int res = rijn.padDecrypt(cryptedText, (int)size, output);
 
   /* convert the result back to char[] */
-  char outText[res];
+  char *outText = (char *)malloc(res);
   for(int y=0; y<(res); y++) {
     outText[y] = output[y];
   }
 
+  free(output);
+  
   /* return the decrypted string */
-  if (res >= 0)
-    return string(outText, res);
+  if (res >= 0) {
+    string text = string(outText, res);
+    free(outText);
+    return text;
+  }
   else {
     cerr << "Failed to decrypt: " << error(res) << " (passphrase invalid?) !" << endl;
     exit(1);

cipher.h

@@ -61,7 +61,6 @@ class cipher {
   Rijndael rijn;
   MD5Digest dig;
   unsigned char key[32];
-  string blah;
   const char* error(int num);
 
  public:

config/ax_berkeley_db_cxx.m4

@@ -1,152 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_berkeley_db_cxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BERKELEY_DB_CXX([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-#
-# DESCRIPTION
-#
-#   This macro tries to find Berkeley DB C++ support. It honors
-#   MINIMUM-VERSION if given.
-#
-#   If libdb_cxx is found, DB_CXX_HEADER and DB_CXX_LIBS variables are set
-#   and ACTION-IF-FOUND shell code is executed if specified. DB_CXX_HEADER
-#   is set to location of db.h header in quotes (e.g. "db3/db_cxx.h") and
-#   AC_DEFINE_UNQUOTED is called on it, so that you can type
-#
-#     #include DB_CXX_HEADER
-#
-#   in your C/C++ code. DB_CXX_LIBS is set to linker flags needed to link
-#   against the library (e.g. -ldb3.1_cxx) and AC_SUBST is called on it.
-#
-#   when specified user-selected spot (via --with-libdb) also sets
-#
-#     DB_CXX_CPPFLAGS to the include directives required
-#     DB_CXX_LDFLAGS to the -L flags required
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Vaclav Slavik <vaclav.slavik@matfyz.cz>
-#   Copyright (c) 2011 Stephan Suerken <absurd@debian.org>
-#   Copyright (c) 2014 Kirill A. Korinskiy <catap@catap.ru>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-AC_DEFUN([AX_BERKELEY_DB_CXX],
-[
-  AC_LANG_ASSERT(C++)
-
-  old_LIBS="$LIBS"
-  old_LDFLAGS="$LDFLAGS"
-  old_CPPFLAGS="$CPPFLAGS"
-
-  libdbdir=""
-  AC_ARG_WITH(libdb,
-    AS_HELP_STRING([--with-libdb=DIR],
-        [root of the Berkeley DB directory]),
-    [
-        case "$withval" in
-        "" | y | ye | yes | n | no)
-        AC_MSG_ERROR([Invalid --with-libdb value])
-          ;;
-        *) libdbdir="$withval"
-          ;;
-        esac
-    ], [])
-
-  minversion=ifelse([$1], ,,$1)
-
-  DB_CXX_HEADER=""
-  DB_CXX_LIBS=""
-  DB_CXX_LDFLAGS=""
-  DB_CXX_CPPFLAGS=""
-
-  if test -z $minversion ; then
-      minvermajor=0
-      minverminor=0
-      minverpatch=0
-      AC_MSG_CHECKING([for Berkeley DB (C++)])
-  else
-      minvermajor=`echo $minversion | cut -d. -f1`
-      minverminor=`echo $minversion | cut -d. -f2 -s`
-      minverpatch=`echo $minversion | cut -d. -f3 -s`
-      if test -z "$minvermajor"; then minvermajor=0; fi
-      if test -z "$minverminor"; then minverminor=0; fi
-      if test -z "$minverpatch"; then minverpatch=0; fi
-      AC_MSG_CHECKING([for Berkeley DB (C++) >= $minvermajor.$minverminor.$minverpatch])
-  fi
-
-  if test x$libdbdir != x""; then
-    DB_CXX_CPPFLAGS="-I${libdbdir}/include"
-    DB_CXX_LDFLAGS="-L${libdbdir}/lib"
-    LDFLAGS="$DB_CXX_LDFLAGS $old_LDFLAGS"
-    CPPFLAGS="$DB_CXX_CPPFLAGS $old_CPPFLAGS"
-  fi
-
-  for major in 4; do
-      for minor in 0 1 2 3 4 5 6 7 8 9; do
-	  for version in "${major}.${minor}" "${major}${minor}"; do
-
-	      try_libs="-ldb_cxx-${version}%-ldb-${version} -ldb${version}_cxx%-ldb${version}"
-	      try_headers="db${major}.${minor}/db_cxx.h db${major}${minor}/db_cxx.h db${major}/db_cxx.h"
-	      for db_cxx_hdr in $try_headers ; do
-		  for db_cxx_lib in $try_libs; do
-		    db_cxx_lib="$libdbdir `echo "$db_cxx_lib" | sed 's/%/ /g'`"
-		    LIBS="$old_LIBS $db_cxx_lib"
-		    #echo "Trying <$db_cxx_lib> <$db_cxx_hdr>"
-		    if test -z $DB_CXX_HEADER ; then
-		      AC_LINK_IFELSE(
-			  [AC_LANG_PROGRAM(
-				  [
-                                    #include <${db_cxx_hdr}>
-				  ],
-				  [
-                                    #if !((DB_VERSION_MAJOR > (${minvermajor}) || \
-				      (DB_VERSION_MAJOR == (${minvermajor}) && \
-					  DB_VERSION_MINOR > (${minverminor})) || \
-					  (DB_VERSION_MAJOR == (${minvermajor}) && \
-					  DB_VERSION_MINOR == (${minverminor}) && \
-					  DB_VERSION_PATCH >= (${minverpatch}))))
-                                      #error "too old version"
-                                    #endif
-			      
-                              DB *db;
-                              db_create(&db, NULL, 0);
-			      ])],
-                              [
-				  AC_MSG_RESULT([header $db_cxx_hdr, library $db_cxx_lib])
-				  DB_CXX_HEADER="$db_cxx_hdr"
-				  DB_CXX_LIBS="$db_cxx_lib"
-				  ],
-                           )
-                  fi
-	       done
-	    done
-	done
-     done
-  done
-
-  LIBS="$old_LIBS"
-  LDFLAGS="$old_LDFLAGS"
-  CPPFLAGS="$old_CPPFLAGS"
-
-  if test -z $DB_CXX_HEADER ; then
-    AC_MSG_RESULT([not found])
-    DB_CXX_LDFLAGS=""
-    DB_CXX_CPPFLAGS=""
-    ifelse([$3], , :, [$3])
-  else
-    AC_DEFINE_UNQUOTED(DB_CXX_HEADER, ["$DB_CXX_HEADER"], ["Berkeley DB C++ Header File"])
-    AC_SUBST(DB_CXX_LIBS)
-    AC_SUBST(DB_CXX_LDFLAGS)
-    AC_SUBST(DB_CXX_CPPFLAGS)
-    ifelse([$2], , :, [$2])
-  fi
-])

config/ax_compare_version.m4

@@ -1,177 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   This macro compares two version strings. Due to the various number of
-#   minor-version numbers that can exist, and the fact that string
-#   comparisons are not compatible with numeric comparisons, this is not
-#   necessarily trivial to do in a autoconf script. This macro makes doing
-#   these comparisons easy.
-#
-#   The six basic comparisons are available, as well as checking equality
-#   limited to a certain number of minor-version levels.
-#
-#   The operator OP determines what type of comparison to do, and can be one
-#   of:
-#
-#    eq  - equal (test A == B)
-#    ne  - not equal (test A != B)
-#    le  - less than or equal (test A <= B)
-#    ge  - greater than or equal (test A >= B)
-#    lt  - less than (test A < B)
-#    gt  - greater than (test A > B)
-#
-#   Additionally, the eq and ne operator can have a number after it to limit
-#   the test to that number of minor versions.
-#
-#    eq0 - equal up to the length of the shorter version
-#    ne0 - not equal up to the length of the shorter version
-#    eqN - equal up to N sub-version levels
-#    neN - not equal up to N sub-version levels
-#
-#   When the condition is true, shell commands ACTION-IF-TRUE are run,
-#   otherwise shell commands ACTION-IF-FALSE are run. The environment
-#   variable 'ax_compare_version' is always set to either 'true' or 'false'
-#   as well.
-#
-#   Examples:
-#
-#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
-#
-#   would both be true.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
-#
-#   would both be false.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
-#
-#   would be true because it is only comparing two minor versions.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
-#
-#   would be true because it is only comparing the lesser number of minor
-#   versions of the two values.
-#
-#   Note: The characters that separate the version numbers do not matter. An
-#   empty string is the same as version 0. OP is evaluated by autoconf, not
-#   configure, so must be a string, not a variable.
-#
-#   The author would like to acknowledge Guido Draheim whose advice about
-#   the m4_case and m4_ifvaln functions make this macro only include the
-#   portions necessary to perform the specific comparison specified by the
-#   OP argument in the final configure script.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 11
-
-dnl #########################################################################
-AC_DEFUN([AX_COMPARE_VERSION], [
-  AC_REQUIRE([AC_PROG_AWK])
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
-  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
-  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-  dnl # then the first line is used to determine if the condition is true.
-  dnl # The sed right after the echo is to remove any indented white space.
-  m4_case(m4_tolower($2),
-  [lt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [gt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [le],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],
-  [ge],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],[
-    dnl Split the operator from the subversion count if present.
-    m4_bmatch(m4_substr($2,2),
-    [0],[
-      # A count of zero means use the length of the shorter version.
-      # Determine the number of characters in A and B.
-      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
-      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
-
-      # Set A to no more than B's length and B to no more than A's length.
-      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
-    ],
-    [[0-9]+],[
-      # A count greater than zero means use only that many subversions
-      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-    ],
-    [.+],[
-      AC_WARNING(
-        [illegal OP numeric parameter: $2])
-    ],[])
-
-    # Pad zeros at end of numbers to make same length.
-    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-    B="$B`echo $A | sed 's/./0/g'`"
-    A="$ax_compare_version_tmp_A"
-
-    # Check for equality or inequality as necessary.
-    m4_case(m4_tolower(m4_substr($2,0,2)),
-    [eq],[
-      test "x$A" = "x$B" && ax_compare_version=true
-    ],
-    [ne],[
-      test "x$A" != "x$B" && ax_compare_version=true
-    ],[
-      AC_WARNING([illegal OP parameter: $2])
-    ])
-  ])
-
-  AS_VAR_POPDEF([A])dnl
-  AS_VAR_POPDEF([B])dnl
-
-  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-  if test "$ax_compare_version" = "true" ; then
-    m4_ifvaln([$4],[$4],[:])dnl
-    m4_ifvaln([$5],[else $5])dnl
-  fi
-]) dnl AX_COMPARE_VERSION

configure.ac

@@ -1,312 +0,0 @@
-# -*-sh-*-
-
-AC_PREREQ(2.61)
-
-define([dbtoolversion], esyscmd([sh -c "cat VERSION"]))dnl
-
-# what we are compiling
-AC_INIT([dbtool], [dbtoolversion], [tlinden@cpan.org])
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_HEADER(platform.h)
-
-AM_INIT_AUTOMAKE()
-LT_INIT
-
-# default values, dynamically linking and stripped binary
-STATIC="no"
-
-
-# provide flag --enable-static
-AC_ARG_ENABLE([static-binary],
-    AS_HELP_STRING([--enable-static-binary], [create a statically linked binary]),
-    [
-	if test "x$enableval" = "xyes"; then
-	    STATIC="yes"
-	    LDFLAGS="$LDFLAGS -static"
-	fi
-])
-
-AC_ARG_ENABLE([debug],
-    AS_HELP_STRING([--disable-debug], [Disable debugging]))
-AS_IF([test "x$enable_debug" != "xno"], [
-          CXXFLAGS="$CFLAGS -g -DDEBUG"
-          enable_debug="yes"
-])
-
-
-AC_CANONICAL_HOST
-
-
-# look for the existence of install
-AC_PROG_INSTALL
-
-# look if c++ compiler exists
-AC_PROG_CXX
-
-# look for libc
-AC_HEADER_STDC
-
-# additional headers which are required
-AC_CHECK_HEADERS(unistd.h stdio.h stdlib.h)
-
-
-# Check for some target-specific stuff
-case "$host" in
-    *aix*)
-        # libm is required as well
-        CXXFLAGS="$CFLAGS -D_AIX_SOURCE=1"
-        LDFLAGS="$LDFLAGS -lm"
-        ;;
-    *-*-android*) ;;
-    *-*-cygwin*) ;;
-    *-*-dgux*) ;;
-    *-*-darwin*) ;;
-    *-*-dragonfly*) ;;
-    *-*-haiku*) ;;
-    *-*-hpux*) ;;
-    *-*-irix5*) ;;
-    *-*-irix6*) ;;
-    *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) ;;
-    *-*-linux*) ;;
-    *-*-netbsd*) ;;
-    *-*-freebsd*)
-        # ports install to /usr/local by default, check
-        if test -d "/usr/local/lib" -a -d "/usr/local/include"; then
-            CXXFLAGS="$CFLAGS -I/usr/local/include"
-            LDFLAGS="$LDFLAGS -L/usr/local/lib"
-        fi
-        ;;
-    *-*-bsdi*) ;;
-    *-next-*) ;;
-    *-*-openbsd*) ;;
-    *-*-solaris*) ;;
-    *-*-sunos4*) ;;
-    *-ncr-sysv*) ;;
-    *-sni-sysv*) ;;
-    *-*-sysv4.2*) ;;
-    *-*-sysv5*) ;;
-    *-*-sysv*) ;;
-    *-*-sco*) ;;
-    *-*-unicos*) ;;
-    *-dec-osf*) ;;
-    *-*-nto-qnx*) ;;
-    *-*-ultrix*) ;;
-    *-*-lynxos) ;;
-esac
-
-
-# look for libs
-GDBM="yes"
-BERKELEY="no"
-PCRE="no"
-
-
-# configure args
-AC_ARG_WITH([berkeley],
-    [AS_HELP_STRING([--with-berkeley],
-	            [Use berkeley library ])])
-
-if test "x$with_berkeley" = "xno"; then
-  BERKELEY=no
-  GDBM=yes
-elif test "x$with_berkeley" = "xyes"; then
-  BERKELEY=yes
-  GDBM=no
-fi
-
-
-AC_ARG_WITH([gdbm],
-    [AS_HELP_STRING([--with-gdbm],
-	            [Use GNU gdbm library ])])
-
-if test "x$with_gdbm" = "xno"; then
-  GDBM=no
-elif test "x$with_gdbm" = "xyes"; then
-  GDBM=yes
-fi
-
-AC_ARG_WITH([gdbm-dir],
-    [AS_HELP_STRING([--with-gdbm-dir=DIR],
-	            [Use GNU gdbm library in DIR])],
-    [
-	AC_MSG_CHECKING([checking $with_gdbm_dir/include/gdbm.h presence])
-	if test -r "$with_gdbm_dir/include/gdbm.h" ; then
-	    CXXFLAGS="-I$with_gdbm_dir/include $CXXFLAGS"
-	    CFLAGS="$CXXFLAGS"
-	    LDFLAGS="-L$with_gdbm_dir/lib $LDFLAGS"
-	    LIBS="-lgdbm"
-            GDBM=yes
-	    AC_MSG_RESULT([yes])
-	else
-            GDBM=no
-	    AC_MSG_RESULT([no])
-	fi
-    ])
-
-AC_ARG_WITH([pcre-dir],
-    [AS_HELP_STRING([--with-pcre-dir=DIR],
-	            [Use GNU pcre library in DIR])],
-    [
-	AC_MSG_CHECKING([checking $with_pcre_dir/include/pcre.h presence])
-	if test -r "$with_pcre_dir/include/pcre.h" ; then
-	    CXXFLAGS="-I$with_pcre_dir/include $CXXFLAGS"
-	    CFLAGS="$CXXFLAGS"
-	    LDFLAGS="-L$with_pcre_dir/lib $LDFLAGS"
-	    LIBS="-lpcre"
-	    AC_MSG_RESULT([yes])
-	else
-	    AC_MSG_RESULT([no])
-	fi
-    ])
-
-AC_ARG_WITH([bdb-include-dir],
-            [AS_HELP_STRING([--with-bdb-include-dir],
-                            [Specify bdb include prefix])],
-            [
-		    GDBM="no"
-		    BERKELEY="yes"
-		    CXXFLAGS="-I${with_bdb_include_dir} ${CXXFLAGS}"
-		    CFLAGS="$CXXFLAGS"
-   	     ],
-            [])
-
-AC_ARG_WITH([bdb_lib_dir],
-            [AS_HELP_STRING([--with-bdb-lib-dir],
-                            [Specify bdb library prefix])],
-	    [
-		# dont check presence since lib file name unpredictable
-		GDBM="no"
-		BERKELEY="yes"
-		LDFLAGS="-L${with_bdb_lib_dir} ${LDFLAGS}"
-            ])
-
-
-# first, check for gdbm, which is the default
-if test "$GDBM" = "yes"; then
-    # search for it via pkg-config
-    PKG_CHECK_MODULES([GDBM], [gdbm], _gdbm=yes, _gdbm=no)
-    if test "x$_gdbm" = "xyes"; then
-	AC_SUBST([GDBM_CFLAGS])
-	AC_SUBST([GDBM_CXXFLAGS])
-	AC_SUBST([GDBM_LIBS])
-	GDBM="yes"
-    fi
-fi
-
-if test "$GDBM" = "yes"; then
-     export LDFLAGS
-     export LIBS
-     export CFLAGS
-     AC_CHECK_LIB(gdbm, gdbm_open)
-     if test "x$ac_cv_lib_gdbm_gdbm_open" = "xno"; then
-	 GDBM="no"
-     fi
-fi
-
-# now, if we didn't find gdbm or it was disabled, try berkeley db
-if test "$GDBM" = "no"; then
-    AC_LANG(C++)
-     export LDFLAGS
-     export LIBS
-     export CXXFLAGS
-    AX_BERKELEY_DB_CXX([4],[
-	    LDFLAGS="$DB_CXX_LIBS $LDFLAGS"
-	    BERKELEY="yes"
-	    ],[BERKELEY="no"])
-fi
-
-
-
-export CFLAGS
-export LIBS
-export LDFLAGS
-AC_CHECK_LIB(pcre, pcre_compile)
-
-
-
-# these functions must exist
-AC_CHECK_FUNCS(getopt fdopen fgetc getenv getpass)
-
-# complain if the functions checked for above does not exists
-if test "$ac_cv_func_getopt" != yes; then
-  echo
-  echo "*** Warning: function getopt() not found!"
-  echo "*** You will not be able to compile dbtool!"
-  #exit 1
-fi
-
-if test "$ac_cv_func_fdopen" != yes; then
-  echo
-  echo "*** Warning: function fdopen() not found!"
-  echo "*** You will not be able to compile dbtool!"
-  #exit 1
-fi
-
-if test "$ac_cv_func_fgetc" != yes; then
-  echo
-  echo "*** Warning: function fgetc() not found!"
-  echo "*** You will not be able to compile dbtool!"
-  #exit 1
-fi
-
-if test "$ac_cv_func_getenv" != yes; then
-  echo
-  echo "*** Warning: function getenv() not found!"
-  echo "*** You will not be able to compile dbtool!"
-  #exit 1
-fi
-
-if test "$ac_cv_lib_pcre_pcre_compile" != yes; then
-  echo
-  echo "*** Warning: the PCRE library could not be found!"
-  echo "*** You will not be able to compile dbtool!"
-  echo "*** Please get a copy from http://www.pcre.org,"
-  echo "*** install it and then retry!"
-  exit 1
-fi
-
-if test "$GDBM" = "yes"; then
-    USEDB="GDBM"
-elif test "$BERKELEY" = "yes"; then
-    USEDB="BERKELEY-DB"
-    CXXFLAGS="-DHAVE_BERKELEY=1 $CXXFLAGS"
-else
-    echo "Neither gdbm or berkeley-db is instaled!"
-    exit 1
-fi
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-# the default prefix
-AC_PREFIX_DEFAULT(/usr/local)
-
-# finaly write out
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
-
-AC_MSG_RESULT([
-    Build configured for $PACKAGE $VERSION:
-        CXX:                    ${CXX}
-        CXXFLAGS:               ${CXXFLAGS}
-        LDFLAGS:                ${LDFLAGS}
-        LIBS:                   ${LIBS}
-        debug:                  ${enable_debug}
-        static build:           ${STATIC}
-
-        prefix:                 ${prefix}
-        libdir:                 ${libdir}
-        includedir:             ${includedir}
-
-        target platform:        ${host}
-
-	db backend:             ${USEDB}
-    Type 'make' to build, 'make install' to install.
-])
-
-
-echo

dbtool.cc

@@ -67,8 +67,8 @@ int main(int argc, char *argv[]) {
     case 'i':
       /* insert */
       if(config.key == "") {
-	cerr << pkg << ": key required\n";
-	exit(1);
+        cerr << pkg << ": key required\n";
+        exit(1);
       }
       engine.insert();
       break;
@@ -82,32 +82,32 @@ int main(int argc, char *argv[]) {
     case 's':
       /* select */
       if(config.key == "") {
-	cerr << pkg << ": key required\n";
-	exit(1);
+        cerr << pkg << ": key required\n";
+        exit(1);
       }
       engine.select();
       break;
     case 'S':
       /* regexp select */
       if(config.key == "") {
-	cerr << pkg << ": key (regexp) required\n";
-	exit(1);
+        cerr << pkg << ": key (regexp) required\n";
+        exit(1);
       }
       engine.regexp();
       break;
     case 'r':
       /* remove */
       if(config.key == "") {
-	cerr << pkg << ": key required\n";
-	exit(1);
+        cerr << pkg << ": key required\n";
+        exit(1);
       }
       engine.remove();
       break;
     case 'u':
       /* update */
       if(config.key == "") {
-	cerr << pkg << ": key required\n";
-	exit(1);
+        cerr << pkg << ": key required\n";
+        exit(1);
       }
       engine.update();
       break;
@@ -125,9 +125,7 @@ int main(int argc, char *argv[]) {
 }
 
 
-
 string readpass() {
-  char *pass;
   char *envpass;
   envpass = getenv(PW_VARNAME);
   if(envpass != NULL) {
@@ -136,7 +134,7 @@ string readpass() {
   }
   else {
 #ifdef HAVE_GETPASS
-    pass = getpass("passphrase: ");
+    char *pass = getpass("passphrase: ");
     string password = pass;
     free(pass);
 #else
@@ -147,5 +145,3 @@ string readpass() {
     return password;
   }
 }
-
-

engine.cc

@@ -45,8 +45,6 @@
  */
 
 
-
-
 #include "dbtool.h"
 #include "engine.h"
 #include "platform.h"
@@ -85,15 +83,15 @@ void Engine::init() {
       cerr << "Failed to open " + config.filename << "(" << strerror(err) << ")" << endl;
       exit(1);
     }
-#else 
+#else
 
     db = gdbm_open(
-		   (char *)config.filename.c_str(),
-		   BLOCKSIZE,
-		   mode,
-		   FILEMODE,
-		   0
-		   );
+                   (char *)config.filename.c_str(),
+                   BLOCKSIZE,
+                   mode,
+                   FILEMODE,
+                   0
+                   );
 #endif
   }
   else {
@@ -104,12 +102,12 @@ void Engine::init() {
     }
 #else
     db = gdbm_open(
-		   (char *)config.filename.c_str(),
-		   BLOCKSIZE,
-		   mode,
-		   FILEMODE,
-		   0
-		   );
+                   (char *)config.filename.c_str(),
+                   BLOCKSIZE,
+                   mode,
+                   FILEMODE,
+                   0
+                   );
 #endif
   }
 #ifndef HAVE_BERKELEY
@@ -150,10 +148,10 @@ void Engine::dump() {
       string K((char *)key.get_data(), key.get_size());
       string V((char *)data.get_data(), data.get_size());
       if(config.reverse == 1) {
-	cout << decode(V) << config.separator << K << endl;
+        cout << decode(V) << config.separator << K << endl;
       }
       else {
-	cout << K << config.separator << decode(V) << endl;
+        cout << K << config.separator << decode(V) << endl;
       }
     }
     dbcp->close();
@@ -168,12 +166,12 @@ void Engine::dump() {
   key = gdbm_firstkey(db);
   while ( key.dptr != NULL ) {
     /* iterate over every tuple and dump it out */
-    value = gdbm_fetch(db, key);   
+    value = gdbm_fetch(db, key);
     string K(key.dptr, key.dsize);
     string V(value.dptr, value.dsize);
     if(config.reverse == 1) {
       cout << decode(V) << config.separator << K << endl;
-      }
+    }
     else {
       cout << K << config.separator << decode(V) << endl;
     }
@@ -184,31 +182,43 @@ void Engine::dump() {
 }
 
 
-
-
 /*
  * search for regexp given in config.key
  */
 void Engine::regexp() {
   init();
   int num;
-  pcre *p_pcre;
-  pcre_extra *p_pcre_extra;
-  char *err_str;
   int sub_len = 9;
   int *sub_vec;
-  int erroffset;
-  p_pcre_extra = NULL;
-  p_pcre = pcre_compile((char *)config.key.c_str(), 0,
-			(const char **)(&err_str), &erroffset, NULL);
+  int errnumber;
+  PCRE2_SIZE erroffset;
+  pcre2_match_data *match_data;
+  
+  pcre2_code *p_pcre = pcre2_compile(
+                                 (PCRE2_SPTR)config.key.c_str(),               /* the pattern */
+                                 PCRE2_ZERO_TERMINATED, /* indicates pattern is zero-terminated */
+                                 0,                     /* default options */
+                                 &errnumber,          /* for error number */
+                                 &erroffset,          /* for error offset */
+                                 NULL);                 /* use default compile context */
+  
+  if (p_pcre == NULL) {
+    PCRE2_UCHAR buffer[256];
+    pcre2_get_error_message(errnumber, buffer, sizeof(buffer));
+    cerr << "PCRE2 compilation failed at offset: " << erroffset << " with: " << buffer << endl;
+    exit(1);
+  }
+
+  match_data = pcre2_match_data_create_from_pattern(p_pcre, NULL);
+  
 #ifdef HAVE_BERKELEY
-    Dbc *dbcp;
-    db->cursor(NULL, &dbcp, 0);
-    Dbt key;
-    Dbt data;
-    while (dbcp->get(&key, &data, DB_NEXT) == 0) {
-      string K((char *)key.get_data(), key.get_size());
-      string V((char *)data.get_data(), data.get_size());
+  Dbc *dbcp;
+  db->cursor(NULL, &dbcp, 0);
+  Dbt key;
+  Dbt data;
+  while (dbcp->get(&key, &data, DB_NEXT) == 0) {
+    string K((char *)key.get_data(), key.get_size());
+    string V((char *)data.get_data(), data.get_size());
 #else
     datum key;
     datum value;
@@ -218,23 +228,24 @@ void Engine::regexp() {
       string K(key.dptr, key.dsize);
       string V(value.dptr, value.dsize);
 #endif
+      
       sub_vec = new int(sub_len);
-      num = pcre_exec(p_pcre, p_pcre_extra, (char *)K.c_str(),
-		      (int)K.length(), 0, 0, (int *)sub_vec, sub_len);
+      num = pcre2_match(p_pcre, (PCRE2_SPTR)K.c_str(), (PCRE2_SIZE)K.length(), 0, 0, match_data, NULL);
+
       if(num == 1){
-	if(config.reverse == 1) {
-	  cout << decode(V);
-	  if(config.with == 1) {
-	    cout << config.separator << K;
-	  }
-	  cout << endl;
-	}
-	else {
-	  if(config.with == 1) {
-	    cout << K << config.separator;
-	  }
-	  cout << decode(V) << endl;
-	}
+        if(config.reverse == 1) {
+          cout << decode(V);
+          if(config.with == 1) {
+            cout << config.separator << K;
+          }
+          cout << endl;
+        }
+        else {
+          if(config.with == 1) {
+            cout << K << config.separator;
+          }
+          cout << decode(V) << endl;
+        }
       }
       K = "";
       V = "";
@@ -243,365 +254,393 @@ void Engine::regexp() {
       key = gdbm_nextkey(db,key);
 #endif
     }
-    pcre_free(p_pcre);
+    
+    pcre2_match_data_free(match_data);
+    pcre2_code_free(p_pcre);
+
 #ifdef HAVE_BERKELEY
     dbcp->close();
     db->close(0);
 #else
-  gdbm_close(db);
+    gdbm_close(db);
 #endif
-}
+  }
 
 
-
-
-
-
-/*
- * Insert data into the db
- */
-void Engine::from_input() {
-  init();
+  /*
+   * Insert data into the db
+   */
+  void Engine::from_input() {
+    init();
 #ifdef HAVE_BERKELEY
-  int err;
+    int err;
 #else
-  int ret;
+    int ret;
 #endif
 
-  FILE *stream;
-  stream = fdopen(0, "r");
-  char c;
-  string mode = "key";
-  string key = "";
-  string value = "";
-  string line = "";
+    FILE *stream;
+    stream = fdopen(0, "r");
+    char c;
+    string mode = "key";
+    string key = "";
+    string value = "";
+    string line = "";
+
+    int num;
+
+    int errnumber;
+    PCRE2_SIZE erroffset;
+    pcre2_match_data *match_data;
+    PCRE2_SIZE *ovector;
+  
+    pcre2_code *p_pcre = pcre2_compile(
+                                       (PCRE2_SPTR)config.token.c_str(),
+                                       PCRE2_ZERO_TERMINATED,
+                                       0,
+                                       &errnumber,
+                                       &erroffset,
+                                       NULL);
+  
+  if (p_pcre == NULL) {
+    PCRE2_UCHAR buffer[256];
+    pcre2_get_error_message(errnumber, buffer, sizeof(buffer));
+    cerr << "PCRE2 compilation failed at offset: " << erroffset << " with: " << buffer << endl;
+    exit(1);
+  }
+
+  match_data = pcre2_match_data_create_from_pattern(p_pcre, NULL);
   
-  int num, match;
-  pcre *p_pcre;
-  pcre_extra *p_pcre_extra;
-  char *err_str;
-  int sub_len = 9;
-  int *sub_vec;
-  char *v1;
-  char *v2;
-  int erroffset;
-  p_pcre_extra = NULL;
-  p_pcre = pcre_compile((char *)config.token.c_str(), 0,
-			(const char **)(&err_str), &erroffset, NULL);
   while((c = fgetc(stream)) != EOF) {
-    if(c == '\n') {
-      // record end
-      mode = "key";
-      if(config.token != "") {
-	v1 = new char[line.length()];
-	v2 = new char[line.length()];
-	sub_vec = new int[sub_len];
-	num = pcre_exec(p_pcre, p_pcre_extra, (char *)line.c_str(),
-			(int)line.length(), 0, 0, (int *)sub_vec, sub_len);
-	if(num < 0)
-	  cerr << "Token \"" << config.token << "\" did not match on \"" << line << "\"!\n";
-	else if(num == 1)
-	  cerr << "Token " << config.token << " did not produce sub strings!\n";
-	else {
-	  match = pcre_copy_substring((char *)line.c_str(), sub_vec, num, 1, v1, line.length());
-	  match = pcre_copy_substring((char *)line.c_str(), sub_vec, num, 2, v2, line.length());
-	  if(config.reverse) {
-	    value = v1;
-	    key   = v2;
-	  }
-	  else {
-	    value = v2;
-	    key   = v1;
-	  }
-	}
-	delete(sub_vec);
-	pcre_free((void *)v1);
-	pcre_free((void *)v2);
-	line = "";
-      }
-      value = encode(value);
+      if(c == '\n') {
+        // record end
+        mode = "key";
+        if(config.token != "") {
+          string *subs = new string[2];
+          
+          num = pcre2_match(p_pcre, (PCRE2_SPTR)line.c_str(), (PCRE2_SIZE)line.length(), 0, 0, match_data, NULL);
+
+          if(num < 0)
+            cerr << "Token \"" << config.token << "\" did not match on \"" << line << "\"!\n";
+          else if(num == 1)
+            cerr << "Token " << config.token << " did not produce sub strings!\n";
+          else {
+            ovector = pcre2_get_ovector_pointer(match_data);
+            const char *constline = const_cast<char*>(line.c_str());
+
+            
+          for (int i = 1; i < num; i++)  {
+              PCRE2_SPTR substring_start = (PCRE2_SPTR8)constline + ovector[2*i];
+              PCRE2_SIZE substring_length = ovector[2*i+1] - ovector[2*i];
+
+              char *part = (char *)malloc(substring_length+1);
+              part = strncpy(part, (char *)substring_start, substring_length);
+              part[substring_length] = '\0';
+
+              subs[i-1] = part;
+              free(part);
+            }
+            
+            if(config.reverse) {
+              value = subs[0];
+              key   = subs[1];
+            }
+            else {
+              value = subs[1];
+              key   = subs[0];
+            }
+          }
+          
+          delete[] subs;
+
+          line = "";
+        }
+        value = encode(value);
 #ifdef HAVE_BERKELEY
-      Dbt d_key((char *)key.c_str(), key.length());
-      Dbt d_value((char *)value.c_str(), value.length());
+        Dbt d_key((char *)key.c_str(), key.length());
+        Dbt d_value((char *)value.c_str(), value.length());
 #else
-      datum d_key = {(char *)key.c_str(), key.length()};
-      datum d_value = {(char *)value.c_str(), value.length()};
+        datum d_key = {(char *)key.c_str(), key.length()};
+        datum d_value = {(char *)value.c_str(), value.length()};
 #endif
-      if(config.force == 1) {
+        if(config.force == 1) {
 #ifdef HAVE_BERKELEY
-	if((err = db->put(0, &d_key, &d_value, 0)) != 0) {
-	  cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-	  exit(1);
-	}
+          if((err = db->put(0, &d_key, &d_value, 0)) != 0) {
+            cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+            exit(1);
+          }
 #else
-	ret = gdbm_store(db, d_key, d_value, GDBM_REPLACE);
+          ret = gdbm_store(db, d_key, d_value, GDBM_REPLACE);
 #endif
-      }
-      else {
+        }
+        else {
 #ifdef HAVE_BERKELEY
-	if((err = db->put(NULL, &d_key, &d_value, DB_NOOVERWRITE)) != 0) {
-	  if(err == DB_KEYEXIST) {
-	    cerr << "Key " + config.key + " already exists" << "(" << strerror(err) << ")" << endl;
-	    exit(1);
-	  }
-	  else {
-	    cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-	    exit(1);
-	  }
-	}
+          if((err = db->put(NULL, &d_key, &d_value, DB_NOOVERWRITE)) != 0) {
+            if(err == DB_KEYEXIST) {
+              cerr << "Key " + config.key + " already exists" << "(" << strerror(err) << ")" << endl;
+              exit(1);
+            }
+            else {
+              cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+              exit(1);
+            }
+          }
 #else
-	ret = gdbm_store(db, d_key, d_value, GDBM_INSERT);
+          ret = gdbm_store(db, d_key, d_value, GDBM_INSERT);
 #endif
-      }
+        }
 #ifndef HAVE_BERKELEY
-      if(ret != 0) {
-	cerr << pkg << ": " << gdbm_strerror(gdbm_errno) << endl;
-	exit(1);
+        if(ret != 0) {
+          cerr << pkg << ": " << gdbm_strerror(gdbm_errno) << endl;
+          exit(1);
+        }
+#endif
+        key = "";
+        value = "";
+        continue;
       }
-#endif
-      key = "";
-      value = "";
-      continue;
-    }
-    else if(c == config.separator && mode != "value" && config.token == "") {
-      // key ready, the following stuff is the data!
-      mode = "value";
-      continue;
-    }
-    if(config.token != "") {
-      /* we have a split token */
-      line += char(c);
-    }
-    else {
-      if(mode == "key")
-	key += char(c);
-      else
-	value += char(c);
-    }
-  }
-  pcre_free(p_pcre);
-#ifdef HAVE_BERKELEY
-  db->close(0);
-#else
-  gdbm_close(db);
-#endif
-}
-
-
-/*
- * Insert data into the db
- */
-void Engine::insert() {
-  init();
-  string __value;
-  __value = encode(config.value);
-#ifdef HAVE_BERKELEY
-  int err;
-  char *k;
-  char *v;
-  k = (char *)config.key.c_str();
-  v = (char *)__value.c_str();
-  Dbt key(k, strlen(k));
-  Dbt value(v, strlen(v));
-#else
-  int ret;
-  datum key   = {(char *)config.key.c_str(), config.key.length()};
-  datum value = {(char *)__value.c_str(), __value.length()};
-#endif
-
-  if(config.force == 1) {
-#ifdef HAVE_BERKELEY
-    if((err = db->put(0, &key, &value, 0)) != 0) {
-      cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-      exit(1);
-    }
-#else
-    ret = gdbm_store(db, key, value, GDBM_REPLACE);
-#endif
-  }
-  else {
-#ifdef HAVE_BERKELEY
-    if((err = db->put(NULL, &key, &value, DB_NOOVERWRITE)) != 0) {
-      if(err == DB_KEYEXIST) {
-	cerr << "Key " + config.key + " already exists" << "(" << strerror(err) << ")" << endl;
-	exit(1);
+      else if(c == config.separator && mode != "value" && config.token == "") {
+        // key ready, the following stuff is the data!
+        mode = "value";
+        continue;
+      }
+      if(config.token != "") {
+        /* we have a split token */
+        line += char(c);
       }
       else {
-	cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-	exit(1);
+        if(mode == "key")
+          key += char(c);
+        else
+          value += char(c);
       }
     }
+
+  pcre2_match_data_free(match_data);
+  pcre2_code_free(p_pcre); 
+    
+#ifdef HAVE_BERKELEY
+    db->close(0);
 #else
-    ret = gdbm_store(db, key, value, GDBM_INSERT);
+    gdbm_close(db);
 #endif
   }
+
+
+  /*
+   * Insert data into the db
+   */
+  void Engine::insert() {
+    init();
+    string __value;
+    __value = encode(config.value);
 #ifdef HAVE_BERKELEY
-  db->close(0);
+    int err;
+    char *k;
+    char *v;
+    k = (char *)config.key.c_str();
+    v = (char *)__value.c_str();
+    Dbt key(k, strlen(k));
+    Dbt value(v, strlen(v));
 #else
-  if(ret != 0) {
-    cerr << pkg << ": " << gdbm_strerror(gdbm_errno) << endl;
-    exit(1);
-  }
-  gdbm_close(db);
-#endif
-}
-
-
-
-/*
- * update a database
- */
-void Engine::update() {
-  init();
-  string __value;
-  __value = encode(config.value);
-#ifdef HAVE_BERKELEY
-  int err;
-  char *k;
-  char *v;
-  k = (char *)config.key.c_str();
-  v = (char *)__value.c_str();
-  Dbt key(k, strlen(k));
-  Dbt value(v, strlen(v));
-#else
-  int ret;
-  datum key   = {(char *)config.key.c_str(), config.key.length()};
-  datum value = {(char *)__value.c_str(), __value.length()};
+    int ret;
+    datum key   = {(char *)config.key.c_str(), config.key.length()};
+    datum value = {(char *)__value.c_str(), __value.length()};
 #endif
 
-  if(config.force == 1) {
+    if(config.force == 1) {
 #ifdef HAVE_BERKELEY
-    if((err = db->put(0, &key, &value, 0)) != 0) {
-      cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-      exit(1);
-    }
-#else
-    ret = gdbm_store(db, key, value, GDBM_REPLACE);
-#endif
-  }
-  else {
-#ifdef HAVE_BERKELEY
-    Dbt val;
-    err = db->get(0, &key, &val, 0);
-    if(err == 0) {
-      /* key exists, do the update */
       if((err = db->put(0, &key, &value, 0)) != 0) {
-	cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-	exit(1);
+        cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+        exit(1);
       }
+#else
+      ret = gdbm_store(db, key, value, GDBM_REPLACE);
+#endif
     }
-    else if(err == DB_NOTFOUND) {
-      cerr << "Key " << config.key << " does not exist\n";
+    else {
+#ifdef HAVE_BERKELEY
+      if((err = db->put(NULL, &key, &value, DB_NOOVERWRITE)) != 0) {
+        if(err == DB_KEYEXIST) {
+          cerr << "Key " + config.key + " already exists" << "(" << strerror(err) << ")" << endl;
+          exit(1);
+        }
+        else {
+          cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+          exit(1);
+        }
+      }
+#else
+      ret = gdbm_store(db, key, value, GDBM_INSERT);
+#endif
+    }
+#ifdef HAVE_BERKELEY
+    db->close(0);
+#else
+    if(ret != 0) {
+      cerr << pkg << ": " << gdbm_strerror(gdbm_errno) << endl;
       exit(1);
     }
+    gdbm_close(db);
+#endif
+  }
+
+
+  /*
+   * update a database
+   */
+  void Engine::update() {
+    init();
+    string __value;
+    __value = encode(config.value);
+#ifdef HAVE_BERKELEY
+    int err;
+    char *k;
+    char *v;
+    k = (char *)config.key.c_str();
+    v = (char *)__value.c_str();
+    Dbt key(k, strlen(k));
+    Dbt value(v, strlen(v));
+#else
+    int ret;
+    datum key   = {(char *)config.key.c_str(), config.key.length()};
+    datum value = {(char *)__value.c_str(), __value.length()};
+#endif
+
+    if(config.force == 1) {
+#ifdef HAVE_BERKELEY
+      if((err = db->put(0, &key, &value, 0)) != 0) {
+        cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+        exit(1);
+      }
+#else
+      ret = gdbm_store(db, key, value, GDBM_REPLACE);
+#endif
+    }
+    else {
+#ifdef HAVE_BERKELEY
+      Dbt val;
+      err = db->get(0, &key, &val, 0);
+      if(err == 0) {
+        /* key exists, do the update */
+        if((err = db->put(0, &key, &value, 0)) != 0) {
+          cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+          exit(1);
+        }
+      }
+      else if(err == DB_NOTFOUND) {
+        cerr << "Key " << config.key << " does not exist\n";
+        exit(1);
+      }
+      else {
+        cerr << "Database error" << "(" << strerror(err) << ")" << endl;
+        exit(1);
+      }
+#else
+      ret = gdbm_exists(db, key);
+      if(ret) {
+        ret = gdbm_store(db, key, value, GDBM_REPLACE);
+      }
+      else {
+        cerr << "Key " << config.key << " does not exist\n";
+        exit(1);
+      }
+#endif
+    }
+#ifdef HAVE_BERKELEY
+    db->close(0);
+#else
+    if(ret != 0) {
+      cerr << pkg << ": " << gdbm_strerror(gdbm_errno) << endl;
+      exit(1);
+    }
+    gdbm_close(db);
+#endif
+  }
+
+
+  /*
+   * remove an entry
+   */
+  void Engine::remove() {
+    init();
+#ifdef HAVE_BERKELEY
+    char *k = (char *)config.key.c_str();
+    Dbt key(k, strlen(k));
+    int ret;
+    if((ret = db->del(NULL, &key, 0)) != 0) {
+      cerr << "Database error" << "(" << strerror(ret) << ")" << endl;
+      exit(1);
+    }
+    db->close(0);
+#else
+    datum key   = {(char *)config.key.c_str(), config.key.length()};
+    int ret;
+    if((ret = gdbm_delete(db, key)) != 0) {
+      cerr << "Database error" << "(" << strerror(ret) << ")" << endl;
+      exit(1);
+    }
+    gdbm_close(db);
+#endif
+  }
+
+
+  /*
+   * search for specific data
+   */
+  void Engine::select() {
+    init();
+#ifdef HAVE_BERKELEY
+    int err;
+    char *k;
+    k = (char *)config.key.c_str();
+    Dbt key(k, strlen(k));
+    Dbt value;
+    err = db->get(0, &key, &value, 0);
+    if(err == 0) {
+      string gotvalue((char *)value.get_data(), value.get_size());
+      if(config.reverse == 1) {
+        cout << decode(gotvalue);
+        if(config.with == 1) {
+          cout << config.separator << config.key;
+        }
+        cout << endl;
+      }
+      else {
+        if(config.with == 1) {
+          cout << config.key << config.separator;
+        }
+        cout << decode(gotvalue) << endl;
+      }
+    }
     else {
       cerr << "Database error" << "(" << strerror(err) << ")" << endl;
       exit(1);
     }
+    db->close(0);
 #else
-    ret = gdbm_exists(db, key);
-    if(ret) {
-      ret = gdbm_store(db, key, value, GDBM_REPLACE);
-    }
-    else {
-      cerr << "Key " << config.key << " does not exist\n";
-      exit(1);
-    }
+    datum content;
+    datum key   = {(char *)config.key.c_str(), config.key.length()};
+    content = gdbm_fetch(db, key);
+    string V(content.dptr, content.dsize);
+    if(config.with == 1)
+      cout << config.key << config.separator;
+    cout << decode(V) << endl;
+    gdbm_close(db);
 #endif
   }
-#ifdef HAVE_BERKELEY
-  db->close(0);
-#else
-  if(ret != 0) {
-    cerr << pkg << ": " << gdbm_strerror(gdbm_errno) << endl;
-    exit(1);
-  }
-  gdbm_close(db);
-#endif
-}
 
-
-
-/*
- * remove an entry
- */
-void Engine::remove() {
-  init();
-  int ret;
-#ifdef HAVE_BERKELEY
-  Dbt key((char *)config.key.c_str(), config.key.length() + 1);
-  if((ret = db->del(NULL, &key, 0)) != 0) {
-    cerr << "Database error" << "(" << strerror(ret) << ")" << endl;
-    exit(1);
-  }
-  db->close(0);
-#else
-  datum key   = {(char *)config.key.c_str(), config.key.length()};
-  ret = gdbm_delete(db, key);
-  gdbm_close(db);
-#endif
-}
-
-
-
-/*
- * search for specific data
- */
-void Engine::select() {
-  init();
-#ifdef HAVE_BERKELEY
-  int err;
-  char *k;
-  k = (char *)config.key.c_str();
-  Dbt key(k, strlen(k));
-  Dbt value;
-  err = db->get(0, &key, &value, 0);
-  if(err == 0) {
-    string gotvalue((char *)value.get_data(), value.get_size());
-    if(config.reverse == 1) {
-      cout << decode(gotvalue);
-      if(config.with == 1) {
-	cout << config.separator << config.key;
-      }
-      cout << endl;
+  string Engine::encode(const string& data) {
+    if(config.encrypted) {
+      return rijn.encrypt(data);
     }
-    else {
-      if(config.with == 1) {
-	cout << config.key << config.separator;
-      }
-      cout << decode(gotvalue) << endl;
+    else
+      return data;
+  }
+
+  string Engine::decode(const string& data) {
+    if(config.encrypted) {
+      return rijn.decrypt(data);
     }
+    else
+      return data;
   }
-  else {
-    cerr << "Database error" << "(" << strerror(err) << ")" << endl;
-    exit(1);
-  }
-  db->close(0);
-#else
-  datum content;
-  datum key   = {(char *)config.key.c_str(), config.key.length()};
-  content = gdbm_fetch(db, key);
-  string V(content.dptr, content.dsize);
-  if(config.with == 1)
-    cout << config.key << config.separator;
-  cout << decode(V) << endl;
-  gdbm_close(db);
-#endif
-}
-
-string Engine::encode(const string& data) {
-  if(config.encrypted) {
-    return rijn.encrypt(data);
-  }
-  else
-    return data;
-}
-
-string Engine::decode(const string& data) {
-  if(config.encrypted) {
-    return rijn.decrypt(data);
-  }
-  else
-    return data;
-}
-

engine.h

@@ -58,9 +58,10 @@
 #include <string>
 
 extern "C" {
+#include "platform.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <pcre.h>
+#include <pcre2.h>
 }
 
 #ifdef HAVE_BERKELEY
@@ -74,8 +75,7 @@ extern "C" {
 #endif
 #endif
 
-#include "platform.h"
-#include DB_CXX_HEADER
+#include <db_cxx.h>
 
 #else
 

meson.build

@@ -0,0 +1,120 @@
+project(
+        'dbtool',
+        'cpp',
+        license: 'GPL',
+        version: '1.9.3',
+        meson_version: '>=1.3',
+        default_options: [
+                'warning_level=2',
+                'werror=true',
+        ],
+)
+
+add_project_arguments(
+        [
+                '-Wno-unused-parameter',
+                '-Wno-unused-result',
+                '-Wno-missing-braces',
+                '-Wno-format-zero-length',
+                '-Wvla',
+                '-Wno-sign-compare',
+                '-Wno-narrowing'
+        ],
+        language: 'cpp',
+)
+
+
+cpp = meson.get_compiler('cpp')
+conf = configuration_data()
+dbtool_inc = include_directories('.')
+
+if host_machine.system().startswith('freebsd')
+  dbtool_inc = include_directories('.', '/usr/local/include')
+  add_project_link_arguments('LDFLAGS=/usr/local/lib')
+endif
+
+
+# check for funcs.
+foreach func : ['getopt', 'fdopen', 'fgetc', 'getenv', 'getpass']
+    conf.set('HAVE_'+func.to_upper(), cpp.has_function(func, prefix : '#include <unistd.h>\n#include <stdio.h>\n#include <stdlib.h>'))
+endforeach
+
+
+
+# check for libraries with CMAKE or pkg-config
+pcre2 = dependency('libpcre2-8')
+
+
+# manually check for libraries
+lib_berkeley = cpp.find_library('db_cxx', required: false,
+               dirs : ['/usr', '/usr/local'])
+inc_berkeley = include_directories('/usr', '/usr/local')
+
+lib_gdbm = cpp.find_library('gdbm', required: false,
+               dirs : ['/usr', '/usr/local'])
+inc_gdbm = include_directories('/usr', '/usr/local')
+
+
+if not lib_gdbm.found() and not lib_berkeley.found()
+  error('neither GDBM nor BerkeleyDB are installed')
+endif
+
+# check commandline options
+prefix = get_option('prefix')
+
+if get_option('buildtype') == 'debug'
+    conf.set('DEBUG', '1')
+endif
+
+
+
+# setup conf map
+version = '@0@'.format(meson.project_version())
+
+conf.set('HAVE_LIBPCRE', pcre2.found())
+conf.set('HAVE_BERKELEY', lib_berkeley.found())
+conf.set('HAVE_GDBM', lib_gdbm.found())
+conf.set('prefix', prefix)
+conf.set('VERSION', version)
+
+
+# write out the config header
+m = configure_file(
+  input : 'platform.h.in',
+  output : 'platform.h',
+  configuration : conf,
+)
+
+
+# code
+dbtool_sources = files(
+  'cipher.cc',
+  'config.cc',
+  'dbtool.cc',
+  'digest.cc',
+  'engine.cc',
+  'rijndael.cc'
+)
+
+# add dependencies, manual libs are added directly below
+dbtool_deps = [
+  pcre2
+]
+
+
+executable(
+        'dbtool',
+        [dbtool_sources],
+        include_directories: [dbtool_inc, inc_berkeley, inc_gdbm],
+        dependencies: [dbtool_deps, lib_berkeley, lib_gdbm],
+        install: true
+)
+
+# build manual page
+pod2man = find_program('pod2man', native: true)
+if pod2man.found()
+  res = run_command(pod2man.full_path(), 'dbtool.pod', 'dbtool.1', check:true)
+  if res.returncode() == 0
+    install_man('dbtool.1')
+  endif
+endif

meson_options.txt

@@ -0,0 +1 @@
+# custom build options

platform.h.in

@@ -1,92 +1,19 @@
 /* platform.h.in.  Generated from configure.ac by autoheader.  */
 
-/* "Berkeley DB C++ Header File" */
-#undef DB_CXX_HEADER
+#mesondefine HAVE_BERKELEY
+#mesondefine HAVE_GDBM
+#mesondefine HAVE_LIBPCRE
+#mesondefine HAVE_GETPASS
+#mesondefine HAVE_GETOPT
+#mesondefine HAVE_FDOPEN
+#mesondefine HAVE_FGETC
+#mesondefine HAVE_GETENV
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `fdopen' function. */
-#undef HAVE_FDOPEN
+#define PCRE2_CODE_UNIT_WIDTH 8
+#define PACKAGE "dbtool"
 
-/* Define to 1 if you have the `fgetc' function. */
-#undef HAVE_FGETC
-
-/* Define to 1 if you have the `getenv' function. */
-#undef HAVE_GETENV
-
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define to 1 if you have the `getpass' function. */
-#undef HAVE_GETPASS
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `gdbm' library (-lgdbm). */
-#undef HAVE_LIBGDBM
-
-/* Define to 1 if you have the `pcre' library (-lpcre). */
-#undef HAVE_LIBPCRE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
+#define VERSION "@VERSION@"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

rijndael.cc

@@ -1108,7 +1108,7 @@ int Rijndael::blockEncrypt(const UINT8 *input,int inputLen,UINT8 *outBuffer)
 					iv[3][0] = (iv[3][0] << 1) | (iv[3][1] >> 7);
 					iv[3][1] = (iv[3][1] << 1) | (iv[3][2] >> 7);
 					iv[3][2] = (iv[3][2] << 1) | (iv[3][3] >> 7);
-					iv[3][3] = (iv[3][3] << 1) | (outBuffer[k/8] >> (7-(k&7))) & 1;
+					iv[3][3] = (iv[3][3] << 1) | ((outBuffer[k/8] >> (7-(k&7))) & 1);
 				}
 			}
 		break;
@@ -1262,7 +1262,7 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer)
 					iv[3][0] = (iv[3][0] << 1) | (iv[3][1] >> 7);
 					iv[3][1] = (iv[3][1] << 1) | (iv[3][2] >> 7);
 					iv[3][2] = (iv[3][2] << 1) | (iv[3][3] >> 7);
-					iv[3][3] = (iv[3][3] << 1) | (input[k/8] >> (7-(k&7))) & 1;
+					iv[3][3] = (iv[3][3] << 1) | ((input[k/8] >> (7-(k&7))) & 1);
 					outBuffer[k/8] ^= (block[0] & 0x80) >> (k & 7);
 				}
 			}