Update changelogs and bump version for v2.5.1

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

.codedocs

@@ -0,0 +1,193 @@
+# CodeDocs.xyz Configuration File
+#
+# Rename this example to '.codedocs' and put it in the root directory of your
+# repository. This file is optional, documentation will still be generated
+# without it using sensible defaults.
+
+#---------------------------------------------------------------------------
+# CodeDocs Configuration
+#---------------------------------------------------------------------------
+
+# Include the Doxygen configuration from another file.
+# The file must be a relative path with respect to the root of the repository.
+# If any of the options in this doxyfile include a path (ie, INPUT), these
+# paths will be considered relative to the root of the repository, not the
+# location of the DOXYFILE.
+
+DOXYFILE = doc/Doxyfile
+
+# Specify external repository to link documentation with.
+# This is similar to Doxygen's TAGFILES option, but will automatically link to
+# tags of other repositories already using CodeDocs. List each repository to
+# link with by giving its location in the form of owner/repository.
+# For example:
+#   TAGLINKS = doxygen/doxygen CodeDocs/osg
+# Note: these repositories must already be built on CodeDocs.
+
+TAGLINKS =
+
+#---------------------------------------------------------------------------
+# Doxygen Configuration
+#---------------------------------------------------------------------------
+
+# Doxygen configuration may also be placed in this file.
+# Currently, the following Doxygen configuration options are available. Refer
+# to http://doxygen.org/manual/config.html for detailed explanation of the
+# options. To request support for more options, contact support@codedocs.xyz.
+#
+# ABBREVIATE_BRIEF =
+# ALIASES =
+# ALLEXTERNALS =
+# ALLOW_UNICODE_NAMES =
+# ALPHABETICAL_INDEX =
+# ALWAYS_DETAILED_SEC =
+# AUTOLINK_SUPPORT =
+# BRIEF_MEMBER_DESC =
+# BUILTIN_STL_SUPPORT =
+# CALLER_GRAPH =
+# CALL_GRAPH =
+# CASE_SENSE_NAMES =
+# CITE_BIB_FILES =
+# CLASS_DIAGRAMS =
+# CLASS_GRAPH =
+# COLLABORATION_GRAPH =
+# COLS_IN_ALPHA_INDEX =
+# CPP_CLI_SUPPORT =
+# DIAFILE_DIRS =
+# DIRECTORY_GRAPH =
+# DISABLE_INDEX =
+# DISTRIBUTE_GROUP_DOC =
+# DOTFILE_DIRS =
+# DOT_FONTNAME =
+# DOT_FONTSIZE =
+# DOT_GRAPH_MAX_NODES =
+# DOT_IMAGE_FORMAT =
+# DOT_TRANSPARENT =
+# DOXYFILE_ENCODING =
+# ENABLED_SECTIONS =
+# ENABLE_PREPROCESSING =
+# ENUM_VALUES_PER_LINE =
+# EXAMPLE_PATH =
+# EXAMPLE_PATTERNS =
+# EXAMPLE_RECURSIVE =
+EXCLUDE = src/README.md
+# EXCLUDE_PATTERNS =
+# EXCLUDE_SYMBOLS =
+# EXPAND_AS_DEFINED =
+# EXPAND_ONLY_PREDEF =
+# EXTENSION_MAPPING =
+# EXTERNAL_GROUPS =
+# EXTERNAL_PAGES =
+# EXTRACT_ALL =
+# EXTRACT_ANON_NSPACES =
+# EXTRACT_LOCAL_CLASSES =
+# EXTRACT_LOCAL_METHODS =
+# EXTRACT_PACKAGE =
+# EXTRACT_PRIVATE =
+# EXTRACT_STATIC =
+# EXT_LINKS_IN_WINDOW =
+# FILE_PATTERNS =
+# FORCE_LOCAL_INCLUDES =
+# FORMULA_FONTSIZE =
+# FORMULA_TRANSPARENT =
+# FULL_PATH_NAMES =
+# GENERATE_BUGLIST =
+# GENERATE_DEPRECATEDLIST =
+# GENERATE_LEGEND =
+# GENERATE_TESTLIST =
+# GENERATE_TODOLIST =
+# GENERATE_TREEVIEW =
+# GRAPHICAL_HIERARCHY =
+# GROUP_GRAPHS =
+# GROUP_NESTED_COMPOUNDS =
+# HIDE_COMPOUND_REFERENCE= =
+# HIDE_FRIEND_COMPOUNDS =
+# HIDE_IN_BODY_DOCS =
+# HIDE_SCOPE_NAMES =
+# HIDE_UNDOC_CLASSES =
+# HIDE_UNDOC_MEMBERS =
+# HIDE_UNDOC_RELATIONS =
+# HTML_COLORSTYLE_GAMMA =
+# HTML_COLORSTYLE_HUE =
+# HTML_COLORSTYLE_SAT =
+# HTML_DYNAMIC_SECTIONS =
+# HTML_EXTRA_FILES =
+# HTML_EXTRA_STYLESHEET =
+# HTML_FOOTER =
+# HTML_HEADER =
+# HTML_INDEX_NUM_ENTRIES =
+# HTML_STYLESHEET =
+# HTML_TIMESTAMP =
+# IDL_PROPERTY_SUPPORT =
+# IGNORE_PREFIX =
+# IMAGE_PATH =
+# INCLUDED_BY_GRAPH =
+# INCLUDE_FILE_PATTERNS =
+# INCLUDE_GRAPH =
+# INCLUDE_PATH =
+# INHERIT_DOCS =
+# INLINE_GROUPED_CLASSES =
+# INLINE_INFO =
+# INLINE_INHERITED_MEMB =
+# INLINE_SIMPLE_STRUCTS =
+# INLINE_SOURCES =
+INPUT = src/ README.md doc/API.md
+# INPUT_ENCODING =
+# INTERACTIVE_SVG =
+# INTERNAL_DOCS =
+# JAVADOC_AUTOBRIEF =
+# LAYOUT_FILE =
+# MACRO_EXPANSION =
+# MARKDOWN_SUPPORT =
+# MAX_DOT_GRAPH_DEPTH =
+# MSCFILE_DIRS =
+# MULTILINE_CPP_IS_BRIEF =
+# OPTIMIZE_FOR_FORTRAN =
+# OPTIMIZE_OUTPUT_FOR_C =
+# OPTIMIZE_OUTPUT_JAVA =
+# OPTIMIZE_OUTPUT_VHDL =
+# OUTPUT_LANGUAGE =
+# PLANTUML_JAR_PATH =
+# PREDEFINED =
+# PROJECT_BRIEF =
+# PROJECT_LOGO =
+# PROJECT_NAME =
+# PROJECT_NUMBER =
+# QT_AUTOBRIEF =
+# RECURSIVE =
+# REFERENCED_BY_RELATION =
+# REFERENCES_LINK_SOURCE =
+# REFERENCES_RELATION =
+# REPEAT_BRIEF =
+# SEARCHENGINE =
+# SEARCH_INCLUDES =
+# SEPARATE_MEMBER_PAGES =
+# SHORT_NAMES =
+# SHOW_FILES =
+# SHOW_GROUPED_MEMB_INC =
+# SHOW_INCLUDE_FILES =
+# SHOW_NAMESPACES =
+# SHOW_USED_FILES =
+# SIP_SUPPORT =
+# SKIP_FUNCTION_MACROS =
+# SORT_BRIEF_DOCS =
+# SORT_BY_SCOPE_NAME =
+# SORT_GROUP_NAMES =
+# SORT_MEMBERS_CTORS_1ST =
+# SORT_MEMBER_DOCS =
+# SOURCE_BROWSER =
+# SOURCE_TOOLTIPS =
+# STRICT_PROTO_MATCHING =
+# STRIP_CODE_COMMENTS =
+# STRIP_FROM_INC_PATH =
+# STRIP_FROM_PATH =
+# SUBGROUPING =
+# TAB_SIZE =
+# TEMPLATE_RELATIONS =
+# TREEVIEW_WIDTH =
+# TYPEDEF_HIDES_STRUCT =
+# UML_LIMIT_NUM_FIELDS =
+# UML_LOOK =
+USE_MDFILE_AS_MAINPAGE = README.md
+# VERBATIM_HEADERS =
+#

.github/CONTRIBUTING.md

@@ -0,0 +1,90 @@
+Contributing to the Project
+===========================
+
+Thank you for considering contributing back to [Free Software][1]!
+
+There are a few things we would like you to consider when filing an
+issue or pull request with this project:
+
+1. If you are filing a bug report or feature request
+
+   Please take the time to check if an issue already has been filed
+   matching your problem
+
+2. What version are you running, have you tried the latest release?
+
+   UNIX distributions often package and test software for their
+   particular brand.  If you are using a pre-packaged version,
+   then please file a bug with that distribution instead.
+
+3. Coding Style
+
+   Lines are allowed to be longer than 72 characters these days, there
+   is no enforced max. length.
+
+> **Tip:** Always submit code that follows the style of surrounding code!
+
+   The coding style itself is strictly Linux [KNF][], like GIT it is
+   becoming a de facto standard for C programming
+
+   https://www.kernel.org/doc/Documentation/CodingStyle
+
+4. Logical Change Sets
+
+   Changes should be broken down into logical units that add a feature
+   or fix a bug.  Keep changes separate from each other and do not mix a
+   bug fix with a whitespace cleanup or a new feature addition.
+
+   This is important not only for readability, or for the possibility of
+   maintainers to revert changes, but does also increase your chances of
+   having a change accepted.
+
+5. Commit messages
+
+   Commit messages exist to track *why* a change was made.  Try to be as
+   clear and concise as possible in your commit messages, and always, be
+   proud of your work and set up a proper GIT identity for your commits:
+
+        git config --global user.name "J. Random Hacker"
+        git config --global user.email random.j.hacker@example.com
+
+   See this helpful guide for how to write simple, readable commit
+   messages, or have at least a look at the below example.
+
+   http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+
+
+Example
+-------
+
+Example commit message from the [Pro Git][gitbook] online book, notice
+how `git commit -s` is used to automatically add a `Signed-off-by`:
+
+    Capitalized, short (50 chars or less) summary
+
+    More detailed explanatory text, if necessary.  Wrap it to about 72
+    characters or so.  In some contexts, the first line is treated as the
+    subject of an email and the rest of the text as the body.  The blank
+    line separating the summary from the body is critical (unless you omit
+    the body entirely); tools like rebase can get confused if you run the
+    two together.
+
+    Write your commit message in the imperative: "Fix bug" and not "Fixed bug"
+    or "Fixes bug."  This convention matches up with commit messages generated
+    by commands like git merge and git revert.
+
+    Further paragraphs come after blank lines.
+
+    - Bullet points are okay, too
+
+    - Typically a hyphen or asterisk is used for the bullet, followed by a
+      single space, with blank lines in between, but conventions vary here
+
+    - Use a hanging indent
+
+    Signed-off-by: J. Random Hacker <random.j.hacker@example.com>
+
+
+[1]:       http://www.gnu.org/philosophy/free-sw.en.html
+[KNF]:     https://en.wikipedia.org/wiki/Kernel_Normal_Form
+[gitbook]: https://git-scm.com/book/ch5-2.html

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [troglobit]

.github/workflows/build.yml

@@ -0,0 +1,71 @@
+name: Bob the Builder
+
+# Run on all branches, including all pull requests, except the 'dev'
+# branch since that's where we run Coverity Scan (limited tokens/day)
+on:
+  push:
+    branches:
+      - '**'
+      - '!dev'
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    # Verify we can build on latest Ubuntu with both gcc and clang
+    name: ${{ matrix.compiler }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: [gcc, clang]
+      fail-fast: false
+    env:
+      MAKEFLAGS: -j3
+      CC: ${{ matrix.compiler }}
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install tree doxygen
+      - uses: actions/checkout@v2
+      - name: Configure
+        run: |
+          ./autogen.sh
+          ./configure --prefix= --disable-silent-rules
+      - name: Build
+        run: |
+          make
+      - name: Install to ~/tmp and Inspect
+        run: |
+          DESTDIR=~/tmp make install-strip
+          tree ~/tmp
+      - name: Run Unit Tests
+        run: |
+          make check || (cat test/test-suite.log; false)
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v2
+        with:
+          name: libite-test-${{ matrix.compiler }}
+          path: test/*
+  debian:
+    name: Verify Debian Package
+    runs-on: ubuntu-latest
+    container: debian:stable
+    env:
+      MAKEFLAGS: -j3
+    steps:
+      - uses: actions/checkout@v2
+      - name: Installing dependencies
+        run: |
+          apt-get update
+          apt-get install -y build-essential autoconf automake pkg-config doxygen \
+                             dpkg-dev debhelper devscripts
+      - name: Building Debian package
+        run: |
+          ./autogen.sh
+          ./configure
+          make check || (cat test/test-suite.log; false)
+          make distcheck
+          make package
+          cat ../*.changes

.github/workflows/coverity.yml

@@ -0,0 +1,82 @@
+name: Coverity Scan
+
+on:
+  push:
+    branches:
+      - 'dev'
+
+env:
+  PROJECT_NAME: libite
+  CONTACT_EMAIL: troglobit@gmail.com
+  COVERITY_NAME: troglobit-libite
+  COVERITY_PROJ: troglobit%2Flibite
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Fetch latest Coverity Scan MD5
+        id: var
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        run: |
+          wget -q https://scan.coverity.com/download/cxx/linux64         \
+               --post-data "token=$TOKEN&project=${COVERITY_PROJ}&md5=1" \
+               -O coverity-latest.tar.gz.md5
+          export MD5=$(cat coverity-latest.tar.gz.md5)
+          echo "Got MD5 $MD5"
+          echo ::set-output name=md5::${MD5}
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: coverity-latest.tar.gz
+          key: ${{ runner.os }}-coverity-${{ steps.var.outputs.md5 }}
+          restore-keys: |
+            ${{ runner.os }}-coverity-${{ steps.var.outputs.md5 }}
+            ${{ runner.os }}-coverity-
+            ${{ runner.os }}-coverity
+      - name: Download Coverity Scan
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        run: |
+          if [ ! -f coverity-latest.tar.gz ]; then
+            wget -q https://scan.coverity.com/download/cxx/linux64   \
+                 --post-data "token=$TOKEN&project=${COVERITY_PROJ}" \
+                 -O coverity-latest.tar.gz
+          else
+            echo "Latest Coverity Scan available from cache :-)"
+            md5sum coverity-latest.tar.gz
+          fi
+          mkdir coverity
+          tar xzf coverity-latest.tar.gz --strip 1 -C coverity
+      - name: Install dependencies
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install pkg-config
+      - name: Configure
+        run: |
+          ./autogen.sh
+          ./configure --prefix= --disable-silent-rules
+      - name: Build
+        run: |
+          export PATH=`pwd`/coverity/bin:$PATH
+          cov-build --dir cov-int make
+      - name: Submit results to Coverity Scan
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        run: |
+          tar czvf ${PROJECT_NAME}.tgz cov-int
+          curl \
+            --form project=${COVERITY_NAME} \
+            --form token=$TOKEN \
+            --form email=${CONTACT_EMAIL} \
+            --form file=@${PROJECT_NAME}.tgz \
+            --form version=trunk \
+            --form description="${PROJECT_NAME} $(git rev-parse HEAD)" \
+            https://scan.coverity.com/builds?project=${COVERITY_PROJ}
+      - name: Upload build.log
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverity-build.log
+          path: cov-int/build-log.txt

.github/workflows/release.yml

@@ -0,0 +1,62 @@
+name: Release General
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    name: Create GitHub release
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_id: ${{ steps.create_release.outputs.id }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Extract ChangeLog entry ...
+        # Hack to extract latest entry for body_path below
+        run: |
+          awk '/-----*/{if (x == 1) exit; x=1;next}x' ChangeLog.md \
+              |head -n -1 > release.md
+          cat release.md
+      - name: Create release ...
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Libite (-lite) ${{ github.ref }}
+          body_path: release.md
+          draft: false
+          prerelease: false
+  tarball:
+    name: Build and upload release tarball
+    needs: release
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Installing dependencies ...
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install tree doxygen
+      - name: Creating Makefiles ...
+        run: |
+          ./autogen.sh
+          ./configure
+      - name: Build release ...
+        run: |
+          make release || (cat test/test-suite.log; false)
+          ls -lF ../
+          mkdir -p artifacts/
+          mv ../*.tar.* artifacts/
+      - name: Upload release artifacts ...
+        uses: skx/github-action-publish-binaries@release-0.15
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          releaseId: ${{ needs.release.outputs.release_id }}
+          args: artifacts/*

.gitignore

@@ -1,12 +1,8 @@
 *~
-*.d
-*.o
-*.so
-*.so.*
-*.a
-.deps
-.libs
-tmp/
+ID
+GPATH
+GRTAGS
+GTAGS
 compile
 config.*
 configure
@@ -21,4 +17,5 @@ Makefile.in
 aclocal.m4
 ar-lib
 autom4te.cache
-libite*
+test-driver
+libite.pc

.travis.yml

@@ -1,20 +0,0 @@
-# Travis CI integration -- https://travis-ci.org/troglobit/libite
-# Defaults to GNU GCC and autotools: ./configure && make && make test
-language: c
-
-# Use docker for quicker builds, it now allows https://docs.travis-ci.com/user/apt/
-sudo: false
-
-# Test build with both GCC and Clang (LLVM)
-compiler:
-  - gcc
-  - clang
-
-script:
-  - ./autogen.sh
-  - ./configure --prefix=/tmp --disable-silent-rules
-  - make clean
-  - make -j5
-  - make install-strip
-  - ls -lR /tmp
-  - make check

ChangeLog.md

@@ -3,6 +3,266 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+
+[v2.5.1][] - 2021-12-02
+-----------------------
+
+Debian-only fix.
+
+### Fixes
+- Use `dh_link(1)` to install `/usr/include/lite -> libite/`.  The
+  symlink created by libite installer itself is not kept.
+
+
+[v2.5.0][] - 2021-11-30
+-----------------------
+
+> **Note:** namespace change; the -lite library include files have moved
+>           from `lite/*.h` to `libite/*.h` due to an unfortunate clash
+>           with "LiTE is a Toobox Engine", from the DirectFB project.
+>           For a transitional period, however, a compatibility symlink
+>           is installed; `lite -> libite/`.
+
+### Changes
+- Header files have moved from `lite/*.h` to `libite/*.h` to prevent
+  clashing with DirectFB LiTE library.
+- Include guards in header files have been renamed, much in the same
+  fashion as the move (above), from `LITE_foo_H_` to `LIBITE_FOO_H_`
+- Add configure option to disable compatibility symlink, for systems
+  that do not want name clashes with DirectFB/LiTE, or do not need to
+  be backwards compatible; use `configure --without-symlink`
+
+### Fixes
+- Minor, use defensive coding in `strnlen()` replacement.  Only used
+  on systems that do not have a native implementation.
+
+
+[v2.4.1][] - 2021-10-09
+-----------------------
+
+### Changes
+- Add doxygen API documentation to project, included in tarball, and
+  automatically generated at https://codedocs.xyz/troglobit/libite/
+- Relocate `tests/` to `test/` in source tree
+- Relocate `docs/` to `doc/` in source tree
+
+### Fixes
+- Prefix CFLAGS/CPPFLAGS/etc with `AM_` in `test/Makefile.am` to prevent
+  clashing with environment.  Fix imported from libuEv
+- Replace obsolete `AM_CONFIG_HEADER` with `AC_CONFIG_HEADERS`
+- Fix issue with `tempfile()` returning EOPNOTSUPP on Azure, use
+  fallback to `mkostemp()` with `O_CLOEXEC` flag set
+
+
+[v2.4.0][] - 2021-03-27
+-----------------------
+
+### Changes
+
+- Add support for `touchf()`, formatted string support for `touch()`
+- Add support for `erasef()`, formatted string support for `erase()`
+- Add support for `strtrim()`, trims leading and trailing white-space
+  from a string
+
+### Fixes
+
+- Fix `systemf()` improper handling of `system()` return value.  Now
+  checks if exited OK, then returning the exit status of the command, or
+  if not exited OK, then checks if the command was signaled, and returns
+  -1 with `errno` set.  This also allows for returning 127, like
+  `system()`, if the shell, or the program itself, did not exist
+
+
+[v2.3.1][] - 2021-02-12
+-----------------------
+
+### Changes
+- Copyright updates, including LICENSE file, year + author last name
+
+### Fixes
+- Debian packaging fixes only
+
+
+[v2.3.0][] - 2021-02-12
+-----------------------
+
+### Changes
+- Add support for `fremove()`, formatted `remove()` replacement
+- Add support for `truncatef()`, formatted `truncate()` replacement
+- Add tar.gz archives to distribution
+
+### Fixes
+- Handle `ETIMEDOUT` error for `connect()` call in `telnet_open()`
+
+
+[v2.2.0][] - 2020-03-16
+-----------------------
+
+### Changes
+- Add support for `systemf()`, formatted string `system()` replacement
+- Add support for `fmkpath()`, formatted string `mkpath()`
+- Add support for `fopenf()`, formatted string `fopen()` replacement
+
+### Fixes
+- Fix possible memory leak in `rsync()`, found by Coverity Scan
+- Check return value of `fstat()` to prevent bogus destination file
+  times when using `copyfile()`, found by Coverity Scan
+
+
+[v2.1.2][] - 2020-02-22
+-----------------------
+
+### Fixes
+- Fix Debian package upgrade from libite -> libite5
+
+
+[v2.1.1][] - 2020-02-22
+-----------------------
+
+### Changes
+- Add test/example for `printhdr()`
+- Update copyright years
+
+### Fixes
+- chomp: Check for beginning of string while removing \n's
+
+
+[v2.1.0][] - 2019-08-26
+-----------------------
+
+### Changes
+- Add support for `strmatch()` and `strnmatch()`
+- Add support for `yorn()`, safe yes-or-no prompt
+- Add support for telnet expect/session APIs
+- Add modified `printhdr()` which takes ANSI attribute
+
+### Fixes
+- Fix `pidfile_signal()`: always return result of `kill()`, or the
+  result of `remove()` if we successfully sent `SIGKILL`
+- Fix `strtonum()`: POSIX `strtoll()` returns `EINVAL`, check that
+- Fix #13, support C++ `extern "C" {}` for header files
+
+
+[v2.0.2][] - 2018-05-10
+-----------------------
+
+### Fixes
+- Fix issue #12, missing includes in `strlite.h` for standalone use
+- FTBFS `strtonum.c` on older systems w/o `LLONG_MAX` and `LLONG_MIN`
+
+
+[v2.0.1][] - 2017-12-22
+-----------------------
+
+### Changes
+- Add missing `initscr()` declaration, regression in [v2.0.0][]
+- Add `#ifdef` guards around `min()` and `max()` macros
+- Add `const` to `char *` args in multiple API:s:
+  - `fexist()`
+  - `fgetint()`
+  - `fisslashdir()`
+  - `copyfile()`
+  - `movefile()`
+  - `ifconfig()`
+  - `lfopen()`
+  - `lfgetkey()`
+  - `lfgetint()`
+
+### Fixes
+- Fix #9, uncommon location of `which` command in unit test
+- Fix #10, supply unit test with a default `$PATH`
+- Fix #11, `touch()` command cannot handle relative paths when updating
+  the mtime of an existing file
+
+
+[v2.0.0][] - 2017-11-22
+-----------------------
+
+### Changes
+- Remove `tree()`, moved to toolbox.git instead
+- Remove `fmode()`, please use `stat()` instead, it's safer
+- Add support for keeping mtime in `copy()` and `rsync()`
+- Move source files to an `src/` sub-directory
+- Move `initscr()` from `conio.h` to `conio.c`
+- Update docs, recommend `mkpath()` over `makepath()`
+- Bump ABI version, major changes to library
+
+### Fixes
+- Fix #7, inconsistent return value in `mkpath()` and `makepath()`
+- Fix #8, constify `mkpath()` and `makepath()`
+
+
+[v1.9.3][] - 2017-10-24
+-----------------------
+
+### Changes
+- `initscr()`, use stdout, not stderr, like the rest of the
+  `conio.h` macros.  Also, stderr may be redirected by user
+- `tree()`, update unit test, use standard directries
+
+### Fixes
+- `initscr()`, verify that both stdin and stdout are real TTYs
+  before messing up output or blocking on input for the user
+- `tree()`, increase internal buffer slightly, output may be
+  truncated otherwise.  Found by GCC 7.2
+
+
+[v1.9.2][] - 2017-07-09
+-----------------------
+
+### Changes
+- Add `initscr()` function to query screen size
+- Convert `printheader()` to a static inline function
+
+
+[v1.9.1][] - 2017-07-03
+-----------------------
+
+### Changes
+- Add missing `whichp()` predicate function to accompany `which()`
+- Allow `which("ps aux")`, which skips any arguments to command
+
+
+[v1.9.0][] - 2017-07-02
+-----------------------
+
+### Changes
+- Add `which()`, a C implementation of UNIX which(1)
+- Add `printheader()`, prints a top-like table heading for client tools
+- Remove `UNUSED()` macro, recommended to disable GCC warning instead
+
+### Fixes
+- Fix issue #6: `touch()` does not update mtime if file exists
+- Fix non-writable `tempfile()`, now with proper unit test
+
+
+[v1.8.3][] - 2017-01-08
+-----------------------
+
+### Changes
+- Support absolute path in `pidfile()`.  Needed by, e.g. Inadyn
+- Add initial `debian/` packaging
+- Update README with note on remembering to set `umask()`
+
+### Fixes
+- In use-cases when `pidfile()` is called consecutively, e.g. on
+  `SIGHUP`, recreate PID file if it no longer exists
+
+
+[v1.8.2][] - 2016-09-05
+-----------------------
+
+### Changes
+- Updated build instructions in README.
+- Converted `touch()`, `makedir()`, `makefifo()`, and `erase()` from
+  macros to inline functions.  Also removed implicit logging to stderr
+  on error.
+
+### Fixes
+- Fix small memory leak in `pidfile()` ... at exit.
+- Fixes for building on musl libc
+
+
 [v1.8.1][] - 2016-06-25
 -----------------------
 
@@ -203,7 +463,27 @@ problems this may cause!
 Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 
 
-[UNRELEASED]: https://github.com/troglobit/libite/compare/v1.8.1...HEAD
+[UNRELEASED]: https://github.com/troglobit/libite/compare/v2.5.1...HEAD
+[v2.5.1]: https://github.com/troglobit/libite/compare/v2.5.0...v2.5.1
+[v2.5.0]: https://github.com/troglobit/libite/compare/v2.4.1...v2.5.0
+[v2.4.1]: https://github.com/troglobit/libite/compare/v2.4.0...v2.4.1
+[v2.4.0]: https://github.com/troglobit/libite/compare/v2.3.1...v2.4.0
+[v2.3.1]: https://github.com/troglobit/libite/compare/v2.3.0...v2.3.1
+[v2.3.0]: https://github.com/troglobit/libite/compare/v2.2.1...v2.3.0
+[v2.2.1]: https://github.com/troglobit/libite/compare/v2.2.0...v2.2.1
+[v2.2.0]: https://github.com/troglobit/libite/compare/v2.1.2...v2.2.0
+[v2.1.2]: https://github.com/troglobit/libite/compare/v2.1.1...v2.1.2
+[v2.1.1]: https://github.com/troglobit/libite/compare/v2.1.0...v2.1.1
+[v2.1.0]: https://github.com/troglobit/libite/compare/v2.0.2...v2.1.0
+[v2.0.2]: https://github.com/troglobit/libite/compare/v2.0.1...v2.0.2
+[v2.0.1]: https://github.com/troglobit/libite/compare/v2.0.0...v2.0.1
+[v2.0.0]: https://github.com/troglobit/libite/compare/v1.9.3...v2.0.0
+[v1.9.3]: https://github.com/troglobit/libite/compare/v1.9.2...v1.9.3
+[v1.9.2]: https://github.com/troglobit/libite/compare/v1.9.1...v1.9.2
+[v1.9.1]: https://github.com/troglobit/libite/compare/v1.9.0...v1.9.1
+[v1.9.0]: https://github.com/troglobit/libite/compare/v1.8.3...v1.9.0
+[v1.8.3]: https://github.com/troglobit/libite/compare/v1.8.2...v1.8.3
+[v1.8.2]: https://github.com/troglobit/libite/compare/v1.8.1...v1.8.2
 [v1.8.1]: https://github.com/troglobit/libite/compare/v1.8.0...v1.8.1
 [v1.8.0]: https://github.com/troglobit/libite/compare/v1.7.0...v1.8.0
 [v1.7.0]: https://github.com/troglobit/libite/compare/v1.6.0...v1.7.0
@@ -224,9 +504,3 @@ Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 [Inadyn]: https://github.com/troglobit/inadyn/
 [Mg]:     https://github.com/troglobit/mg
 [README]: https://github.com/troglobit/libite/blob/v1.0.0/README.md
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->

LICENSE

@@ -1,10 +1,5 @@
-Much of the code in libite (-lite) is written by Claudio Matsuoka for Finit
-and released under the MIT/X11 license.  Joachim Nilsson later improved on
-the Finit code base and included pieces of software released under the ISC
-and BSD licenses.  See each respective file for license details.
-
 Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
-Copyright (c) 2008-2016  Joachim Nilsson <troglobit@gmail.com>
+Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile.am

@@ -1,33 +1,24 @@
 ACLOCAL_AMFLAGS     = -I m4
-
-lib_LTLIBRARIES     = libite.la
-pkgincludedir       = $(includedir)/lite
-pkginclude_HEADERS  = lite.h queue.h conio.h tree.h strlite.h strdupa.h strndupa.h strnlen.h
-libite_la_SOURCES   = chomp.c copyfile.c dir.c fexist.c fisdir.c fmode.c fparseln.c	\
-		      fsendfile.c ifconfig.c lfile.c makepath.c pidfile.c pidfilefn.c	\
-		      progress.c reallocarray.c rsync.c strlcpy.c strlcat.c strtonum.c	\
-		      tempfile.c tree.c
-
-libite_la_CPPFLAGS  = -D_GNU_SOURCE
-libite_la_CFLAGS    = -W -Wall -Wextra
-libite_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 3:0:0
-
-pkgconfigdir        = $(libdir)/pkgconfig
-pkgconfig_DATA      = libite.pc
-doc_DATA            = README.md LICENSE
+SUBDIRS             = src test
+doc_DATA            = README.md LICENSE ChangeLog.md
 EXTRA_DIST          = README.md LICENSE ChangeLog.md
-SUBDIRS             = tests
 
-## Generate MD5 checksum file
-MD5 = md5sum
-md5-dist:
-	@for file in $(DIST_ARCHIVES); do	\
-		$(MD5) $$file > $$file.md5;	\
-	done
+if ENABLE_DOXYGEN
+SUBDIRS            += doc
+.PHONY: doc
+doc:
+	$(MAKE) -C @top_builddir@/doc $@
+
+## The distribution should include man pages, which are generated
+dist-hook: doc
+else
+doc:
+	@echo "Doxygen documentation (html + man) disabled, skipping ..."
+endif
 
 ## Check if tagged in git
 release-hook:
-	if [ ! `git tag | grep $(PACKAGE_VERSION)` ]; then				\
+	@if [ ! `git tag -l v$(PACKAGE_VERSION) | grep $(PACKAGE_VERSION)` ]; then	\
 		echo;									\
 		printf "\e[1m\e[41mCannot find release tag $(PACKAGE_VERSION)\e[0m\n";	\
 		printf "\e[1m\e[5mDo release anyway?\e[0m "; read yorn;			\
@@ -43,10 +34,25 @@ release-hook:
 		echo;									\
 	fi
 
+## Generate .deb package
+package:
+	@debuild -uc -us -B --lintian-opts --profile debian -i -I --show-overrides
+
 ## Target to run when building a release
-release: dist release-hook md5-dist
+release: release-hook distcheck
 	@for file in $(DIST_ARCHIVES); do						\
-		printf "$$file    \tDistribution tarball\n";				\
-		printf "$$file.md5\t"; cat $$file.md5 | cut -f1 -d' ';			\
-		mv $$file* ../;								\
+		md5sum    $$file > ../$$file.md5;					\
+		sha256sum $$file > ../$$file.sha256;					\
+	done
+	@mv $(DIST_ARCHIVES) ../
+	@echo
+	@echo "Resulting release files:"
+	@echo "================================================================="
+	@for file in $(DIST_ARCHIVES); do						\
+		printf "%-32s Distribution tarball\n" $$file;				\
+		printf "%-32s " $$file.md5;    cat ../$$file.md5    | cut -f1 -d' ';	\
+		printf "%-32s " $$file.sha256; cat ../$$file.sha256 | cut -f1 -d' ';	\
+	done
+	@for file in `cd ..; ls $(PACKAGE)*_$(VERSION)*`; do				\
+		printf "%-32s Debian/Ubuntu package\n" $$file;				\
 	done

README.md

@@ -1,41 +1,43 @@
 -lite | Frog DNA, basically
 ===========================
-[![Travis Status][]][Travis]
-
+[![GitHub Status][]][GitHub] [![codedocs status][]][codedocs] [![Coverity Status][]][Coverity Scan]
 
 Table of Contents
 -----------------
 
 * [Introduction](#introduction)
 * [Using -lite](#using--lite)
-* [Helper Macros](#helper-macros)
-* [Generic Functions](#generic-functions)
-* [OpenBSD Functions](#openbsd-functions)
-* [Build & Install](#origin--references)
-* [TODO](#todo)
+* [API](doc/API.md#overview)
+  * [Important Node](doc/API.md#important-note)
+  * [Helper Macros](doc/API.md#helper-macros)
+  * [Generic Functions](doc/API.md#generic-functions)
+  * [GNU Functions](doc/API.md#gnu-functions)
+  * [OpenBSD/NetBSD/FreeBSD Functions](doc/API.md#openbsd-netbsd-freebsd-functions)
+* [Build & Install](#build--install)
+* [Origin & References](#origin--references)
 
 
+> **NOTE:** Incompatible changes in v2.0 compared to v1.x!
+
 Introduction
 ------------
 
-Libite is a lightweight library of *frog DNA*.  It can be used to fill
+Libite is a lightweight library of *frog DNA* that can be used to fill
 the gaps in any dinosaur project.  It holds useful functions and macros
 developed by both [Finit][1] and the [OpenBSD][2] project.  Most notably
 the string functions: [strlcpy(3)][3], [strlcat(3)][3] and the highly
 useful *BSD [sys/queue.h][4] and [sys/tree.h][7] API's.
 
-Libite is the frog DNA missing in GNU libc.  However, -lite does not aim
-to become another [GLIB][5]!  One noticeable gap in GLIBC is the missing
-`_SAFE` macros in the BSD `sys/queue.h` API — highly recommended
-when traversing lists to delete/free nodes.
+Libite holds many of the missing pieces in GNU libc, although -lite does
+not aim to become another [GLIB][5].  One noticeable gap in GLIBC is the
+`_SAFE` macros available in the BSD `sys/queue.h` API — highly
+recommended when traversing lists to delete/free nodes.
 
-The code is open sourced under a mix of the [MIT/X11 license][MIT], the
-[ISC license][ISC] used by OpenBSD, and [BSD licenses][BSD], all of them
-are extremely liberal and can be used freely in proprietary software if
-needed.
+The code is open sourced under a mix of permissive Open Source licenses:
+[MIT/X11 license][MIT], [ISC license][ISC], and [BSD licenses][BSD].
 
-For an introduction to why Libite happened, and how you can use it, see
-[this blog post][6].
+> **Tip:** have a look at my blog post about other useful UNIX API's!
+>          https://troglobit.com/post/2020-02-22-useful-unix-apis/
 
 
 Using -lite
@@ -43,313 +45,56 @@ Using -lite
 
 Libite is by default installed as a library and a set of include files.
 To prevent clashing with include files of the same name `-lite` employs
-an include file namespace `lite/`, which is strongly recommended to use
-in your applications:
+an include file namespace `libite/`, which is strongly recommended to
+use in your applications:
 
-    #include <lite/lite.h>
-    #include <lite/conio.h>
-    #include <lite/queue.h>
-    #include <lite/tree.h>
+```C
+#include <libite/lite.h>
+#include <libite/conio.h>
+#include <libite/queue.h>
+#include <libite/tree.h>
+```
 
-The output from the `pkg-config` tool holds no surprises in this regard:
+> **Note:** prior to v2.5.0, the `lite/` namespace was used for headers,
+> which is still available in the default install.  This clashed with
+> the headers of the LiTE library from the DirectFB project.
 
-    $ pkg-config --libs --static --cflags libite
-    -I/usr/local/include -L/usr/local/lib -lite
+The output from the `pkg-config` tool holds no surprises:
+
+```bash
+$ pkg-config --libs --static --cflags libite
+-I/usr/local/include -D_LIBITE_LITE -L/usr/local/lib -lite
+```
+
+> **Note:** `_LIBITE_LITE` is defined since v2.5.0, useful for software
+> that want to be able to build against headers from an older libite:
+>
+> ```C
+> #ifdef _LIBITE_LITE
+> # include <libite/lite.h>
+> #else
+> # include <lite/lite.h>
+> #endif
+> ```
 
 The prefix path `/usr/local/` shown here is only the default.  Use the
 `configure` script to select a different prefix when installing libite.
 
 For GNU autotools based projects, use the following in `configure.ac`:
 
-    # Check for required libraries
-    PKG_CHECK_MODULES([lite], [libite >= 1.5.0])
+```m4
+# Check for required libraries
+PKG_CHECK_MODULES([lite], [libite >= 1.5.0])
+```
 
 and in your `Makefile.am`:
 
-    proggy_CFLAGS = $(lite_CFLAGS)
-    proggy_LDADD  = $(lite_LIBS)
+```Makefile
+proggy_CFLAGS = $(lite_CFLAGS)
+proggy_LDADD  = $(lite_LIBS)
+```
 
-
-Helper Macros
--------------
-
-- `atonum(str)`
-
-  Convert string to natural number, works for 32-bit non-negative
-  integers.  Returns -1 on error.  (Uses `strtonum()` internally.)
-
-- `blkdev(dev)`
-
-  Create block device
-
-- `chardev(dev)`
-
-  Create character device
-
-- `erase(path)`
-
-  Erase file/directory with `remove()`.  Errors on `stderr`
-
-- `makedir(path)`
-
-  Create directory, like `mkdir()`.  Errors on `stderr`
-
-- `makefifo(path)`
-
-  Create a FIFO, like `mkfifo()`.  Errors on `stderr`
-
-- `min(a,b)`/`max(a,b)`
-
-  These macros take care to avoid double evaluation.
-
-- `touch(path)`
-
-  Create a file, or update mtime.  Errors on `stderr`
-
-- `S_ISEXEC(mode_t m)`
-
-  Mysteriously missing from GLIBC
-
-- `ISCLR(word,bit)`
-
-  Is bit in (integer) word cleared?
-
-- `ISSET(word,bit)`
-
-  Is bit in (integer) word set?
-
-- `ISOTHER(word,bit)`
-
-  Are any other bits, except bit, in (integer) word set?
-
-- `SETBIT(word,bit)`
-
-  Set bit in (integer) word.
-
-- `CLRBIT(word,bit)`
-
-  Clear bit in (integer) word.
-
-- `NELEMS(array)`
-
-  Returns the number of elements in an array.  From the great book, The
-  Practice of Programming, by Kernighan and Pike.
-
-- `UNUSED(var)`
-
-  Shorter and more readable version of `var __attribute__ ((unused))`
-
-
-Generic Functions
------------------
-
-- `chomp(str)`
-
-  Perl like chomp function, chop off last char if newline.
-
-- `copyfile(src, dst, len, symlink)`
-
-  Like the shell `cp(1)` and `dd(1),` can also create symlinks.
-
-- `dir(dir, ext, filter, list, strip)`
-
-  Wrapper for `scandir()` with optional filter.  Returns a list of
-  names: files and directories that must be freed after use.  See
-  the unit test for an example, or take a look at `glob(3)`, it's
-  probably what you want anyway.
-
-- `fcopyfile(src, dst)`
-
-  Like `copyfile()` but uses already open `FILE *` pointers.  Copies
-  from current file positions to current file positions until EOF.
-
-- `fexist(file)`
-
-  Check for the existence of a file, returns True(1) or False(0).
-
-- `fisdir(path)`
-
-  Check for the existence of a directory, returns True(1) or False(0).
-
-- `fmode(file)`
-
-  Returns the `mode_t` bits of a file or directory.
-
-- `fsendfile(src, dst, len)`
-
-  Copy data between file streams, very similar to `fcopyfile()`, but
-  `dst` is allowed to be `NULL` to be able to read and discard `len`
-  bytes from `src`.
-
-- `ifconfig(ifname, addr, mask, up)`
-
-  Basic ifconfig like operations on an interface.  Only supports IPv4
-  addresses.  Note that mask is not CIDR notation.
-
-- `lfopen(file, sep)`, `lfclose(lf)`
-
-  LITE file API for parsing UNIX style configuration files like
-  `/etc/protocols` and `/etc/services`.
-
-- `lftok(lf)`
-
-  Read tokens, delimited by `sep`, from file opened with `lfopen()`.
-
-- `lfgetkey(lf, key)`
-
-  Find `key` in file opened with `lfopen()`, return value/argument.
-
-- `lfgetint(lf, key)`
-
-  Wrapper for `lfgetkey()`, returns positive integer value to `key`,
-  or `-1` if `key` is not found.
-
-- `fgetint(file, sep, key)`
-
-  Wrapper for `lfopen()`, `lfgetint()`, and `lfclose()`.  Useful for
-  when only reading a single `key` from a file.
-
-- `makepath(dir)`
-
-  Create all components of the specified directory.
-
-- `mkpath(dir, mode)`
-
-  Like `makepath()`, but also takes a `mode_t` permission mode argument.
-
-- `movefile(src, dst)`
-
-  Like `copyfile()`, but renames `src` to `dst`, or recreates symlink
-  with the `dst` name.  On successful operation the source is removed
-  and the function returns POSIX OK (0).
-
-- `pidfile(basename)`
-
-  Create a daemon PID file in `_PATH_VARRUN` using either `basename` or,
-  if `basename` is `NULL`, `__progname`.  The resulting file name is
-  available to the user as a read-only pointer:
-
-        extern char *__pidfile_name;
-
-  Use this function to create a PID file for your daemon when it is
-  ready to receive signals.  A client application may poll for the
-  existence of this file, so make sure to have your signal handlers
-  properly setup before calling this function.
-
-  The PID file is removed when the program exits, using an `atexit()`
-  handler.  However, depending on how the program terminates the file
-  may still exist even though the program is no longer running.  This
-  is only a problem for clients.
-
-  Calling this function multiple times updates the mtime of the file.
-  Only one `atexit()` handler is created, regardless of the amount of
-  times the function is called.
-  
-  See below for link to OpenBSD man page.
-
-- `pidfile_read(pidfile)`
-
-  Read PID from pid file created by `pidfile()`.
-
-- `pidfile_signal(pidfile, signal)`
-
-  Send signal to PID found in pid file created by `pidfile()`.
-
-- `progress(percent, max_width)`
-
-  Simple ASCII progress bar with a spinner.  Start it with `percent=0`
-  and set the `max_width=chars` to indicate width of the progress bar.
-  Called multiple times with the same percentage value cause spinner to
-  spin.
-
-- `rsync(src, dst, delete, *filter())`
-
-  Very simple `rsync()` to copy files files and directories
-  recursively.
-
-- `tempfile()`
-
-  Secure replacement for `tmpfile()`.  Creates an invisible temporary
-  file in `/tmp` that is removed when the returned `FILE` pointer is
-  closed.
-  
-  **Note:** Requires Linux v3.11, or later, will fall back to the old
-    and unsafe `tmpfile()` on older systems.
-
-- `tree(path, show_perms)`
-
-  Very simple `/bin/tree` replacement.  Draw ASCII tree of `path`, with
-  optional listing of file and directory permissions if `show_perms` is
-  set.  The `path` argument should be a directory.
-
-
-GNU Functions
--------------
-
-The following are useful GNU functions, that do not exist on *BSD, and
-some other platforms.
-
-- `strdupa(str)`
-
-  http://man7.org/linux/man-pages/man3/strdupa.3.html
-
-- `strndupa(str)`
-
-  http://man7.org/linux/man-pages/man3/strndupa.3.html
-
-- `strnlen(str, lim)`
-
-  http://man7.org/linux/man-pages/man3/strnlen.3.html
-
-
-OpenBSD/NetBSD/FreeBSD Functions
---------------------------------
-
-The following are popular functions and highly useful macros from the
-*BSD world of UNIX that are sadly missing on Linux.
-
-- `fparseln(fp, *len, *lineno, delim, flags)`
-
-  http://man.openbsd.org/OpenBSD-current/man3/fparseln.3
-
-- `pidfile(basename)`
-
-  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/pidfile.3
-
-  **Note:** this version of `pidfile()` has been extended to handle it
-  being called multiple times, i.e. to not create multiple `atexit()`
-  handlers, and also to export a few internal paths:
-
-	- `__pidfile_path`: prefix path, default `_PATH_VARRUN`.  Notice the
-	  trailing slash requirement if you want to override it!
-	- `__pidfile_name`: full path to PID file , similar to `__progname`.
-	  See previous section for details.
-
-- `reallocarray(ptr, nmemb, size)`
-
-  http://man.openbsd.org/OpenBSD-current/man3/reallocarray.3
-
-- `strlcpy(dst, src, len)`
-
-  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strlcpy.3
-
-- `strlcat(dst, src, len)`
-
-  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strlcat.3
-
-- `strtonum()`
-
-  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strtonum.3
-
-- `sys/queue.h` API
-
-  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/LIST_EMPTY.3
-
-- `sys/tree.h` API
-
-  Niels Provos' famous splay and red-black tree implementation.
-
-  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/SPLAY_FOREACH.3
+> API Documentaion: https://codedocs.xyz/troglobit/libite/
 
 
 Build & Install
@@ -357,39 +102,48 @@ Build & Install
 
 This library was initially built for and developed on GNU/Linux systems
 as a light weight utility library, these days NetBSD should also work.
-Libite (LITE) employs the de facto standard GNU configure and build
-system:
 
-    ./configure
-    make -j5
-    make install-strip
+```bash
+$ ./configure
+$ make -j5
+$ sudo make install-strip
+$ sudo ldconfig
+```
 
-**Note:** When checking code from GitHub, use <kbd>./autogen.sh</kbd> to
-generate a `configure` script.  It is a generated file and otherwise only
-included in released tarballs.
+Use <kbd>./configure --without-symlink</kbd> to prevent the install step
+from creating the `lite -> libite/` compatibility symlink for the header
+files, required for systems with DirectFB LiTE.  The default, however,
+is to install the symlink to ensure compatibility with existing software
+that depends on the `-lite` library headers in their previous namespace.
+
+**Note:** When checking out code from GIT, use <kbd>./autogen.sh</kbd>
+to generate a `configure` script.  It is a generated file and otherwise
+only included in released tarballs.
 
 
-TODO
-----
+Origin & References
+-------------------
 
-- Improve documentation, possibly use kdoc or gdoc2 to generate docs from API.
-- Continuously, update OpenBSD functions/macros.
+Much of the code in libite (-lite) is written by [Claudio Matsuoka][]
+for the original [Finit][original finit] and released under the MIT/X11
+license.  Joachim Wiberg later improved on the [Finit][1] code base and
+included pieces of software released under the ISC and BSD licenses.
+See each respective file for license details.
 
-[1]: https://github.com/troglobit/finit
-[2]: http://www.openbsd.org/
-[3]: http://www.openbsd.org/cgi-bin/man.cgi?query=strlcpy
-[4]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/LIST_EMPTY.3
-[5]: https://developer.gnome.org/glib/
-[6]: http://troglobit.com/blog/2015/07/02/howto-using-lite-with-a-git-based-application/
-[7]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/SPLAY_FOREACH.3
-[MIT]: https://en.wikipedia.org/wiki/MIT_License
-[ISC]: https://en.wikipedia.org/wiki/ISC_license
-[BSD]: https://en.wikipedia.org/wiki/BSD_licenses
-[Travis]: https://travis-ci.org/troglobit/libite
-[Travis Status]: https://travis-ci.org/troglobit/libite.png?branch=master
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->
+[1]:                https://github.com/troglobit/finit
+[2]:                http://www.openbsd.org/
+[3]:                http://www.openbsd.org/cgi-bin/man.cgi?query=strlcpy
+[4]:                http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/LIST_EMPTY.3
+[5]:                https://developer.gnome.org/glib/
+[7]:                http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/SPLAY_FOREACH.3
+[MIT]:              https://en.wikipedia.org/wiki/MIT_License
+[ISC]:              https://en.wikipedia.org/wiki/ISC_license
+[BSD]:              https://en.wikipedia.org/wiki/BSD_licenses
+[GitHub]:           https://github.com/troglobit/libite/actions/workflows/build.yml/
+[GitHub Status]:    https://github.com/troglobit/libite/actions/workflows/build.yml/badge.svg
+[Coverity Scan]:    https://scan.coverity.com/projects/20602
+[Coverity Status]:  https://img.shields.io/coverity/scan/20602.svg
+[codedocs]:         https://codedocs.xyz/troglobit/libite.log
+[codedocs status]:  https://codedocs.xyz/troglobit/libite.svg
+[Claudio Matsuoka]: https://github.com/cmatsuoka
+[original finit]:   http://helllabs.org/finit/

configure.ac

@@ -1,14 +1,39 @@
-AC_INIT(libite, 1.8.1, https://github.com/troglobit/libite/issues)
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AC_INIT(libite, 2.5.1, https://github.com/troglobit/libite/issues)
+AC_CONFIG_AUX_DIR(aux)
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
 AM_SILENT_RULES([yes])
 
-AC_CONFIG_SRCDIR(lite.h)
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_FILES([Makefile tests/Makefile libite.pc])
+AC_CONFIG_SRCDIR(src/lite.h)
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_FILES([Makefile doc/Makefile doc/Doxyfile src/Makefile src/libite.pc test/Makefile])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
-AM_PROG_AR
+AC_PROG_INSTALL
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
 
+# Check for Doxygen and enable its features.
+# For details, see m4/ax_prog_doxygen.m4 and
+# http://www.bioinf.uni-freiburg.de/~mmann/HowTo/automake.html#doxygenSupport
+DX_DOXYGEN_FEATURE(ON)
+DX_DOT_FEATURE(OFF)
+DX_CHI_FEATURE(OFF)
+DX_RTF_FEATURE(OFF)
+DX_XML_FEATURE(OFF)
+DX_PDF_FEATURE(OFF)
+DX_PS_FEATURE(OFF)
+DX_CHM_FEATURE(OFF)
+DX_HTML_FEATURE(ON)
+DX_MAN_FEATURE(OFF)
+DX_INIT_DOXYGEN(${PACKAGE_NAME}, [${top_builddir}/doc/Doxyfile], [${top_builddir}/doc])
+
+AC_ARG_WITH([symlink],
+        AS_HELP_STRING([--without-symlink], [Disable compat /usr/include/lite -> libite symlink]),,
+	[with_symlink=yes])
+
+AM_CONDITIONAL([ENABLE_DOXYGEN], [test "x${DX_FLAG_doc}"  = x1])
+AM_CONDITIONAL([ENABLE_HTML],    [test "x${DX_FLAG_html}" = x1])
+AM_CONDITIONAL([COMPAT_SYMLINK], [test "x$with_symlink"  != "xno"])
+
 AC_OUTPUT

conio.h

@@ -1,81 +0,0 @@
-/* A conio.h like implementation for VTANSI displays.
- *
- * Copyright (c) 2009-2013  Joachim Nilsson <troglobit@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef CONIO_H_
-#define CONIO_H_
-
-#include <stdio.h>
-
-/* Attributes */
-#define RESETATTR    0
-#define BRIGHT       1
-#define DIM          2
-#define UNDERSCORE   4
-#define BLINK        5           /* May not work on all displays. */
-#define REVERSE      7
-#define HIDDEN       8
-
-/* Colors for text and background */
-#define BLACK        0x0
-#define RED          0x1
-#define GREEN        0x2
-#define BROWN        0x3
-#define BLUE         0x4
-#define MAGENTA      0x5
-#define CYAN         0x6
-#define LIGHTGREY    0x7
-
-#define DARKGREY     0x10
-#define LIGHTRED     0x11
-#define LIGHTGREEN   0x12
-#define YELLOW       0x13
-#define LIGHTBLUE    0x14
-#define LIGHTMAGENTA 0x15
-#define LIGHTCYAN    0x16
-#define WHITE        0x17
-
-/* Esc[2JEsc[1;1H             - Clear screen and move cursor to 1,1 (upper left) pos. */
-#define clrscr()              fputs ("\e[2J\e[1;1H", stdout)
-/* Esc[K                      - Erases from the current cursor position to the end of the current line. */
-#define clreol()              fputs ("\e[K", stdout)
-/* Esc[2K                     - Erases the entire current line. */
-#define delline()             fputs ("\e[2K", stdout)
-/* Esc[Line;ColumnH           - Moves the cursor to the specified position (coordinates) */
-#define gotoxy(x,y)           printf("\e[%d;%dH", y, x)
-/* Esc[?25l (lower case L)    - Hide Cursor */
-#define hidecursor()          fputs ("\e[?25l", stdout)
-/* Esc[?25h (lower case H)    - Show Cursor */
-#define showcursor()          fputs ("\e[?25h", stdout)
-
-/* Esc[Value;...;Valuem       - Set Graphics Mode */
-#define __set_gm(attr,color,val)					\
-	if (!color)							\
-		printf("\e[%dm", attr);					\
-	else								\
-		printf("\e[%d;%dm", color & 0x10 ? 1 : 0, (color & 0xF) + val)
-#define textattr(attr)        __set_gm(attr, 0, 0)
-#define textcolor(color)      __set_gm(RESETATTR, color, 30)
-#define textbackground(color) __set_gm(RESETATTR, color, 40)
-
-#endif /* CONIO_H_ */
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */

debian/.gitignore

@@ -0,0 +1,12 @@
+*.log
+*.substvars
+.debhelper/*
+tmp/*
+libite/*
+libite5/*
+libite-dev/*
+autoreconf*
+debhelper*
+files
+!*.dirs
+!*.install

debian/changelog

@@ -0,0 +1,154 @@
+libite (2.5.1) stable; urgency=medium
+
+  * Use dh_link(1) to install `/usr/include/lite -> libite/`.
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Thu, 02 Dec 2021 00:08:41 +0100
+
+libite (2.5.0) stable; urgency=medium
+
+  * Header files have moved from `lite/*.h` to `libite/*.h` to prevent
+    clashing with DirectFB LiTE library.  For a transitional period,
+    however, a compatibility symlink is installed; `lite -> libite/`.
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Tue, 30 Nov 2021 06:57:17 +0100
+
+libite (2.4.1) stable; urgency=medium
+
+  * Add doxygen documentation, https://codedocs.xyz/troglobit/libite/
+  * Fix issue with tempfile() returning EOPNOTSUP on certain file systems,
+    added fallback that uses mkstemp() with O_CLOEXEC flag set
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Sat, 09 Oct 2021 08:56:43 +0200
+
+libite (2.4.0) stable; urgency=medium
+
+  * New functions:
+    - touchf(), formatted string support for touch()
+    - erasef(), formatted string support for erase()
+    - strtrim(), trims leading and trailing white-space from a string
+  * Fix systemf() improper handling of system() return value.  Now checks
+    if exited OK, then returning the exit status of the command, or if not
+    exited OK, then checks if the command was signaled, and returns -1 with
+    errno set.  This also allows for returning 127, like system(), if the
+    shell, or the program itself, did not exist.
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Sat, 27 Mar 2021 09:12:32 +0100
+
+libite (2.3.1) stable; urgency=medium
+
+  * Minor packaging fixes.
+  * Copyright updates, including LICENSE file, year + author last name
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Fri, 12 Feb 2021 15:10:42 +0100
+
+libite (2.3.0) stable; urgency=medium
+
+  * New functions:
+    - Add support for fremove(), formatted remove() replacement
+    - Add support for truncatef(), formatted truncate() replacement
+  * Fixes
+    - Handle ETIMEDOUT error for connect() call in telnet_open()
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Fri, 12 Feb 2021 08:03:47 +0100
+
+libite (2.2.0) stable; urgency=medium
+
+  * New functions:
+    - systemf(), formatted string system() replacement
+    - fmkpath(), formatted string mkpath() replacement
+    - fopenf(), formatted string fopen() replacement
+  * Fixes
+    - possible memory leak in rsync()
+    - Check return value of fstat() to prevent bogus destination file
+      times when using copyfile()
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Mon, 16 Mar 2020 15:42:02 +0100
+
+libite (2.1.2) stable; urgency=high
+
+  * Fix upgrade of base package, new library name to match SONAME
+    breaks upgrade from libite_2.0.x.deb to libite5_2.1.x.deb
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sat, 22 Feb 2020 15:04:27 +0100
+
+libite (2.1.1) stable; urgency=medium
+
+  * Fix to chomp(), ensure stopping before beginning of string
+  * Added example of printhdr()
+  * Update copyright years
+  * Add missing libite5.symbols file, found by lintian
+  * Fix package short description, found by linitian
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sat, 22 Feb 2020 13:52:24 +0100
+
+libite (2.1.0) unstable; urgency=medium
+
+  * New functions; strmatch(), strnmatch(), yorn(), telnet expect APIs
+  * Fixes to pidfile_signal(), strtonum() and C++ linking
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Mon, 26 Aug 2019 20:21:46 +0200
+
+libite (2.0.2) unstable; urgency=medium
+
+  * Fix issues with using `strlite.h` standalone
+  * Fix build issue with `strtonum.c` older GLIBC
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Thu, 10 May 2018 19:12:57 +0200
+
+libite (2.0.1-1) unstable; urgency=medium
+
+  * New upstream release, v2.0.1, fixes to:
+    - touch(), cannot handle relative paths when updating mtime
+    - unit test for which()
+    - add missing initscr() declaration in conio.h
+    - ifdef guards around min()/max() macros
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Fri, 22 Dec 2017 12:11:41 +0100
+
+libite (2.0.0-1) unstable; urgency=low
+
+  * New upstream release, v2.0.0, fixes to:
+    - makepath(), mkpath()
+  * Changes to
+    - rsync(), API changes
+    - copyfile(), API changes
+    - tree(), removed from library
+    - fmode(), removed from library
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 19 Nov 2017 22:42:51 +0100
+
+libite (1.9.3-1) unstable; urgency=low
+
+  * New upstream release, v1.9.3, fixes to conio.h, initscr() and tree().
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 24 Oct 2017 08:49:54 +0200
+
+libite (1.9.2-1) unstable; urgency=low
+
+  * New upstream reelase, v1.9.2, see upstream ChangeLog for details.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 15 Aug 2017 08:15:14 +0200
+
+libite (1.9.1-1) unstable; urgency=low
+
+  * New upstream reelase, v1.9.1.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 02 Jul 2017 19:23:00 +0100
+
+libite (1.9.0-1) unstable; urgency=low
+
+  * New upstream reelase.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 02 Jul 2017 19:23:00 +0100
+
+libite (1.8.3-1) unstable; urgency=low
+
+  * New upstream reelase.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 08 Jan 2017 15:22:26 +0100
+
+libite (1.8.2-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 29 Nov 2016 08:23:35 +0100

debian/clean

@@ -0,0 +1 @@
+config.log

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -0,0 +1,56 @@
+Source: libite
+Section: libs
+Priority: optional
+Maintainer: Joachim Wiberg <troglobit@gmail.com>
+Build-Depends: debhelper (>= 10)
+Build-Depends-Indep: doxygen
+Standards-Version: 4.3.0
+Homepage: https://github.com/troglobit/libite/
+Vcs-Browser: https://github.com/troglobit/libite/
+Vcs-Git: https://github.com/troglobit/libite.git
+
+Package: libite-dev
+Priority: optional
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libite5 (= ${binary:Version})
+Description: static library, header files, and docs for libite
+ Static library, header files, and documentation for libite.
+ .
+ Libite is a lightweight library of frog DNA.  It can be used to fill
+ the gaps in any dinosaur project.  It holds useful functions and macros
+ developed by both Finit and the OpenBSD project.  Most notably the
+ string functions: strlcpy(3), strlcat(3) and the highly useful *BSD
+ sys/queue.h and sys/tree.h API's.
+ .
+ Libite is the frog DNA missing in GNU libc.  However, -lite does not
+ aim to become another GLIB!  One noticeable gap in GLIBC is the missing
+ _SAFE macros in the BSD sys/queue.h API — highly recommended when
+ traversing lists to delete/free nodes.
+ .
+ The code is open sourced under a mix of the MIT/X11 license, the ISC
+ license used by OpenBSD, and BSD licenses, all of them are extremely
+ liberal and can be used freely in proprietary software if needed.
+
+Package: libite5
+Replaces: libite
+Conflicts: libite
+Provides: libite
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: That missing frog DNA you've been looking for
+ Libite, or -lite, is a lightweight library of frog DNA.  It can be used
+ to fill the gaps in any dinosaur project.  It holds useful functions
+ and macros developed by both Finit and the OpenBSD project.  Most
+ notably the string functions: strlcpy(3), strlcat(3) and the highly
+ useful *BSD sys/queue.h and sys/tree.h API's.
+ .
+ Libite is the frog DNA missing in GNU libc.  However, -lite does not
+ aim to become another GLIB!  One noticeable gap in GLIBC is the missing
+ _SAFE macros in the BSD sys/queue.h API — highly recommended when
+ traversing lists to delete/free nodes.
+ .
+ The code is open source software under a mix of the MIT/X11 license,
+ the ISC license used by OpenBSD, and BSD licenses, all of them are
+ extremely liberal and can be used freely in proprietary software if
+ needed.

debian/copyright

@@ -0,0 +1,128 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https.//github.com/troglobit/libite/
+
+Files: *
+Copyright:
+2008-2010 Claudio Matsuoka <cmatsuoka@gmail.com>
+2008-2021 Joachim Wiberg <troglobit@gmail.com>
+License: MIT
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Files: chomp.c
+Copyright: 2014-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: conio.?
+Copyright: 2009-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: dir.c
+Copyright: 2008-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: fopenf.c fremove.c systemf.c truncatef.c
+Copyright: 2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: fparseln.c
+Copyright: 1997 Christos Zoulas
+License: BSD-2-clause
+
+Files: fsendfile.c
+Copyright: 2013 Tobias Waldekranz <tobias@waldekranz.com>
+License: MIT
+
+Files: lfile.c
+Copyright: 2015-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: makepath.c
+Copyright: 2016-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: pidfile.c
+Copyright: 1999 The NetBSD Foundation, Inc.
+License: BSD-2-clause
+
+Files: pidfilefn.c
+Copyright: 2009-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: progress.c
+Copyright: 2012-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: queue.h
+Copyright: 1991, 1993 The Regents of the University of California.
+License: BSD-3-clause
+
+Files: reallocarray.c
+Copyright: 2008 Otto Moerbeek <otto@drijf.net>
+License: ISC
+
+Files: rsync.c
+Copyright: 2011-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: strdupa.h strndupa.h
+Copyright: 2009 William Ahern
+License: MIT
+
+Files: strlcat.c strlcpy.c
+Copyright: 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+License: MIT
+
+Files: strlite.h
+Copyright: 2008-2021 Joachim Wiberg <troglobit@gmail.com>
+License: MIT
+
+Files: strmatch.c
+Copyright: 2009-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: strnlen.c
+Copyright: 2016-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: strtonum.c
+Copyright: 2004 Ted Unangst and Todd Miller
+License: ISC
+
+Files: telnet.c
+Copyright: 2010-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: tempfile.c
+Copyright: 2015-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: tree.h
+Copyright: 2002 Niels Provos <provos@citi.umich.edu>
+License: BSD-2-clause
+
+Files: which.c
+Copyright: 2017-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: yorn.c
+Copyright: 2009-2021 Joachim Wiberg <troglobit@gmail.com>
+License: ISC
+
+Files: test/*.c
+License: public-domain

debian/docs

@@ -0,0 +1 @@
+README.md

debian/libite-dev.dirs

@@ -0,0 +1,2 @@
+usr/lib
+usr/include

debian/libite-dev.install

@@ -0,0 +1,4 @@
+usr/include/libite/*.h
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/lib*.pc

debian/libite-dev.links

@@ -0,0 +1 @@
+/usr/include/libite	/usr/include/lite

debian/libite5.dirs

@@ -0,0 +1 @@
+usr/lib

debian/libite5.install

@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*

debian/libite5.symbols

@@ -0,0 +1,52 @@
+libite.so.5 libite5 #MINVER#
+* Build-Depends-Package: libite-dev
+ __pidfile_name@Base 2.0.0
+ __pidfile_path@Base 2.0.0
+ chomp@Base 2.0.0
+ copyfile@Base 2.0.0
+ dir@Base 2.0.0
+ erasef@Base 2.4.0
+ fcopyfile@Base 2.0.0
+ fexist@Base 2.0.0
+ fgetint@Base 2.0.0
+ fisdir@Base 2.0.0
+ fmkpath@Base 2.2.0
+ fopenf@Base 2.2.0
+ fparseln@Base 2.0.0
+ fremove@Base 2.3.0
+ fsendfile@Base 2.0.0
+ ifconfig@Base 2.0.0
+ initscr@Base 2.0.0
+ lfclose@Base 2.0.0
+ lfgetint@Base 2.0.0
+ lfgetkey@Base 2.0.0
+ lfopen@Base 2.0.0
+ lftok@Base 2.0.0
+ makepath@Base 2.0.0
+ mkpath@Base 2.0.0
+ movefile@Base 2.0.0
+ pidfile@Base 2.0.0
+ pidfile_poll@Base 2.0.0
+ pidfile_read@Base 2.0.0
+ pidfile_signal@Base 2.1.0
+ progress@Base 2.0.0
+ progress_simple@Base 2.0.0
+ reallocarray@Base 2.0.0
+ rsync@Base 2.0.0
+ strlcat@Base 2.0.0
+ strlcpy@Base 2.0.0
+ strmatch@Base 2.1.0
+ strnmatch@Base 2.1.0
+ strtonum@Base 2.1.0
+ strtrim@Base 2.4.0
+ systemf@Base 2.2.0
+ telnet_close@Base 2.1.0
+ telnet_expect@Base 2.1.0
+ telnet_open@Base 2.1.0
+ telnet_session@Base 2.1.0
+ tempfile@Base 2.0.0
+ touchf@Base 2.4.0
+ truncatef@Base 2.3.0
+ which@Base 2.0.0
+ whichp@Base 2.0.0
+ yorn@Base 2.1.0

debian/rules

@@ -0,0 +1,17 @@
+#!/usr/bin/make -f           
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	dh_auto_configure -- --without-symlink
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog.md
+
+override_dh_auto_install:
+	dh_auto_install
+	find debian -name LICENSE -delete

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

debian/source/options

@@ -0,0 +1 @@
+compression=xz

doc/.gitignore

@@ -0,0 +1,3 @@
+html/*
+libite.tag
+Doxyfile

doc/API.md

@@ -0,0 +1,376 @@
+API Documentation
+=================
+
+
+Important Note
+--------------
+
+When using functions like `mkpath()`, `makepath()`, and `makefifo()`,
+make sure your `umask()` is correct so you do not accidentally create
+files and directories accessible to other users than intended.
+
+
+Helper Macros
+-------------
+
+- `atonum(str)`
+
+  Convert string to natural number, works for 32-bit non-negative
+  integers.  Returns -1 on error.  (Uses `strtonum()` internally.)
+
+- `blkdev(dev)`
+
+  Create block device
+
+- `chardev(dev)`
+
+  Create character device
+
+- `erase(path)`
+
+  Erase file/directory with `remove()`.  Errors on `stderr`
+
+- `erasef(fmt, ...)`
+
+  Like `erase()` but takes a formatted printf-like string as argument.
+
+- `makedir(path)`
+
+  Create directory, like `mkdir()`.  Errors on `stderr`
+
+- `makefifo(path)`
+
+  Create a FIFO, like `mkfifo()`.  Errors on `stderr`
+
+- `min(a,b)`/`max(a,b)`
+
+  These macros take care to avoid double evaluation.
+
+- `touch(path)`
+
+  Create a file, or update mtime.  Errors on `stderr`
+
+- `touchf(fmt, ...)`
+
+  Like `touch()` but takes a formatted printf-like string as argument.
+
+- `S_ISEXEC(mode_t m)`
+
+  Mysteriously missing from GLIBC
+
+- `ISCLR(word,bit)`
+
+  Is bit in (integer) word cleared?
+
+- `ISSET(word,bit)`
+
+  Is bit in (integer) word set?
+
+- `ISOTHER(word,bit)`
+
+  Are any other bits, except bit, in (integer) word set?
+
+- `SETBIT(word,bit)`
+
+  Set bit in (integer) word.
+
+- `CLRBIT(word,bit)`
+
+  Clear bit in (integer) word.
+
+- `NELEMS(array)`
+
+  Returns the number of elements in an array.  From the great book, The
+  Practice of Programming, by Kernighan and Pike.
+
+
+Generic Functions
+-----------------
+
+- `chomp(str)`
+
+  Perl like chomp function, chop off last char if newline.
+
+- `copyfile(src, dst, len, opt)`
+
+  Like the shell `cp(1)` and `dd(1),`, can also copy symlinks and
+  preserve the mtime of the source file.  The opt argument can be
+  a mask of:
+  
+  - `LITE_FOPT_COPYFILE_SYM (0x01)`
+  - `LITE_FOPT_KEEP_MTIME   (0x02)`
+  
+  In releases prior to v2.0 the opt argument was called `symlink`.
+  The APIs are 100% compatible if the value `1` was used to enable
+  the symlink option.
+
+- `dir(dir, ext, filter, list, strip)`
+
+  Wrapper for `scandir()` with optional filter.  Returns a list of
+  names: files and directories that must be freed after use.  See
+  the unit test for an example, or take a look at `glob(3)`, it's
+  probably what you want anyway.
+
+- `fcopyfile(src, dst)`
+
+  Like `copyfile()` but uses already open `FILE *` pointers.  Copies
+  from current file positions to current file positions until EOF.
+
+- `fexist(file)`
+
+  Check for the existence of a file, returns True(1) or False(0).
+
+- `fisdir(path)`
+
+  Check for the existence of a directory, returns True(1) or False(0).
+
+- `fopenf(mode, fmt, ...)`
+
+  Like `fopen()`, but takes a formatted string as argument.  This
+  greatly simplifies operations that usually consist of composing a
+  filename from parts into a dynamic buffer before actually opening
+  the file.
+  
+  > **Notice:** the swapped order of `pathname` and `mode`!
+
+- `fremove(fmt, ...)`
+
+  Like `remove()`, but takes a formatted string as argument.  This
+  greatly simplifies operations that usually consist of composing a
+  filename from parts into a dynamic buffer before actually removing
+  the file.
+
+- `fsendfile(src, dst, len)`
+
+  Copy data between file streams, very similar to `fcopyfile()`, but
+  `dst` is allowed to be `NULL` to be able to read and discard `len`
+  bytes from `src`.
+
+- `ifconfig(ifname, addr, mask, up)`
+
+  Basic ifconfig like operations on an interface.  Only supports IPv4
+  addresses.  Note that mask is not CIDR notation.
+
+- `lfopen(file, sep)`, `lfclose(lf)`
+
+  LITE file API for parsing UNIX style configuration files like
+  `/etc/protocols` and `/etc/services`.
+
+- `lftok(lf)`
+
+  Read tokens, delimited by `sep`, from file opened with `lfopen()`.
+
+- `lfgetkey(lf, key)`
+
+  Find `key` in file opened with `lfopen()`, return value/argument.
+
+- `lfgetint(lf, key)`
+
+  Wrapper for `lfgetkey()`, returns positive integer value to `key`,
+  or `-1` if `key` is not found.
+
+- `fgetint(file, sep, key)`
+
+  Wrapper for `lfopen()`, `lfgetint()`, and `lfclose()`.  Useful for
+  when only reading a single `key` from a file.
+
+- `makepath(dir)`
+
+  Create all components of the specified directory.
+
+- `mkpath(dir, mode)`
+
+  Like `makepath()`, but also takes a `mode_t` permission mode argument.
+
+- `fmkpath(mode, fmt, ...)`
+
+  Like `mkpath()`, but takes a formatted string as argument.
+
+  > **Notice:** the swapped order of `pathname` and `mode`!
+
+- `movefile(src, dst)`
+
+  Like `copyfile()`, but renames `src` to `dst`, or recreates symlink
+  with the `dst` name.  On successful operation the source is removed
+  and the function returns POSIX OK (0).
+
+- `pidfile(name)`
+
+  Create a daemon PID file using either the `name` as a full path, if
+  `name` starts with `/`, or in `_PATH_VARRUN` using `name` as the
+  basename of the application.  If `name` is `NULL`, then `__progname`
+  is used as the basename.  The resulting file name is available to the
+  user as a read-only pointer:
+
+        extern char *__pidfile_name;
+
+  Use this function to create a PID file for your daemon when it is
+  ready to receive signals.  A client application may poll for the
+  existence of this file, so make sure to have your signal handlers
+  properly setup before calling this function.
+
+  The PID file is removed when the program exits, using an `atexit()`
+  handler.  However, depending on how the program terminates the file
+  may still exist even though the program is no longer running.
+
+  Calling this function multiple times updates the mtime of the file.
+  Only one `atexit()` handler is created, regardless of the amount of
+  times the function is called.  If the file is removed, subsequent
+  calls to this function will recreate the file.
+  
+  See below for a link to OpenBSD man page.
+
+- `pidfile_read(pidfile)`
+
+  Read PID from pid file created by `pidfile()`.
+
+- `pidfile_signal(pidfile, signal)`
+
+  Send signal to PID found in pid file created by `pidfile()`.
+
+- `progress(percent, max_width)`
+
+  Simple ASCII progress bar with a spinner.  Start it with `percent=0`
+  and set the `max_width=chars` to indicate width of the progress bar.
+  Called multiple times with the same percentage value cause spinner to
+  spin.
+
+- `rsync(src, dst, opt, *filter())`
+
+  Very simple `rsync()` to copy files and directories recursively.  It
+  supports pruning files from the destination tree that do not exist in
+  the source tree and preserving the mtime of the source files.  The opt
+  argument can be a mask of:
+  
+  - `LITE_FOPT_RSYNC_DELETE (0x01)`
+  - `LITE_FOPT_KEEP_MTIME   (0x02)`
+  
+  In releases prior to v2.0 the argument controlling pruning was called
+  `delete`, it is now called `opt`.  The APIs are 100% compatible if the
+  value `1` was used.
+
+- `strmatch(str, list)`, `strnmatch(str, list, len)`
+
+  Find matching string in an array of strings.  Returns index in array on
+  match, or `-1` on error or not found.  `strnmatch()` takes an extra arg
+  to compare only `len` number of characters from `str`.
+
+- `strtrim(str)`
+
+  Trims a string from any leading and trailing white-space, returns the
+  trimmed result in the same buffer.
+
+- `systemf(fmt, ...)`
+
+  Like `system()`, but takes a formatted string as argument.  This
+  greatly simplifies operations that usually consist of composing a
+  command from parts into a dynamic buffer before calling it.
+
+- `telnet_open(addr, port), telnet_close(ctx), telnet_expect(ctx, script, output)`
+
+  Poor mans telnet expect in C.  Opens connection to a Telnet service;
+  FTP, Telnet, similar, and run an expect-like script.
+
+- `telnet_session(addr, port, script output)`
+
+  Wrapper for the above three in one API.
+
+- `tempfile()`
+
+  Secure replacement for `tmpfile()`.  Creates an invisible temporary
+  file in `/tmp` that is removed when the returned `FILE` pointer is
+  closed.
+  
+  **Note:** Requires Linux v3.11, or later, will fall back to the old
+    and unsafe `tmpfile()` on older systems.
+
+- `truncatef(length, fmt, ...)`
+
+  Like `truncate()`, but takes a formatted string as argument.  This
+  simplifies some operations when the filename otherwise have to be
+  composed from parts into a separate array before calling the real
+  function.
+
+- `which(cmd)`, `whichp(cmd)`
+
+  C implementation of UNIX which(1).  Returns a malloc'ed string with the
+  full path to `cmd` on success, otherwise `NULL`.
+  
+  `whichp()` is a predicate function, returns `TRUE` or `FALSE`.
+
+  **Note:** `which("/bin/ps aux")` will return `/bin/ps`, or `TRUE`,
+  provided of course `/bin/ps` exists.
+
+- `yorn(fmt, ...)`
+
+  Pose a question to user, appended with `(y/N)?`, returns `TRUE` for
+  yes (both `y` and `Y` are handled) and `FALSE` for everything else.
+
+
+GNU Functions
+-------------
+
+The following are useful GNU functions, that do not exist on *BSD, and
+some other platforms.
+
+- `strdupa(str)`
+
+  http://man7.org/linux/man-pages/man3/strdupa.3.html
+
+- `strndupa(str)`
+
+  http://man7.org/linux/man-pages/man3/strndupa.3.html
+
+- `strnlen(str, lim)`
+
+  http://man7.org/linux/man-pages/man3/strnlen.3.html
+
+
+OpenBSD/NetBSD/FreeBSD Functions
+--------------------------------
+
+The following are popular functions and highly useful macros from the
+*BSD world of UNIX that are sadly missing on Linux.
+
+- `fparseln(fp, *len, *lineno, delim, flags)`
+
+  http://man.openbsd.org/OpenBSD-current/man3/fparseln.3
+
+- `pidfile(basename)`
+
+  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/pidfile.3
+
+  **Note:** the version of `pidfile()` in -lite has been extended to
+  handle it being called multiple times, i.e. to not create multiple
+  `atexit()` handlers, and also to export a few internal paths:
+
+	- `__pidfile_path`: prefix path, default `_PATH_VARRUN`.  Notice the
+	  trailing slash requirement if you want to override it!
+	- `__pidfile_name`: full path to PID file , similar to `__progname`.
+	  See previous section for details.
+
+- `reallocarray(ptr, nmemb, size)`
+
+  http://man.openbsd.org/OpenBSD-current/man3/reallocarray.3
+
+- `strlcpy(dst, src, len)`
+
+  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strlcpy.3
+
+- `strlcat(dst, src, len)`
+
+  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strlcat.3
+
+- `strtonum()`
+
+  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strtonum.3
+
+- `sys/queue.h` API
+
+  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/LIST_EMPTY.3
+
+- `sys/tree.h` API
+
+  Niels Provos' famous splay and red-black tree implementation.
+
+  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/SPLAY_FOREACH.3

doc/HACKING.md

@@ -4,9 +4,10 @@ Maintenance and Release Checklist
 Maintenance
 -----------
 
+* Encourage contributors to write tests, in particular for new features
+* Run tests regularly, use Travis-CI to do this automatically
 * Leverage GitHub issues for milestone planning
 * Reference issues from GitHub pull requests to alert issue subscribers
-* Encourage contributors to write unit tests
 * Bump library ABI version just before release!
 
 
@@ -17,6 +18,7 @@ Release Checklist
   - Inform users in a plain language of changes and bug fixes
   - Do *not* copy-paste GIT commit logs!
   - Order entrys according to importance, most relevant first
+* Run unit tests: `make check`
 * Do we need to bump the ABI version? (Probably, see below)
 * Tag
 * Push last commit(s) *and* tags to GitHub
@@ -25,7 +27,7 @@ Release Checklist
         make distclean
         ./autogen.sh
         ./configure
-		make release
+        make release
 
 * Create new release in GitHub releases page
 * Copy and paste ChangeLog entry, check any stale links!
@@ -54,14 +56,31 @@ It must be updated according to the [GNU Libtool recommendations][1]:
    release of your software.  More frequent updates are unnecessary, and
    only guarantee that the current interface number gets larger faster.
 3. If the library *source code has changed at all* since the last update,
-   then increment revision (`c:r:a` --> `c:r+1:a`)
-4. If any *interfaces have been added, removed, or changed* since last
-   update, increment current, and zero revision (`c:r:a` --> `c+1:0:0`)
+   then increment revision (`c:r:a` becomes `c:r+1:a`).
+4. If any *interfaces have been added, removed, or changed* since the
+   last update, increment current, and set revision to 0.
 5. If any *interfaces have been added* since the last public release,
    then increment age.
 6. If any *interfaces have been removed or changed* since the last
    public release, then set age to 0.
 
+The libtool ABI versioning logic is very confusing but works if you just
+disable your brain and follow the rules, one by one.
+
+**Example #1:** a new function has been added, none of the existing ones
+have changed.  The initial version is 1:0:0, we follow the rules above to
+the letter: increase revision, increase current and set revision to zero,
+and finally increase age.  This, rather confusingly, gives us 2:0:1 which
+libtool then translates to `libite.so.1.1.0`.
+
+**Example #2:** some existing functions are changed, they now return an
+`int` instead of `void`.  The initial version is 0:0:0, and we follow the
+rules again: increment revision, increment current and set revision to
+zero, set age to zero.  This gives us 1:0:0, which is then translated to
+ `libite.so.1.0.0`.
+
+### Note
+
 Usually, non-developers have no interest in running development versions
 (releases are frequent enough), and developers are expected to know how
 to juggle versions.  In such an ideal world, it is good enough to bump

doc/Makefile.am

@@ -0,0 +1,22 @@
+dist_doc_DATA  = API.md
+EXTRA_DIST     = API.md Doxyfile.in
+DISTCLEANFILES = libite.tag
+
+if ENABLE_HTML
+pkghtmldir     = $(docdir)/html
+pkghtml_DATA   = html/*
+
+#
+# Doxygen rules from m4/ax_prog_doxygen.m4
+#
+@DX_RULES@
+
+$(pkghtml_DATA): doxygen-doc
+
+all-local: doc
+
+clean-local:
+	-rm -rf html libite.tag
+
+doc:  doxygen-doc
+endif

doc/TODO.md

@@ -1,7 +1,8 @@
 TODO ... in no particular order
 ===============================
 
+* Improve documentation, possibly use kdoc or gdoc2 to generate docs from API
+* Continuously, update OpenBSD functions/macros
 * Investigate adding FreeBSD pidfile_open() et al
 * Investigate FreeBSD libutil library, could be useful for porting between unices
 
-

fmode.c

@@ -1,56 +0,0 @@
-/* File mode bit operations
- *
- * Copyright (c) 2008 Claudio Matsuoka <http://helllabs.org/finit/>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/**
- * fmode - Return a file's mode bits.
- * @file: File to look for, with full path.
- *
- * Returns:
- * The mode bits or zero when @file does not exist and errno set to %ENOENT.
- */
-mode_t fmode(char *file)
-{
-	struct stat sb;
-
-	if (!file) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	if (!stat(file, &sb))
-		return sb.st_mode;
-
-	return 0;
-}
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */

lite.h

@@ -1,163 +0,0 @@
-/* Collection of frog DNA
- *
- * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2016  Joachim Nilsson <troglobit@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef LITE_H_
-#define LITE_H_
-
-#include <err.h>
-#include <stdio.h>
-#include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/param.h> /* MAX(), isset(), setbit(), TRUE, FALSE, et consortes. :-) */
-#include <unistd.h>
-#include "strlite.h"
-
-/*
- * fparseln() specific operation flags.
- */
-#define FPARSELN_UNESCESC	0x01
-#define FPARSELN_UNESCCONT	0x02
-#define FPARSELN_UNESCCOMM	0x04
-#define FPARSELN_UNESCREST	0x08
-#define FPARSELN_UNESCALL	0x0f
-
-typedef struct lfile lfile_t;
-
-char   *chomp      (char *str);
-char   *fparseln   (FILE *, size_t *, size_t *, const char[3], int);
-
-int     fexist     (char *file);
-int     fisdir     (const char *file);
-mode_t  fmode      (char *file);
-
-FILE   *tempfile   (void);
-ssize_t copyfile   (char *src, char *dst, int len, int sym);
-int     movefile   (char *src, char *dst);
-int     fcopyfile  (FILE *src, FILE *dst);
-ssize_t fsendfile  (FILE *src, FILE *dst, size_t len);
-
-int     ifconfig   (char *ifname, char *addr, char *mask, int up);
-
-lfile_t*lfopen     (char *file, char *sep);
-void    lfclose    (lfile_t *lf);
-char   *lftok      (lfile_t *lf);
-char   *lfgetkey   (lfile_t *lf, char *key);
-int     lfgetint   (lfile_t *lf, char *key);
-int     fgetint    (char *file, char *sep, char *key);
-
-int     mkpath     (char *dir, mode_t mode);
-int     makepath   (char *dir);
-
-int     dir        (const char *dir, const char *type, int (*filter) (const char *file), char ***list, int strip);
-int     rsync      (char *src, char *dst, int delete, int (*filter) (const char *file));
-
-int     pidfile       (const char *basename);
-int     pidfile_signal(const char *pidfile, int signal);
-pid_t   pidfile_read  (const char *pidfile);
-pid_t   pidfile_poll  (const char *pidfile);
-
-void   *reallocarray(void *optr, size_t nmemb, size_t size);
-
-int     tree(char *path, int show_perms);
-
-void    progress       (int percent, int max_width);
-void    progress_simple(int percent);
-
-#ifndef touch
-# define touch(x) do { if (mknod((x), S_IFREG|0644, 0) && errno != EEXIST) warn("Failed creating %s", x); } while (0)
-#endif
-#ifndef makedir
-# define makedir(x, p) do { if (mkdir(x, p) && errno != EEXIST) warn("Failed creating directory %s", x); } while (0)
-#endif
-#ifndef makefifo
-# define makefifo(x, p) do { if (mkfifo(x, p) && errno != EEXIST) warn("Failed creating FIFO %s", x); } while (0)
-#endif
-#ifndef erase
-# define erase(x) do { if (remove(x) && errno != ENOENT) warn("Failed removing %s", x); } while (0)
-#endif
-#ifndef chardev
-# define chardev(x,m,maj,min) mknod((x), S_IFCHR|(m), makedev((maj),(min)))
-#endif
-#ifndef blkdev
-# define blkdev(x,m,maj,min) mknod((x), S_IFBLK|(m), makedev((maj),(min)))
-#endif
-
-#ifndef S_ISEXEC
-# define S_ISEXEC(m) (((m) & S_IXUSR) == S_IXUSR)
-#endif
-
-/* Unline isset(), setbit() et al, these work with integers/shorts/longwords/etc. */
-#ifndef ISCLR
-#define ISCLR(word,bit)   ((word &   (1 << (bit)) ? 0 : 1))
-#endif
-#ifndef ISSET
-#define ISSET(word,bit)   ((word &   (1 << (bit)) ? 1 : 0))
-#endif
-#ifndef ISOTHER
-#define ISOTHER(word,bit) ((word &  ~(1 << (bit)) ? 1 : 0)) /* Is any other bit set? */
-#endif
-#ifndef SETBIT
-#define SETBIT(word,bit)   (word |=  (1 << (bit)))
-#endif
-#ifndef CLRBIT
-#define CLRBIT(word,bit)   (word &= ~(1 << (bit)))
-#endif
-
-/* From The Practice of Programming, by Kernighan and Pike */
-#ifndef NELEMS
-#define NELEMS(array) (sizeof(array) / sizeof(array[0]))
-#endif
-
-/* Mark a function variable as unused, useful for generic callbacks */
-#ifndef UNUSED
-#define UNUSED(x) UNUSED_ ## x __attribute__ ((unused))
-#endif
-
-/* Does directory end with a slash? */
-static inline int fisslashdir(char *dir)
-{
-   if (!dir)
-	   return 0;
-
-   if (strlen(dir) > 0)
-	   return dir[strlen(dir) - 1] == '/';
-
-   return 0;
-}
-
-/* Compat */
-#define copy_filep(src,dst)        fcopyfile(src,dst)
-#define pidfile_read_pid(file)     pifile_read(file)
-#define signal_pidfile(file,signo) pidfile_signal(file,signo)
-
-#endif /* LITE_H_ */
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */
-

m4/ax_prog_doxygen.m4

@@ -0,0 +1,585 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   DX_INIT_DOXYGEN(PROJECT-NAME, [DOXYFILE-PATH], [OUTPUT-DIR], ...)
+#   DX_DOXYGEN_FEATURE(ON|OFF)
+#   DX_DOT_FEATURE(ON|OFF)
+#   DX_HTML_FEATURE(ON|OFF)
+#   DX_CHM_FEATURE(ON|OFF)
+#   DX_CHI_FEATURE(ON|OFF)
+#   DX_MAN_FEATURE(ON|OFF)
+#   DX_RTF_FEATURE(ON|OFF)
+#   DX_XML_FEATURE(ON|OFF)
+#   DX_PDF_FEATURE(ON|OFF)
+#   DX_PS_FEATURE(ON|OFF)
+#
+# DESCRIPTION
+#
+#   The DX_*_FEATURE macros control the default setting for the given
+#   Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for
+#   generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML
+#   help (for MS users), 'CHI' for generating a seperate .chi file by the
+#   .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate
+#   output formats. The environment variable DOXYGEN_PAPER_SIZE may be
+#   specified to override the default 'a4wide' paper size.
+#
+#   By default, HTML, PDF and PS documentation is generated as this seems to
+#   be the most popular and portable combination. MAN pages created by
+#   Doxygen are usually problematic, though by picking an appropriate subset
+#   and doing some massaging they might be better than nothing. CHM and RTF
+#   are specific for MS (note that you can't generate both HTML and CHM at
+#   the same time). The XML is rather useless unless you apply specialized
+#   post-processing to it.
+#
+#   The macros mainly control the default state of the feature. The use can
+#   override the default by specifying --enable or --disable. The macros
+#   ensure that contradictory flags are not given (e.g.,
+#   --enable-doxygen-html and --enable-doxygen-chm,
+#   --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each
+#   feature will be automatically disabled (with a warning) if the required
+#   programs are missing.
+#
+#   Once all the feature defaults have been specified, call DX_INIT_DOXYGEN
+#   with the following parameters: a one-word name for the project for use
+#   as a filename base etc., an optional configuration file name (the
+#   default is '$(srcdir)/Doxyfile', the same as Doxygen's default), and an
+#   optional output directory name (the default is 'doxygen-doc'). To run
+#   doxygen multiple times for different configuration files and output
+#   directories provide more parameters: the second, forth, sixth, etc
+#   parameter are configuration file names and the third, fifth, seventh,
+#   etc parameter are output directories. No checking is done to catch
+#   duplicates.
+#
+#   Automake Support
+#
+#   The DX_RULES substitution can be used to add all needed rules to the
+#   Makefile. Note that this is a substitution without being a variable:
+#   only the @DX_RULES@ syntax will work.
+#
+#   The provided targets are:
+#
+#     doxygen-doc: Generate all doxygen documentation.
+#
+#     doxygen-run: Run doxygen, which will generate some of the
+#                  documentation (HTML, CHM, CHI, MAN, RTF, XML)
+#                  but will not do the post processing required
+#                  for the rest of it (PS, PDF).
+#
+#     doxygen-ps:  Generate doxygen PostScript documentation.
+#
+#     doxygen-pdf: Generate doxygen PDF documentation.
+#
+#   Note that by default these are not integrated into the automake targets.
+#   If doxygen is used to generate man pages, you can achieve this
+#   integration by setting man3_MANS to the list of man pages generated and
+#   then adding the dependency:
+#
+#     $(man3_MANS): doxygen-doc
+#
+#   This will cause make to run doxygen and generate all the documentation.
+#
+#   The following variable is intended for use in Makefile.am:
+#
+#     DX_CLEANFILES = everything to clean.
+#
+#   Then add this variable to MOSTLYCLEANFILES.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Oren Ben-Kiki <oren@ben-kiki.org>
+#   Copyright (c) 2015 Olaf Mandel <olaf@mandel.name>
+#
+#   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 20
+
+## ----------##
+## Defaults. ##
+## ----------##
+
+DX_ENV=""
+AC_DEFUN([DX_FEATURE_doc],  ON)
+AC_DEFUN([DX_FEATURE_dot],  OFF)
+AC_DEFUN([DX_FEATURE_man],  OFF)
+AC_DEFUN([DX_FEATURE_html], ON)
+AC_DEFUN([DX_FEATURE_chm],  OFF)
+AC_DEFUN([DX_FEATURE_chi],  OFF)
+AC_DEFUN([DX_FEATURE_rtf],  OFF)
+AC_DEFUN([DX_FEATURE_xml],  OFF)
+AC_DEFUN([DX_FEATURE_pdf],  ON)
+AC_DEFUN([DX_FEATURE_ps],   ON)
+
+## --------------- ##
+## Private macros. ##
+## --------------- ##
+
+# DX_ENV_APPEND(VARIABLE, VALUE)
+# ------------------------------
+# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen and add it
+# as a substitution (but not a Makefile variable). The substitution
+# is skipped if the variable name is VERSION.
+AC_DEFUN([DX_ENV_APPEND],
+[AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])dnl
+m4_if([$1], [VERSION], [], [AC_SUBST([$1], [$2])dnl
+AM_SUBST_NOTMAKE([$1])])dnl
+])
+
+# DX_DIRNAME_EXPR
+# ---------------
+# Expand into a shell expression prints the directory part of a path.
+AC_DEFUN([DX_DIRNAME_EXPR],
+         [[expr ".$1" : '\(\.\)[^/]*$' \| "x$1" : 'x\(.*\)/[^/]*$']])
+
+# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF)
+# -------------------------------------
+# Expands according to the M4 (static) status of the feature.
+AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])])
+
+# DX_REQUIRE_PROG(VARIABLE, PROGRAM)
+# ----------------------------------
+# Require the specified program to be found for the DX_CURRENT_FEATURE to work.
+AC_DEFUN([DX_REQUIRE_PROG], [
+AC_PATH_TOOL([$1], [$2])
+if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
+    AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
+    AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0)
+fi
+])
+
+# DX_TEST_FEATURE(FEATURE)
+# ------------------------
+# Expand to a shell expression testing whether the feature is active.
+AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1])
+
+# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE)
+# -------------------------------------------------
+# Verify that a required features has the right state before trying to turn on
+# the DX_CURRENT_FEATURE.
+AC_DEFUN([DX_CHECK_DEPEND], [
+test "$DX_FLAG_$1" = "$2" \
+|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1,
+                            requires, contradicts) doxygen-DX_CURRENT_FEATURE])
+])
+
+# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE)
+# ----------------------------------------------------------
+# Turn off the DX_CURRENT_FEATURE if the required feature is off.
+AC_DEFUN([DX_CLEAR_DEPEND], [
+test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0)
+])
+
+# DX_FEATURE_ARG(FEATURE, DESCRIPTION,
+#                CHECK_DEPEND, CLEAR_DEPEND,
+#                REQUIRE, DO-IF-ON, DO-IF-OFF)
+# --------------------------------------------
+# Parse the command-line option controlling a feature. CHECK_DEPEND is called
+# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND),
+# otherwise CLEAR_DEPEND is called to turn off the default state if a required
+# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional
+# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and
+# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature.
+AC_DEFUN([DX_ARG_ABLE], [
+    AC_DEFUN([DX_CURRENT_FEATURE], [$1])
+    AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2])
+    AC_ARG_ENABLE(doxygen-$1,
+                  [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1],
+                                                      [--enable-doxygen-$1]),
+                                  DX_IF_FEATURE([$1], [don't $2], [$2]))],
+                  [
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    AC_SUBST([DX_FLAG_$1], 1)
+    $3
+;; #(
+n|N|no|No|NO)
+    AC_SUBST([DX_FLAG_$1], 0)
+;; #(
+*)
+    AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1])
+;;
+esac
+], [
+AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)])
+$4
+])
+if DX_TEST_FEATURE([$1]); then
+    $5
+    :
+fi
+if DX_TEST_FEATURE([$1]); then
+    $6
+    :
+else
+    $7
+    :
+fi
+])
+
+## -------------- ##
+## Public macros. ##
+## -------------- ##
+
+# DX_XXX_FEATURE(DEFAULT_STATE)
+# -----------------------------
+AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc],  [$1])])
+AC_DEFUN([DX_DOT_FEATURE],     [AC_DEFUN([DX_FEATURE_dot], [$1])])
+AC_DEFUN([DX_MAN_FEATURE],     [AC_DEFUN([DX_FEATURE_man],  [$1])])
+AC_DEFUN([DX_HTML_FEATURE],    [AC_DEFUN([DX_FEATURE_html], [$1])])
+AC_DEFUN([DX_CHM_FEATURE],     [AC_DEFUN([DX_FEATURE_chm],  [$1])])
+AC_DEFUN([DX_CHI_FEATURE],     [AC_DEFUN([DX_FEATURE_chi],  [$1])])
+AC_DEFUN([DX_RTF_FEATURE],     [AC_DEFUN([DX_FEATURE_rtf],  [$1])])
+AC_DEFUN([DX_XML_FEATURE],     [AC_DEFUN([DX_FEATURE_xml],  [$1])])
+AC_DEFUN([DX_XML_FEATURE],     [AC_DEFUN([DX_FEATURE_xml],  [$1])])
+AC_DEFUN([DX_PDF_FEATURE],     [AC_DEFUN([DX_FEATURE_pdf],  [$1])])
+AC_DEFUN([DX_PS_FEATURE],      [AC_DEFUN([DX_FEATURE_ps],   [$1])])
+
+# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR], ...)
+# --------------------------------------------------------------
+# PROJECT also serves as the base name for the documentation files.
+# The default CONFIG-FILE is "$(srcdir)/Doxyfile" and OUTPUT-DOC-DIR is
+# "doxygen-doc".
+# More arguments are interpreted as interleaved CONFIG-FILE and
+# OUTPUT-DOC-DIR values.
+AC_DEFUN([DX_INIT_DOXYGEN], [
+
+# Files:
+AC_SUBST([DX_PROJECT], [$1])
+AC_SUBST([DX_CONFIG], ['ifelse([$2], [], [$(srcdir)/Doxyfile], [$2])'])
+AC_SUBST([DX_DOCDIR], ['ifelse([$3], [], [doxygen-doc], [$3])'])
+m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2,
+      [AC_SUBST([DX_CONFIG]m4_eval(DX_i[/2]),
+                'm4_default_nblank_quoted(m4_argn(DX_i, $@),
+                                          [$(srcdir)/Doxyfile])')])])dnl
+m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 5, m4_count($@,), 2,
+      [AC_SUBST([DX_DOCDIR]m4_eval([(]DX_i[-1)/2]),
+                'm4_default_nblank_quoted(m4_argn(DX_i, $@),
+                                          [doxygen-doc])')])])dnl
+m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1,
+          [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])],
+          [])))dnl
+
+# Environment variables used inside doxygen.cfg:
+DX_ENV_APPEND(SRCDIR, $srcdir)
+DX_ENV_APPEND(PROJECT, $DX_PROJECT)
+DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)
+
+# Doxygen itself:
+DX_ARG_ABLE(doc, [generate any doxygen documentation],
+            [],
+            [],
+            [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen)
+             DX_REQUIRE_PROG([DX_PERL], perl)],
+            [DX_ENV_APPEND(PERL_PATH, $DX_PERL)])
+
+# Dot for graphics:
+DX_ARG_ABLE(dot, [generate graphics for doxygen documentation],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [DX_REQUIRE_PROG([DX_DOT], dot)],
+            [DX_ENV_APPEND(HAVE_DOT, YES)
+             DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])],
+            [DX_ENV_APPEND(HAVE_DOT, NO)])
+
+# Man pages generation:
+DX_ARG_ABLE(man, [generate doxygen manual pages],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [],
+            [DX_ENV_APPEND(GENERATE_MAN, YES)],
+            [DX_ENV_APPEND(GENERATE_MAN, NO)])
+
+# RTF file generation:
+DX_ARG_ABLE(rtf, [generate doxygen RTF documentation],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [],
+            [DX_ENV_APPEND(GENERATE_RTF, YES)],
+            [DX_ENV_APPEND(GENERATE_RTF, NO)])
+
+# XML file generation:
+DX_ARG_ABLE(xml, [generate doxygen XML documentation],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [],
+            [DX_ENV_APPEND(GENERATE_XML, YES)],
+            [DX_ENV_APPEND(GENERATE_XML, NO)])
+
+# (Compressed) HTML help generation:
+DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [DX_REQUIRE_PROG([DX_HHC], hhc)],
+            [DX_ENV_APPEND(HHC_PATH, $DX_HHC)
+             DX_ENV_APPEND(GENERATE_HTML, YES)
+             DX_ENV_APPEND(GENERATE_HTMLHELP, YES)],
+            [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)])
+
+# Seperate CHI file generation.
+DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file],
+            [DX_CHECK_DEPEND(chm, 1)],
+            [DX_CLEAR_DEPEND(chm, 1)],
+            [],
+            [DX_ENV_APPEND(GENERATE_CHI, YES)],
+            [DX_ENV_APPEND(GENERATE_CHI, NO)])
+
+# Plain HTML pages generation:
+DX_ARG_ABLE(html, [generate doxygen plain HTML documentation],
+            [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)],
+            [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)],
+            [],
+            [DX_ENV_APPEND(GENERATE_HTML, YES)],
+            [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)])
+
+# PostScript file generation:
+DX_ARG_ABLE(ps, [generate doxygen PostScript documentation],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [DX_REQUIRE_PROG([DX_LATEX], latex)
+             DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex)
+             DX_REQUIRE_PROG([DX_DVIPS], dvips)
+             DX_REQUIRE_PROG([DX_EGREP], egrep)])
+
+# PDF file generation:
+DX_ARG_ABLE(pdf, [generate doxygen PDF documentation],
+            [DX_CHECK_DEPEND(doc, 1)],
+            [DX_CLEAR_DEPEND(doc, 1)],
+            [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex)
+             DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex)
+             DX_REQUIRE_PROG([DX_EGREP], egrep)])
+
+# LaTeX generation for PS and/or PDF:
+if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then
+    DX_ENV_APPEND(GENERATE_LATEX, YES)
+else
+    DX_ENV_APPEND(GENERATE_LATEX, NO)
+fi
+
+# Paper size for PS and/or PDF:
+AC_ARG_VAR(DOXYGEN_PAPER_SIZE,
+           [a4wide (default), a4, letter, legal or executive])
+case "$DOXYGEN_PAPER_SIZE" in
+#(
+"")
+    AC_SUBST(DOXYGEN_PAPER_SIZE, "")
+;; #(
+a4wide|a4|letter|legal|executive)
+    DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE)
+;; #(
+*)
+    AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'])
+;;
+esac
+
+# Rules:
+AS_IF([[test $DX_FLAG_html -eq 1]],
+[[DX_SNIPPET_html="## ------------------------------- ##
+## Rules specific for HTML output. ##
+## ------------------------------- ##
+
+DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+                \$(DX_DOCDIR]DX_i[)/html]])[
+
+"]],
+[[DX_SNIPPET_html=""]])
+AS_IF([[test $DX_FLAG_chi -eq 1]],
+[[DX_SNIPPET_chi="
+DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+               \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]],
+[[DX_SNIPPET_chi=""]])
+AS_IF([[test $DX_FLAG_chm -eq 1]],
+[[DX_SNIPPET_chm="## ------------------------------ ##
+## Rules specific for CHM output. ##
+## ------------------------------ ##
+
+DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+               \$(DX_DOCDIR]DX_i[)/chm]])[\
+${DX_SNIPPET_chi}
+
+"]],
+[[DX_SNIPPET_chm=""]])
+AS_IF([[test $DX_FLAG_man -eq 1]],
+[[DX_SNIPPET_man="## ------------------------------ ##
+## Rules specific for MAN output. ##
+## ------------------------------ ##
+
+DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+               \$(DX_DOCDIR]DX_i[)/man]])[
+
+"]],
+[[DX_SNIPPET_man=""]])
+AS_IF([[test $DX_FLAG_rtf -eq 1]],
+[[DX_SNIPPET_rtf="## ------------------------------ ##
+## Rules specific for RTF output. ##
+## ------------------------------ ##
+
+DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+               \$(DX_DOCDIR]DX_i[)/rtf]])[
+
+"]],
+[[DX_SNIPPET_rtf=""]])
+AS_IF([[test $DX_FLAG_xml -eq 1]],
+[[DX_SNIPPET_xml="## ------------------------------ ##
+## Rules specific for XML output. ##
+## ------------------------------ ##
+
+DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+               \$(DX_DOCDIR]DX_i[)/xml]])[
+
+"]],
+[[DX_SNIPPET_xml=""]])
+AS_IF([[test $DX_FLAG_ps -eq 1]],
+[[DX_SNIPPET_ps="## ----------------------------- ##
+## Rules specific for PS output. ##
+## ----------------------------- ##
+
+DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+              \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[
+
+DX_PS_GOAL = doxygen-ps
+
+doxygen-ps: \$(DX_CLEAN_PS)
+
+]m4_foreach([DX_i], [DX_loop],
+[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag
+	\$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\
+	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\
+	\$(DX_LATEX) refman.tex; \\
+	\$(DX_MAKEINDEX) refman.idx; \\
+	\$(DX_LATEX) refman.tex; \\
+	countdown=5; \\
+	while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\
+	                  refman.log > /dev/null 2>&1 \\
+	   && test \$\$countdown -gt 0; do \\
+	    \$(DX_LATEX) refman.tex; \\
+            countdown=\`expr \$\$countdown - 1\`; \\
+	done; \\
+	\$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi
+
+]])["]],
+[[DX_SNIPPET_ps=""]])
+AS_IF([[test $DX_FLAG_pdf -eq 1]],
+[[DX_SNIPPET_pdf="## ------------------------------ ##
+## Rules specific for PDF output. ##
+## ------------------------------ ##
+
+DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+               \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[
+
+DX_PDF_GOAL = doxygen-pdf
+
+doxygen-pdf: \$(DX_CLEAN_PDF)
+
+]m4_foreach([DX_i], [DX_loop],
+[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag
+	\$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\
+	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\
+	\$(DX_PDFLATEX) refman.tex; \\
+	\$(DX_MAKEINDEX) refman.idx; \\
+	\$(DX_PDFLATEX) refman.tex; \\
+	countdown=5; \\
+	while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\
+	                  refman.log > /dev/null 2>&1 \\
+	   && test \$\$countdown -gt 0; do \\
+	    \$(DX_PDFLATEX) refman.tex; \\
+	    countdown=\`expr \$\$countdown - 1\`; \\
+	done; \\
+	mv refman.pdf ../\$(PACKAGE).pdf
+
+]])["]],
+[[DX_SNIPPET_pdf=""]])
+AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]],
+[[DX_SNIPPET_latex="## ------------------------------------------------- ##
+## Rules specific for LaTeX (shared for PS and PDF). ##
+## ------------------------------------------------- ##
+
+DX_V_LATEX = \$(_DX_v_LATEX_\$(V))
+_DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY))
+_DX_v_LATEX_0 = @echo \"  LATEX \" \$][@;
+
+DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl
+m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\
+                 \$(DX_DOCDIR]DX_i[)/latex]])[
+
+"]],
+[[DX_SNIPPET_latex=""]])
+
+AS_IF([[test $DX_FLAG_doc -eq 1]],
+[[DX_SNIPPET_doc="## --------------------------------- ##
+## Format-independent Doxygen rules. ##
+## --------------------------------- ##
+
+${DX_SNIPPET_html}\
+${DX_SNIPPET_chm}\
+${DX_SNIPPET_man}\
+${DX_SNIPPET_rtf}\
+${DX_SNIPPET_xml}\
+${DX_SNIPPET_ps}\
+${DX_SNIPPET_pdf}\
+${DX_SNIPPET_latex}\
+DX_V_DXGEN = \$(_DX_v_DXGEN_\$(V))
+_DX_v_DXGEN_ = \$(_DX_v_DXGEN_\$(AM_DEFAULT_VERBOSITY))
+_DX_v_DXGEN_0 = @echo \"  DXGEN \" \$<;
+
+.PHONY: doxygen-run doxygen-doc \$(DX_PS_GOAL) \$(DX_PDF_GOAL)
+
+.INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL)
+
+doxygen-run:]m4_foreach([DX_i], [DX_loop],
+                         [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[
+
+doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL)
+
+]m4_foreach([DX_i], [DX_loop],
+[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS)
+	\$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[)
+	\$(A""M_V_at)echo Timestamp >\$][@
+
+]])dnl
+[DX_CLEANFILES = \\]
+m4_foreach([DX_i], [DX_loop],
+[[	\$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\
+	\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\
+]])dnl
+[	-r \\
+	\$(DX_CLEAN_HTML) \\
+	\$(DX_CLEAN_CHM) \\
+	\$(DX_CLEAN_CHI) \\
+	\$(DX_CLEAN_MAN) \\
+	\$(DX_CLEAN_RTF) \\
+	\$(DX_CLEAN_XML) \\
+	\$(DX_CLEAN_PS) \\
+	\$(DX_CLEAN_PDF) \\
+	\$(DX_CLEAN_LATEX)"]],
+[[DX_SNIPPET_doc=""]])
+AC_SUBST([DX_RULES],
+["${DX_SNIPPET_doc}"])dnl
+AM_SUBST_NOTMAKE([DX_RULES])
+
+#For debugging:
+#echo DX_FLAG_doc=$DX_FLAG_doc
+#echo DX_FLAG_dot=$DX_FLAG_dot
+#echo DX_FLAG_man=$DX_FLAG_man
+#echo DX_FLAG_html=$DX_FLAG_html
+#echo DX_FLAG_chm=$DX_FLAG_chm
+#echo DX_FLAG_chi=$DX_FLAG_chi
+#echo DX_FLAG_rtf=$DX_FLAG_rtf
+#echo DX_FLAG_xml=$DX_FLAG_xml
+#echo DX_FLAG_pdf=$DX_FLAG_pdf
+#echo DX_FLAG_ps=$DX_FLAG_ps
+#echo DX_ENV=$DX_ENV
+])

makepath.c

@@ -1,69 +0,0 @@
-/* mkpath() -- Create all components leading up to a given directory
- *
- * Copyright (c) 2013-2016  Joachim Nilsson <troglobit@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <libgen.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "lite.h"
-
-/**
- * mkpath - Like makepath() but takes a mode_t argument
- * @dir:  Directory to created, relative or absolute
- * @mode: A &mode_t mode to create @dir with
- *
- * Returns:
- * POSIX OK(0) on success, otherwise -1 with @errno set.
- */
-int mkpath(char *dir, mode_t mode)
-{
-	struct stat sb;
-
-	if (!dir) {
-		errno = EINVAL;
-		return 1;
-	}
-
-	if (!stat(dir, &sb))
-		return 0;
-
-	mkpath(dirname(strdupa(dir)), mode);
-
-	return mkdir(dir, mode);
-}
-
-/**
- * makepath - Create all components of the specified directory.
- * @dir: Directory to create.
- *
- * Returns:
- * POSIX OK (0) on success, otherwise -1 and errno set appropriately.
- * This function returns EINVAL on bad argument, or ENOMEM when it
- * fails allocating temporary memory.  For other error codes see the
- * mkdir() syscall description.
- */
-int makepath(char *dir)
-{
-	return mkpath(dir, 0777);
-}
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */

src/.gitignore

@@ -0,0 +1,3 @@
+*.la
+.libs/*
+libite_la*

src/Makefile.am

@@ -0,0 +1,45 @@
+lib_LTLIBRARIES       = libite.la
+
+libite_la_CPPFLAGS    = -D_GNU_SOURCE
+libite_la_CFLAGS      = -W -Wall -Wextra
+libite_la_LDFLAGS     = $(AM_LDFLAGS) -version-info 8:1:3
+libite_la_SOURCES     = chomp.c		copyfile.c			\
+			conio.c		conio.h		dir.c		\
+			erasef.c	fopenf.c	fremove.c	\
+			fexist.c	fisdir.c			\
+			fparseln.c	fsendfile.c			\
+			ifconfig.c	lfile.c				\
+			makepath.c	progress.c			\
+			pidfile.c	pidfilefn.c			\
+			reallocarray.c	rsync.c		strtrim.c	\
+			strlcpy.c 	strlcat.c 	strtonum.c	\
+			strdupa.h	strndupa.h	strnlen.h	\
+			strmatch.c	systemf.c	touchf.c	\
+			telnet.c	tempfile.c	truncatef.c	\
+			yorn.c		which.c				\
+			lite.h		strlite.h			\
+			queue.h		tree.h
+
+
+## Distribute these header files in the <libite/...> namespace
+pkgincludedir       = $(includedir)/libite
+pkginclude_HEADERS  = lite.h queue.h conio.h tree.h strlite.h strdupa.h	\
+		      strndupa.h strnlen.h
+
+pkgconfigdir        = $(libdir)/pkgconfig
+pkgconfig_DATA      = libite.pc
+
+## For compatibility with previous <lite/...> namespace
+if COMPAT_SYMLINK
+install-data-hook:
+	link=$(DESTDIR)$(includedir)/lite;                   \
+	if [ ! -f $$link ]; then                             \
+		$(LN_S) libite $$link;                       \
+	fi
+
+uninstall-hook:
+	link=$(shell readlink $(DESTDIR)$(includedir)/lite); \
+	if [ "$$link" = "libite" ]; then                     \
+		$(RM) $(DESTDIR)$(includedir)/lite;          \
+	fi
+endif

src/chomp.c

@@ -1,6 +1,6 @@
 /* Perl inspired chomp() implementation.
  *
- * Copyright (c) 2014-2015  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2014-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,19 +15,25 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file chomp.c
+ * @author Joachim Wiberg
+ * @date 2014-2021
+ * @copyright ISC License
+ */
+
 #include <errno.h>
 #include <string.h>
 
 /**
- * chomp - Perl like chomp function, chop off last char(s) if newline.
- * @str: String to chomp
+ * Perl like chomp function, chop off last char(s) if newline.
+ * @param str  String to chomp
  *
  * This function is like Perl chomp, but it's set to chop of all
- * trailing newlines.
+ * trailing newlines.  Useful in combination with fgets().
  *
- * Returns:
- * If @str is a valid pointer this function returns @str, otherwise
- * @errno is set to %EINVAL and this function returns %NULL.
+ * @returns @a str, or @c NULL with @a errno set, if @a str is not a valid pointer.
+ * @exception EINVAL if the input argument is not a valid pointer.
  */
 char *chomp(char *str)
 {
@@ -39,7 +45,7 @@ char *chomp(char *str)
 	}
 
 	p = str + strlen(str) - 1;
-        while (*p == '\n')
+        while (p >= str && *p == '\n')
 		*p-- = 0;
 
 	return str;

src/conio.c

@@ -0,0 +1,104 @@
+/* A conio.h like implementation for VTANSI displays.
+ *
+ * Copyright (c) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file conio.c
+ * @author Joachim Wiberg
+ * @date 2009-2021
+ * @copyright ISC License
+ */
+
+#include <poll.h>
+#include <stdio.h>
+#include <termios.h>
+#include <unistd.h>
+
+/**
+ * Probe terminal size
+ * @param row pointer to integer to store number of rows
+ * @param col pointer to integer to store number of columns
+ *
+ * This function checks if stdin and stdout isatty() and then sets the
+ * TTY in raw mode to silently ask the size using ANSI escape sequences.
+ * This is achieved by trying to go to corner 999,999 followed by
+ * querying the cursor position.  Afterwards the TTY is returned to the
+ * state if was before, e.g. cooked.  The number of rows and columns is
+ * returned in the input arguments to this function.
+ *
+ * If stdio is @a not a TTY, then a default 24x80 is returned.
+ */
+void initscr(int *row, int *col)
+{
+	if (!row || !col)
+		return;
+
+#if defined(TCSANOW) && defined(POLLIN)
+	struct termios tc, saved;
+	struct pollfd fd = { STDIN_FILENO, POLLIN, 0 };
+
+	if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO)) {
+		*row = 24;
+		*col = 80;
+		return;
+	}
+
+	/* Disable echo to terminal while probing */
+	tcgetattr(STDOUT_FILENO, &tc);
+	saved = tc;
+	tc.c_cflag |= (CLOCAL | CREAD);
+	tc.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
+	tcsetattr(STDOUT_FILENO, TCSANOW, &tc);
+
+	/*
+	 * Save cursor pos+attr
+	 * Diable top+bottom margins
+	 * Set cursor at the far bottom,right pos
+	 * Query term for resulting pos
+	 */
+	fprintf(stdout, "\e7" "\e[r" "\e[999;999H" "\e[6n");
+	fflush(stdout);
+
+	/*
+	 * Wait here for terminal to echo back \e[row,lineR ...
+	 */
+	if (poll(&fd, 1, 300) <= 0 || scanf("\e[%d;%dR", row, col) != 2) {
+		*row = 24;
+		*col = 80;
+	}
+
+	/*
+	 * Restore above saved cursor pos+attr
+	 */
+	fprintf(stdout, "\e8");
+	fflush(stdout);
+
+	/* Restore terminal */
+	tcsetattr(STDOUT_FILENO, TCSANOW, &saved);
+
+	return;
+#else
+	*row = 24;
+	*col = 80;
+#endif
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/conio.h

@@ -0,0 +1,144 @@
+/* A conio.h like implementation for VTANSI displays.
+ *
+ * Copyright (c) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file conio.h
+ * @author Joachim Wiberg
+ * @date 2009-2021
+ * @copyright ISC License
+ *
+ * Helper macros and functions for interacting with TTY terminals.
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef LIBITE_CONIO_H_
+#define LIBITE_CONIO_H_
+
+#include <stdio.h>
+
+/** Attributes */
+#define RESETATTR    0
+#define BRIGHT       1
+#define DIM          2
+#define UNDERSCORE   4
+#define BLINK        5           /* May not work on all displays. */
+#define REVERSE      7
+#define HIDDEN       8
+
+/** Colors for text and background */
+#define BLACK        0x0
+#define RED          0x1
+#define GREEN        0x2
+#define BROWN        0x3
+#define BLUE         0x4
+#define MAGENTA      0x5
+#define CYAN         0x6
+#define LIGHTGREY    0x7
+
+#define DARKGREY     0x10
+#define LIGHTRED     0x11
+#define LIGHTGREEN   0x12
+#define YELLOW       0x13
+#define LIGHTBLUE    0x14
+#define LIGHTMAGENTA 0x15
+#define LIGHTCYAN    0x16
+#define WHITE        0x17
+
+#ifndef SCREEN_WIDTH
+#define SCREEN_WIDTH 80	/**< Fallback screen width, possible to override. */
+#endif
+
+/** Clear screen and move cursor to 1,1 (upper left) pos. */
+#define clrscr()              fputs("\033[2J\033[1;1H", stdout)
+/** Erases from the current cursor position to the end of the current line. */
+#define clreol()              fputs("\033[K", stdout)
+/** Erases the entire current line. */
+#define delline()             fputs("\033[2K", stdout)
+/** Moves the cursor to the specified position (coordinates) */
+#define gotoxy(x,y)           fprintf(stdout, "\033[%d;%dH", y, x)
+/** Hide Cursor */
+#define hidecursor()          fputs("\033[?25l", stdout)
+/** Show Cursor */
+#define showcursor()          fputs("\033[?25h", stdout)
+
+/** Set Graphics Mode (attr, color, val) */
+#define __set_gm(a,c,v)							\
+	if (!c)								\
+		fprintf(stdout, "\033[%dm", a);				\
+	else								\
+		fprintf(stdout, "\033[%d;%dm", c & 0x10 ? 1 : 0, (c & 0xF) + v)
+
+/** Set text attribute */
+#define textattr(attr)        __set_gm(attr, 0, 0)
+/** Set text color */
+#define textcolor(color)      __set_gm(RESETATTR, color, 30)
+/** Set text background */
+#define textbackground(color) __set_gm(RESETATTR, color, 40)
+
+void initscr(int *row, int *col);
+
+/**
+ * Print table heading, with optional leading newline.
+ * @param fp    output stream
+ * @param line  string to print
+ * @param nl    leading newline or not
+ * @param attr  attribute
+ *
+ * @verbatim
+ * _________________ <-- Empty line with UNDERSCORE to frame first heading
+ * First heading     <-- In normal/RESETATTR
+ * SUBHEADING        <-- In REVERSE and with capital letters like 'top'
+ * @endverbatim
+ */
+static inline void printhdr(FILE *fp, const char *line, int nl, int attr)
+{
+	if (attr < 0 || attr > 8)
+		attr = REVERSE;
+
+	fprintf(fp ?: stdout,
+		"%s\033[%dm%s%*s\033[0m\n",
+		nl ? "\n" : "", attr, line,
+		SCREEN_WIDTH - (int)strlen(line), "");
+}
+
+/**
+ * Print reverse mode table heading, e.g. black text on white background.
+ * @param fp    output stream
+ * @param line  string to print
+ * @param nl    leading newline or not
+ */
+static inline void printheader(FILE *fp, const char *line, int nl)
+{
+	printhdr(fp, line, nl, REVERSE);
+}
+
+#endif /* LIBITE_CONIO_H_ */
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/copyfile.c

@@ -21,13 +21,20 @@
  * THE SOFTWARE.
  */
 
+/**
+ * @file copyfile.c
+ * @author Claudio Matsuoka
+ * @date 2008
+ * @copyright MIT License
+ */
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include "lite.h"
 
 /* Tests if dst is a directory, if so, reallocates dst and appends src filename returning 1 */
-static int adjust_target(char *src, char **dst)
+static int adjust_target(const char *src, char **dst)
 {
 	int isdir = 0;
 
@@ -36,7 +43,7 @@ static int adjust_target(char *src, char **dst)
 		char *tmp, *ptr = strrchr(src, '/');
 
 		if (!ptr)
-			ptr = src;
+			ptr = (char *)src;
 		else
 			ptr++;
 
@@ -80,26 +87,50 @@ static ssize_t do_copy(int in, int out, size_t num, char *buffer, size_t len)
 	return size;
 }
 
+static void set_mtime(int in, int out)
+{
+	struct stat st;
+	struct timespec tv[2];
+
+	if (fstat(in, &st))
+		return;
+
+	tv[0] = st.st_atim;
+	tv[1] = st.st_mtim;
+	futimens(out, tv);
+}
+
 /**
- * copyfile - Copy a file to another.
- * @src: Full path name to source file.
- * @dst: Full path name to target file.
- * @len: Number of bytes to copy, zero (0) for entire file.
- * @sym: Should symlinks be recreated (1) or followed (0)
+ * Copy a file to another.
+ * @param src Full path name to source file.
+ * @param dst Full path name to target file.
+ * @param len Number of bytes to copy, zero (0) for entire file.
+ * @param opt An option mask of ::LITE_FOPT_COPYFILE_SYM, ::LITE_FOPT_KEEP_MTIME
  *
  * This is a C implementation of the command line cp(1) utility.  It is one
  * of the classic missing links in the UNIX C library.  This version is from
  * the finit project, http://helllabs.org/finit/, which is a reimplementation
  * of fastinit for the Asus EeePC.
  *
- * Returns:
- * The number of bytes copied, zero may be error (check errno!), but it
- * may also indicate that @src was empty.  If @src is a directory @errno
- * will be set to %EISDIR since copyfile() is not recursive.
+ * The @a opt field replaces the @a sym argument in previous releases
+ * and works as follows.  To maintain backwards compatibility with @a
+ * sym the ::LITE_FOPT_COPYFILE_SYM has a value of @c 1.  Supported
+ * option flags are:
+ *
+ * - ::LITE_FOPT_COPYFILE_SYM  Recreate symlink or follow to copy target
+ * - ::LITE_FOPT_KEEP_MTIME    Preserve modification time
+ *
+ * @returns The number of bytes copied, or zero, which may be an error
+ * (check @a errno, see Exceptions below), but it may also indicate that
+ * @a src was empty.  See exceptions, below.
+ *
+ * @exception EISDIR if @a src is a directory, since copyfile() is not recursive.
  */
-ssize_t copyfile(char *src, char *dst, int len, int sym)
+ssize_t copyfile(const char *src, const char *dst, int len, int opt)
 {
-	char *buffer;
+	char *buffer, *dest = (char *)dst;
+	int sym = (opt & LITE_FOPT_COPYFILE_SYM) != 0;
+	int keep_mtim = (opt & LITE_FOPT_KEEP_MTIME) != 0;
 	int in, out, isdir = 0, saved_errno = 0;
 	size_t num;
 	ssize_t size = 0;
@@ -117,7 +148,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 	}
 
 	/* Check if target is a directory, then append src filename. */
-	isdir = adjust_target(src, &dst);
+	isdir = adjust_target(src, &dest);
 
 	/* Check if the source file is a symlink ... */
 	if (stat(src, &st)) {
@@ -134,7 +165,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 				size = -1;
 			} else {
 				buffer[size] = 0;
-				size = !symlink(buffer, dst);
+				size = !symlink(buffer, dest);
 			}
 		}
 
@@ -155,7 +186,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 		goto exit;
 	}
 
-	out = open(dst, O_WRONLY | O_CREAT | O_TRUNC, fmode(src));
+	out = open(dest, O_WRONLY | O_CREAT | O_TRUNC, st.st_mode);
 	if (out < 0) {
 		close(in);
 		saved_errno = errno;
@@ -165,6 +196,8 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 	size = do_copy(in, out, num, buffer, BUFSIZ);
 	if (!size && errno)
 		saved_errno = errno;
+	else if (keep_mtim)
+		set_mtime(in, out);
 
 	close(out);
 	close(in);
@@ -172,39 +205,39 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 exit:
 	free(buffer);
 	if (isdir)
-		free(dst);
+		free(dest);
 	errno = saved_errno;
 
 	return size;
 }
 
 /**
- * movefile - Move a file to another location
- * @src: Source file.
- * @dst: Target file, or location.
+ * Move a file to another location
+ * @param src Source file.
+ * @param dst Target file, or location.
  *
  * This is a C implementation of the command line mv(1) utility.
  * Usually the rename() API is sufficient, but not when moving across
  * file system boundaries.
  *
- * The @src argument must include the full path to the source file,
- * whereas the @dst argument may only be a directory, in which case the
- * same file name from @src is used.
+ * The @p src argument must include the full path to the source file,
+ * whereas the @p dst argument may only be a directory, in which case
+ * the same file name from @p src is used.
  *
- * Returns:
- * POSIX OK(0), or non-zero with errno set.
+ * @returns POSIX OK(0), or non-zero with @a errno set.
  */
-int movefile(char *src, char *dst)
+int movefile(const char *src, const char *dst)
 {
+	char *dest = (char *)dst;
 	int isdir, result = 0;
 
 	/* Check if target is a directory, then append the src base filename. */
-	isdir = adjust_target(src, &dst);
+	isdir = adjust_target(src, &dest);
 
-	if (rename(src, dst)) {
+	if (rename(src, dest)) {
 		if (errno == EXDEV) {
 			errno = 0;
-			copyfile(src, dst, 0, 1);
+			copyfile(src, dest, 0, 1);
 			if (errno)
 				result = 1;
 			else
@@ -215,21 +248,17 @@ int movefile(char *src, char *dst)
 	}
 
 	if (isdir)
-		free(dst);
+		free(dest);
 
 	return result;
 }
 
 /**
- * fcopyfile - Copy between FILE *fp.
- * @src: Source FILE.
- * @dst: Destination FILE.
+ * Copy between FILE *fp.
+ * @param src Source FILE.
+ * @param dst Destination FILE.
  *
- * Function takes signals into account and will restart the syscalls as
- * long as error is %EINTR.
- *
- * Returns:
- * POSIX OK(0), or non-zero with errno set on error.
+ * @returns POSIX OK(0), or non-zero with @a errno set on error.
  */
 int fcopyfile(FILE *src, FILE *dst)
 {

src/dir.c

@@ -1,6 +1,6 @@
 /* Functions for operating on files in directories.
  *
- * Copyright (c) 2008-2016  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
  * 
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,6 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file dir.c
+ * @author Joachim Wiberg
+ * @date 2008-2021
+ * @copyright ISC License
+ */
+
 #include <errno.h>
 #include <dirent.h>
 #include <stdlib.h>
@@ -48,32 +55,29 @@ static int matcher(const struct dirent *entry)
 }
 
 /**
- * dir - List all files of a certain type in the given directory.
- * @dir:   Base directory for dir operation.
- * @type:  File type suffix, e.g. ".cfg".
- * @filter: Optional file name filter.
- * @list:  Pointer to an array of file names.
- * @strip: Flag, if set dir() strips the file type.
+ * List all files of a certain type in the given directory.
+ * @param dir    Base directory for dir operation.
+ * @param type   File type suffix, e.g. ".cfg".
+ * @param filter Optional file name filter.
+ * @param list   Pointer to an array of file names.
+ * @param strip  Flag, if set dir() strips the file type.
  *
- * This function returns a @list of files, matching the @type suffix,
- * in the given directory @dir.
+ * This function returns a @a list of files, matching the @a type
+ * suffix, in the given directory @a dir.
  *
- * The @list argument is a pointer to where to store the dynamically
+ * The @a list argument is a pointer to where to store the dynamically
  * allocated list of file names.  This list should be free'd by first
  * calling free() on each file name and then on the list itself.
  *
- * If @filter is not %NULL it will be called for each file found.  If
- * @filter returns non-zero the @file argument will be included in the
- * resulting @list.  If @filter returns zero for given @file it will
- * be discarded.
+ * If @a filter is not @c NULL it will be called for each file found.
+ * If @a filter returns non-zero the @a file argument is included in the
+ * resulting @a list.  If @a filter returns zero for given @a file it is
+ * discarded.  If the @a strip flag is set the resulting @a list of
+ * files has their file type stripped, including the dot.  So a match
+ * "config0.cfg" would be returned as "config0".
  *
- * If the @strip flag is set the resulting @list of files has their
- * file type stripped, including the dot.  So a match "config0.cfg"
- * would be returned as "config0".
- *
- * Returns:
- * Number of files in @list, zero if no matching files of @type, or
- * non-zero on error with @errno set.
+ * @returns The number of files in @a list, zero if no matching files of
+ * @a type, or non-zero on error with @a errno set.
  */
 int dir(const char *dir, const char *type, int (*filter) (const char *file), char ***list, int strip)
 {

src/erasef.c

@@ -0,0 +1,72 @@
+/* Formatted erase()
+ *
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file erasef.c
+ * @author Joachim Wiberg
+ * @date 2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "lite.h"
+
+/**
+ * Like erase() but with formatted string support.
+ * @param fmt  Formatted string to be composed into a pathname
+ *
+ * This is a wrapper for the erase() function in lite.h, lessening the
+ * burden of having to compose the filename from parts in a seprate
+ * buffer.
+ *
+ * @returns Upon successful completion erasef() returns POSIX OK(0),
+ * otherwise, -1 is returned and @a errno is set to indicate the error.
+ */
+int erasef(const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return erase(file);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/fexist.c

@@ -21,17 +21,23 @@
  * THE SOFTWARE.
  */
 
+/**
+ * @file fexist.c
+ * @author Claudio Matsuoka
+ * @date 2008
+ * @copyright MIT License
+ */
+
 #include <errno.h>
 #include <unistd.h>
 
 /**
- * fexist - Check if a file exists in the file system.
- * @file: File to look for, with full path.
+ * Check if a file exists in the file system.
+ * @param file File to look for, with full path.
  *
- * Returns:
- * %TRUE(1) if the file exists, otherwise %FALSE(0).
+ * @returns @c TRUE(1) if the @a file exists, otherwise @c FALSE(0).
  */
-int fexist(char *file)
+int fexist(const char *file)
 {
 	if (!file) {
 		errno = EINVAL;

src/fisdir.c

@@ -21,21 +21,27 @@
  * THE SOFTWARE.
  */
 
+/**
+ * @file fisdir.c
+ * @author Claudio Matsuoka
+ * @date 2008
+ * @copyright MIT License
+ */
+
 #include <sys/stat.h>
 #include <unistd.h>
 
 /**
- * fexist - Check if a file exists and is a directory.
- * @file: File to look for, with full path.
+ * Check if a path exists and is a directory.
+ * @param path Path to file or directory
  *
- * Returns:
- * %TRUE(1) if the file exists and is a directory, otherwise %FALSE(0).
+ * @returns @c TRUE(1) if @p path exists and is a directory, otherwise @c FALSE(0).
  */
-int fisdir(const char *file)
+int fisdir(const char *path)
 {
 	struct stat sb;
 
-	if (!stat(file, &sb) && S_ISDIR(sb.st_mode))
+	if (!stat(path, &sb) && S_ISDIR(sb.st_mode))
 		return 1;
 
 	return 0;

src/fopenf.c

@@ -0,0 +1,70 @@
+/* Formatted fopen()
+ *
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file fopenf.c
+ * @author Joachim Wiberg
+ * @date 2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+/**
+ * Open a file based on the formatted string and optional arguments
+ * @param mode An fopen() mode string, e.g. "w+"
+ * @param fmt  Formatted string to be composed into a pathname
+ *
+ * This function is an extension to the fopen() family, lessening the burden
+ * of first having to compose the filename from parts in a seprate buffer.
+ *
+ * @returns Upon successful completion, fopenf() returns a FILE pointer.
+ * Otherwise, @c NULL is returned and @a errno is set to indicate the
+ * error.
+ */
+FILE *fopenf(const char *mode, const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return fopen(file, mode);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/fparseln.c

@@ -24,10 +24,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
+/**
+ * @file fparseln.c
+ * @author Christos Zoulas
+ * @date 1997
+ * @copyright 2-clause BSD License
+ */
 
 #include <assert.h>
 #include <errno.h>
@@ -68,10 +70,25 @@ isescaped(const char *sp, const char *p, int esc)
 }
 
 
-/* fparseln():
- *	Read a line from a file parsing continuations ending in \
- *	and eliminating trailing newlines, or comments starting with
- *	the comment char.
+/**
+ * Read a line from a file parsing continuations and trailing newlines
+ * @param fp     FILE pointer to read from
+ * @param size   The resulting length of the string, unused if @c NULL
+ * @param lineno Incremented with number of lines read, unused if @c NULL
+ * @param str    Characters to look for, escape character, continuation, and comment
+ * @param flags  ::FPARSELN_UNESCCOMM, ::FPARSELN_UNESCCONT, ::FPARSELN_UNESCESC, ::FPARSELN_UNESCREST, ::FPARSELN_UNESCALL
+ *
+ * This function reads a line from a file, parsing continuations ending
+ * in '\' and eliminating trailing newlines, or comments starting with
+ * the comment char '#'.
+ *
+ * If @a size is not @c NULL, the resulting length of the returned string
+ * is stored in @a size.
+ *
+ * If @a lineno is not @c NULL, it is incremented for each actual line
+ * read from @a fp.
+ *
+ * @returns the line read from @a fp, or @c NULL on EOF or error.
  */
 char *
 fparseln(FILE *fp, size_t *size, size_t *lineno, const char str[3], int flags)

src/fremove.c

@@ -0,0 +1,68 @@
+/* Formatted fremove()
+ *
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file fremove.c
+ * @author Joachim Wiberg
+ * @date 2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+/**
+ * Remove a file based on the formatted string and optional arguments
+ * @param fmt Formatted string to be composed into a pathname
+ *
+ * This function is an extension to remove(), lessening the burden of
+ * first having to compose the filename from parts in a seprate buffer.
+ *
+ * @returns same as remove(3), with an extra @a errno, @c ENOBUFS if
+ * alloca() fails to get a temporary buffer for composing the file name.
+ */
+int fremove(const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOBUFS;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return remove(file);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/fsendfile.c

@@ -21,25 +21,32 @@
  * THE SOFTWARE.
  */
 
+/**
+ * @file fsendfile.c
+ * @author Tobias Waldekranz
+ * @date 2013
+ * @copyright MIT License
+ */
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 
 /**
- * fsendfile - copy data between file streams
- * @src: Source stream
- * @dst: Destination stream
- * @len: Number of bytes to copy
+ * Copy data between file streams.
+ * @param src  Source stream
+ * @param dst  Destination stream
+ * @param len  Number of bytes to copy
  *
- * @dst may be %NULL, in which case @len bytes are read and discarded
- * from @src.  This can be useful for streams where seeking is not
- * permitted.  Additionally, @len may be the special value zero (0), in
- * which case fsendfile() will copy until %EOF is seen on @src.
+ * The @p dst argument may be @c NULL, in which case @a len bytes are
+ * read and discarded from @a src.  This can be useful for streams where
+ * seeking is not permitted.  Additionally, @a len may be the special
+ * value zero (0), in which case fsendfile() copies until @c EOF is seen
+ * on @a src.
  *
- * Returns:
- * The number of bytes copied.  If an error is detected -1 is returned
- * and @errno will be set accordingly.
+ * @returns The number of bytes copied.  If an error is detected -1 is
+ * returned and @a errno will be set accordingly.
  */
 ssize_t fsendfile(FILE *src, FILE *dst, size_t len)
 {
@@ -51,8 +58,8 @@ ssize_t fsendfile(FILE *src, FILE *dst, size_t len)
                 errno = EINVAL;
                 return -1;
         }
-                
-	buf = (char *)malloc(BUFSIZ);
+
+	buf = malloc(BUFSIZ);
 	if (!buf)
 		return -1;
 

src/ifconfig.c

@@ -1,7 +1,7 @@
 /* Fastinit (finit) ifconfig() implementation.
  *
- * Copyright (c) 2008 Claudio Matsuoka <http://helllabs.org/finit/>
- * Copyright (C) 2009-2014  Joachim Nilsson <joachim.nilsson@westermo.se>
+ * Copyright (c) 2008-2010  Claudio Matsuoka <http://helllabs.org/finit/>
+ * Copyright (C) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,14 @@
  * THE SOFTWARE.
  */
 
+/**
+ * @file ifconfig.c
+ * @author Claudio Matsuoka
+ * @author Joachim Wiberg
+ * @date 2008-2021
+ * @copyright MIT License
+ */
+
 #include <arpa/inet.h>
 #include <errno.h>
 #include <net/if.h>
@@ -34,16 +42,15 @@
 extern size_t strlcpy(char *dst, const char *src, size_t siz);
 
 /**
- * ifconfig - Basic ifconfig like operations on an interface
- * @ifname: Name of interface to operate on
- * @addr:   If @up then set this optional IPv4 address
- * @mask:   If @up and @addr, and @addr is not INADDR_ANY, then set netmask
- * @up:     Control %IFF_UP flag on interface
+ * Basic ifconfig like operations on an interface
+ * @param ifname  Name of interface to operate on
+ * @param addr    If @p up then set this optional IPv4 address
+ * @param mask    If @p up and @p addr, and @p addr is not @c INADDR_ANY, then set netmask
+ * @param up      Control @c IFF_UP flag on interface
  *
- * Returns:
- * POSIX OK(0) on success, or non-zero on error.
+ * @returns POSIX OK(0) on success, or non-zero on error.
  */
-int ifconfig(char *ifname, char *addr, char *mask, int up)
+int ifconfig(const char *ifname, const char *addr, const char *mask, int up)
 {
 	int sd, ret = -1;
 	struct ifreq ifr;

src/lfile.c

@@ -1,6 +1,6 @@
 /* Parse UNIX /etc configuration files like /etc/protocols and /etc/services
  *
- * Copyright (c) 2015-2016  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,27 +15,35 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file lfile.c
+ * @author Joachim Wiberg
+ * @date 2015-2021
+ * @copyright ISC License
+ */
+
 #include <errno.h>
 #include <stdio.h>		/* FILE */
 #include <stdlib.h>		/* atoi() */
 #include <string.h>		/* strlen(), strncmp(), strtok_r() */
 #include <sys/param.h>		/* MAX() */
 
+/** @private for internal use only */
 typedef struct lfile {
-	FILE *fp;
-	char buf[256];
-	char *sep, *save;
+	FILE *fp;		/**< FILE pointer to current stream */
+	char buf[256];		/**< Internal buffer, limted to 256 bytes per line */
+	char *save;		/**< Internal save pointer */
+	const char *sep;	/**< Record separator, from lfopen() */
 } lfile_t;
 
 /**
- * lfopen - Open file and return parsing context
- * @file: File to parse
- * @sep:  Separator(s) to use in lftok()
+ * Open file and return parsing context.
+ * @param file  File to parse
+ * @param sep   Separator(s) to use in lftok()
  *
- * Returns:
- * Pointer to a &lftile_t parser context, or %NULL on error.
+ * @returns Pointer to an @a lfile_t parser context, or @c NULL on error.
  */
-lfile_t *lfopen(char *file, char *sep)
+lfile_t *lfopen(const char *file, const char *sep)
 {
 	lfile_t *lf;
 
@@ -61,8 +69,8 @@ lfile_t *lfopen(char *file, char *sep)
 }
 
 /**
- * lfclose - Close a parser context
- * @lf: Pointer to &lfile_t context from lfopen()
+ * Close a parser context.
+ * @param lf: Pointer to @a lfile_t parser context from lfopen()
  */
 void lfclose(lfile_t *lf)
 {
@@ -75,12 +83,11 @@ void lfclose(lfile_t *lf)
 }
 
 /**
- * lftok - Get next token in file
- * @lf: Pointer to &lfile_t context from lfopen()
+ * Get next token in file
+ * @param lf: Pointer to @a lfile_t parser context from lfopen()
  *
- * Returns:
- * Next token, read from file previously opened with lfopen(),
- * or %NULL if EOF.
+ * @returns Next token, read from file previously opened with lfopen(),
+ * or @c NULL if EOF.
  */
 char *lftok(lfile_t *lf)
 {
@@ -92,40 +99,36 @@ char *lftok(lfile_t *lf)
 	}
 
 	token = strtok_r(NULL, lf->sep, &lf->save);
-	if (!token) {
-		while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
-			if (lf->buf[0] == '#')
-				continue;
+	if (token)
+		return token;
 
-			token = strtok_r(lf->buf, lf->sep, &lf->save);
-			if (!token)
-				continue;
-			
+	while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
+		if (lf->buf[0] == '#')
+			continue;
+
+		token = strtok_r(lf->buf, lf->sep, &lf->save);
+		if (token)
 			return token;
-		}
-
-		errno = ENOENT;
-		return NULL;
 	}
 
-	return token;
+	errno = ENOENT;
+	return NULL;
 }
 
 /**
- * lfgetkey - Find key in file
- * @lf:  Pointer to &lfile_t context from lfopen()
- * @key: Key to look for
+ * Find key in file
+ * @param lf   Pointer to @a lfile_t parser context from lfopen()
+ * @param key  Key to look for
  *
- * Locate @key from the current position in the file parser context
- * returned from lfopen().  Please note, the search for @key does not
+ * Locate @a key from the current position in the file parser context
+ * returned from lfopen().  Please note, the search for @a key does not
  * start from the beginning of the file, it searches from the current
  * position.  To restart search from the beginning use rewind() on the
  * lf->fp.
  *
- * Returns:
- * The value to @key, or %NULL if not found.
+ * @returns The value to @a key, or @c NULL if not found.
  */
-char *lfgetkey(lfile_t *lf, char *key)
+char *lfgetkey(lfile_t *lf, const char *key)
 {
 	char *token;
 
@@ -141,17 +144,16 @@ char *lfgetkey(lfile_t *lf, char *key)
 }
 
 /**
- * lfgetint - Same as lfgetkey() but returns an integer
- * @lf:  Pointer to &lfile_t context from lfopen()
- * @key: Key to look for
+ * Same as lfgetkey() but returns an integer.
+ * @param lf   Pointer to @a lfile_t parser context from lfopen()
+ * @param key  Key to look for
  *
  * This function is the same as lfgetkey() but returns the positive
- * integer value for the matching @key, if found.
+ * integer value for the matching @a key, if found.
  *
- * Returns:
- * The positive integer value for @key, or -1 if not found.
+ * @returns The positive integer value for @a key, or -1 if not found.
  */
-int lfgetint(lfile_t *lf, char *key)
+int lfgetint(lfile_t *lf, const char *key)
 {
 	char *token = lfgetkey(lf, key);
 
@@ -162,18 +164,17 @@ int lfgetint(lfile_t *lf, char *key)
 }
 
 /**
- * fgetint - Find the integer value for key in a file
- * @file: File to search for @key
- * @sep:  Separator for tokens in @file
- * @key:  Key to look for in @file
+ * Find the integer value for key in a file.
+ * @param file  File to search for @a key
+ * @param sep   Separator for tokens in @a file
+ * @param key   Key to look for in @a file
  *
  * This is a convenience wrapper for lfopen(), lfgetint(), and
  * lfclose().
  *
- * Returns:
- * The positive integer value for @key, or -1 if not found.
+ * @returns The positive integer value for @a key, or -1 if not found.
  */
-int fgetint(char *file, char *sep, char *key)
+int fgetint(const char *file, const char *sep, const char *key)
 {
 	int val = -1;
 	lfile_t *lf;

src/libite.pc.in

@@ -8,5 +8,4 @@ Description: Frog DNA, basically
 Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lite
-Cflags: -I${includedir}
-
+Cflags: -I${includedir} -D_LIBITE_LITE

src/lite.h

@@ -0,0 +1,260 @@
+/* Collection of frog DNA
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Collection of frog DNA
+ * @file lite.h
+ * @author Claudio Matsuoka (2008-2010)
+ * @author Joachim Wiberg (2008-2021)
+ * @copyright MIT License
+ *
+ * The latest version of this manual and the libite (-lite) software
+ * library are available at https://github.com/troglobit/libite/
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef LIBITE_LITE_H_
+#define LIBITE_LITE_H_
+
+#include <errno.h>
+#include <fcntl.h>     /* Definition of AT_* constants for utimensat() */
+#include <stdio.h>
+#include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/param.h> /* MAX(), isset(), setbit(), TRUE, FALSE, et consortes. :-) */
+#include <unistd.h>
+#include "strlite.h"
+
+/*
+ * fparseln() specific operation flags.
+ */
+#define FPARSELN_UNESCESC	0x01	/**< Remove escape preceding an escaped comment. */
+#define FPARSELN_UNESCCONT	0x02	/**< Remove escape preceding an escaped continuation. */
+#define FPARSELN_UNESCCOMM	0x04	/**< Remove escape preceding an escaped escape. */
+#define FPARSELN_UNESCREST	0x08	/**< Remove escape preceding any other character. */
+#define FPARSELN_UNESCALL	0x0f	/**< All of the above. */
+
+/*
+ * copyfile() and rsync() option flags
+ */
+#define LITE_FOPT_RSYNC_DELETE  0x01	/**< Prune files from destination that are not in source */
+#define LITE_FOPT_COPYFILE_SYM  0x01	/**< Recreate symlink or follow to copy target */
+#define LITE_FOPT_KEEP_MTIME    0x02	/**< Preserve modification time */
+
+typedef struct lfile lfile_t;		/**< Opqaue context struct for lfile APIs */
+typedef struct sdbuf sdbuf_t;		/**< Opqaue context struct for telnet APIs */
+
+char   *chomp      (char *str);
+
+int     erasef     (const char *fmt, ...);
+	
+char   *fparseln   (FILE *, size_t *, size_t *, const char[3], int);
+
+int     fexist     (const char *file);
+int     fisdir     (const char *path);
+
+FILE   *fopenf     (const char *mode, const char *fmt, ...);
+int     fremove    (const char *fmt, ...);
+FILE   *tempfile   (void);
+ssize_t copyfile   (const char *src, const char *dst, int len, int opt);
+int     movefile   (const char *src, const char *dst);
+int     fcopyfile  (FILE *src, FILE *dst);
+ssize_t fsendfile  (FILE *src, FILE *dst, size_t len);
+int     truncatef  (off_t length, const char *fmt, ...);
+
+int     ifconfig   (const char *ifname, const char *addr, const char *mask, int up);
+
+lfile_t*lfopen     (const char *file, const char *sep);
+void    lfclose    (lfile_t *lf);
+char   *lftok      (lfile_t *lf);
+char   *lfgetkey   (lfile_t *lf, const char *key);
+int     lfgetint   (lfile_t *lf, const char *key);
+int     fgetint    (const char *file, const char *sep, const char *key);
+
+int     fmkpath    (mode_t mode, const char *fmt, ...);
+int     mkpath     (const char *dir, mode_t mode);
+int     makepath   (const char *dir);
+
+int     dir        (const char *dir, const char *type, int (*filter) (const char *file), char ***list, int strip);
+int     rsync      (char *src, char *dst, int opt,  int (*filter) (const char *file));
+
+int     pidfile       (const char *basename);
+int     pidfile_signal(const char *pidfile, int signal);
+pid_t   pidfile_read  (const char *pidfile);
+pid_t   pidfile_poll  (const char *pidfile);
+
+void   *reallocarray(void *optr, size_t nmemb, size_t size);
+
+void    progress       (int percent, int max_width);
+void    progress_simple(int percent);
+
+int     systemf        (const char *fmt, ...);
+
+sdbuf_t*telnet_open    (int addr, short port);
+int     telnet_close   (sdbuf_t *ctx);
+int     telnet_expect  (sdbuf_t *ctx, char *script[], FILE *output);
+int     telnet_session (int addr, short port, char *script[], FILE *output);
+
+int     touchf         (const char *fmt, ...);
+
+int     yorn       (const char *fmt, ...);
+
+char   *which      (const char *cmd);
+int     whichp     (const char *cmd);
+
+#ifndef touch
+#include <sys/stat.h>		/* utimensat() */
+#include <sys/time.h>		/* utimensat() on *BSD */
+/**
+ * Create a file, ignoring errors for already existing files
+ * @param path  Path to file to create.
+ *
+ * @returns POSIX OK(0), or non-zero on error.
+ */
+static inline int touch(const char *path)
+{
+	if (utimensat(AT_FDCWD, path, NULL, 0)) {
+		if (errno == ENOENT)
+			return mknod((path), S_IFREG|0644, 0);
+		return -1;
+	}
+	return 0;
+}
+#endif
+#ifndef makedir
+/**
+ * Create a directory, ignoring errors for already existing files
+ * @param path  Path to directory to create.
+ *
+ * @returns POSIX OK(0), or non-zero on error.
+ */
+static inline int makedir(const char *path, mode_t mode)
+{
+	if (mkdir(path, mode) && errno != EEXIST)
+		return -1;
+	return 0;
+}
+#endif
+#ifndef makefifo
+/**
+ * Create a FIFO, ignoring errors for already existing files
+ * @param path  Path to FIFO to create.
+ *
+ * @returns POSIX OK(0), or non-zero on error.
+ */
+static inline int makefifo(const char *path, mode_t mode)
+{
+	if (mkfifo(path, mode) && errno != EEXIST)
+		return -1;
+	return 0;
+}
+#endif
+#ifndef erase
+/**
+ * Remove a file, ignoring errors for missing files
+ * @param path  Path to file to remove.
+ *
+ * @returns POSIX OK(0), or non-zero on error.
+ */
+static inline int erase(const char *path)
+{
+	if (remove(path) && errno != ENOENT)
+		return -1;
+	return 0;
+}
+#endif
+
+#ifndef chardev
+# define chardev(x,m,maj,min) mknod((x), S_IFCHR|(m), makedev((maj),(min)))
+#endif
+#ifndef blkdev
+# define blkdev(x,m,maj,min) mknod((x), S_IFBLK|(m), makedev((maj),(min)))
+#endif
+
+#ifndef S_ISEXEC
+# define S_ISEXEC(m) (((m) & S_IXUSR) == S_IXUSR)
+#endif
+
+/* Unline isset(), setbit() et al, these work with integers/shorts/longwords/etc. */
+#ifndef ISCLR
+#define ISCLR(word,bit)   ((word &   (1 << (bit)) ? 0 : 1)) /**< Is bit cleared in word? */
+#endif
+#ifndef ISSET
+#define ISSET(word,bit)   ((word &   (1 << (bit)) ? 1 : 0)) /**< Is bit set in word? */
+#endif
+#ifndef ISOTHER
+#define ISOTHER(word,bit) ((word &  ~(1 << (bit)) ? 1 : 0)) /**< Is any other bit set? */
+#endif
+#ifndef SETBIT
+#define SETBIT(word,bit)   (word |=  (1 << (bit)))          /**< Set bit in word. */
+#endif
+#ifndef CLRBIT
+#define CLRBIT(word,bit)   (word &= ~(1 << (bit)))          /**< Clear bit in word. */
+#endif
+
+/* From The Practice of Programming, by Kernighan and Pike */
+#ifndef NELEMS
+#define NELEMS(array) (sizeof(array) / sizeof(array[0]))    /**< Number of elements in array. */
+#endif
+
+/**
+ * Does directory end with a slash?
+ * @param dir  Path string to check.
+ *
+ * @returns @c TRUE(1) or @c FALSE(0)
+ */
+static inline int fisslashdir(const char *dir)
+{
+   if (!dir)
+	   return 0;
+
+   if (strlen(dir) > 0)
+	   return dir[strlen(dir) - 1] == '/';
+
+   return 0;
+}
+
+/* Compat */
+#define copy_filep(src, dst)        fcopyfile(src, dst)
+#define pidfile_read_pid(file)      pidfile_read(file)
+#define signal_pidfile(file, signo) pidfile_signal(file, signo)
+
+#endif /* LIBITE_LITE_H_ */
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
+

src/makepath.c

@@ -0,0 +1,115 @@
+/* mkpath() -- Create all components leading up to a given directory
+ *
+ * Copyright (c) 2013-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file makepath.c
+ * @author Joachim Wiberg
+ * @date 2013-2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <libgen.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include "lite.h"
+
+/**
+ * makepath() but takes a mode_t argument.
+ * @param dir   Directory to created, relative or absolute
+ * @param mode  A &mode_t mode to create @a dir with
+ *
+ * @returns POSIX OK(0) on success, otherwise -1 with @a errno set.
+ */
+int mkpath(const char *dir, mode_t mode)
+{
+	struct stat sb;
+
+	if (!dir) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (!stat(dir, &sb))
+		return 0;
+
+	mkpath(dirname(strdupa(dir)), mode);
+
+	return mkdir(dir, mode);
+}
+
+/**
+ * Formatted version of mkpath().
+ * @param mode  A mode_t mode to create directories with
+ * @param fmt   Formatted string to be composed into a pathname
+ *
+ * @note Notice the swapped arguments, compared to mkpath()!
+ *
+ * @returns POSIX OK(0) on success, otherwise -1 with @a errno set.
+ */
+int fmkpath(mode_t mode, const char *fmt, ...)
+{
+	va_list ap;
+	char *path;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	path = alloca(len + 1);
+	if (!path) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	len = vsnprintf(path, len + 1, fmt, ap);
+	va_end(ap);
+
+	return mkpath(path, mode);
+}
+
+/**
+ * Create all components of the specified directory.
+ * @param dir  Directory to create.
+ *
+ * @note It is strongly recommended to use mkpath() over this function
+ * since it has the @a mode argument while this function default to
+ * 0777, which in most cases is insecure.
+ *
+ * @returns POSIX OK (0) on success, otherwise -1 and @a errno set
+ * appropriately.
+ * 
+ * @exception EINVAL on bad argument, or
+ * @exception ENOMEM when it fails allocating temporary memory.
+ *
+ * For other error codes see the mkdir(2) syscall description.
+ */
+int makepath(const char *dir)
+{
+	return mkpath(dir, 0777);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/pidfile.c

@@ -1,4 +1,4 @@
-/*	Updated by troglobit for libite/finit/uftpd projects 2016/03/19 */
+/*	Updated by troglobit for libite/finit/uftpd projects 2016/07/04 */
 /*	$OpenBSD: pidfile.c,v 1.11 2015/06/03 02:24:36 millert Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
@@ -31,6 +31,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @file pidfile.c
+ * @author NetBSD Foundation Inc.
+ * @date 1999
+ * @copyright 2-clause BSD License
+ */
+
 #include <sys/stat.h>		/* utimensat() */
 #include <sys/time.h>		/* utimensat() on *BSD */
 #include <sys/types.h>
@@ -42,7 +49,7 @@
 
 #ifndef pidfile
 static char *pidfile_path = NULL;
-static pid_t pidfile_pid;
+static pid_t pidfile_pid  = 0;
 
 static void pidfile_cleanup(void);
 
@@ -50,8 +57,18 @@ const  char *__pidfile_path = _PATH_VARRUN; /* Note: includes trailing slash '/'
 const  char *__pidfile_name = NULL;
 extern char *__progname;
 
-int
-pidfile(const char *basename)
+/**
+ * Create or update mtime of process PID file.
+ * @param basename  Program name, or @c NULL, may start with '/'
+ *
+ * This function is intended to be used by UNIX daemons to save the PID of the main process
+ * responsible for handling signals.  If @p basename is @c NULL the implicit @a __progname
+ * variable from the C-library is used.  The @p basename may also start with '/', in which
+ * case it is interpreted as the absolute path to the PID file.
+ *
+ * @returns POSIX OK(0) on success, otherwise non-zero on error.
+ */
+int pidfile(const char *basename)
 {
 	int save_errno;
 	int atexit_already;
@@ -65,7 +82,7 @@ pidfile(const char *basename)
 	atexit_already = 0;
 
 	if (pidfile_path != NULL) {
-		if (pid == pidfile_pid) {
+		if (!access(pidfile_path, R_OK) && pid == pidfile_pid) {
 			utimensat(0, pidfile_path, NULL, 0);
 			return (0);
 		}
@@ -75,8 +92,13 @@ pidfile(const char *basename)
 		atexit_already = 1;
 	}
 
-	if (asprintf(&pidfile_path, "%s%s.pid", __pidfile_path, basename) == -1)
-		return (-1);
+	if (basename[0] != '/') {
+		if (asprintf(&pidfile_path, "%s%s.pid", __pidfile_path, basename) == -1)
+			return (-1);
+	} else {
+		if (asprintf(&pidfile_path, "%s", basename) == -1)
+			return (-1);
+	}
 
 	if ((f = fopen(pidfile_path, "w")) == NULL) {
 		save_errno = errno;
@@ -96,6 +118,7 @@ pidfile(const char *basename)
 		return (-1);
 	}
 	(void) fclose(f);
+	__pidfile_name = pidfile_path;
 
 	/*
 	 * LITE extension, no need to set up another atexit() handler
@@ -114,7 +137,6 @@ pidfile(const char *basename)
 		errno = save_errno;
 		return (-1);
 	}
-	__pidfile_name = pidfile_path;
 
 	return (0);
 }
@@ -122,8 +144,10 @@ pidfile(const char *basename)
 static void
 pidfile_cleanup(void)
 {
-
-	if (pidfile_path != NULL && pidfile_pid == getpid())
+	if (pidfile_path != NULL && pidfile_pid == getpid()) {
 		(void) unlink(pidfile_path);
+		free(pidfile_path);
+		pidfile_path = NULL;
+	}
 }
 #endif

src/pidfilefn.c

@@ -1,6 +1,6 @@
 /* Functions for dealing with PID files (client side)
  *
- * Copyright (c) 2009-2015  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,6 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file pidfilefn.c
+ * @author Joachim Wiberg
+ * @date 2009-2021
+ * @copyright ISC License
+ */
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,16 +31,20 @@
 extern char *chomp(char *str);
 
 /**
- * pidfile_read - Reads a PID value from a pidfile.
- * @pidfile: File containing PID, usually in /var/run/<PROC>.pid
+ * Reads a PID value from a pidfile.
+ * @param pidfile  File containing PID, usually in @c /var/run/PROCNAME.pid
  *
- * This function takes a @pidfile and returns the PID found therein.
+ * This function takes a @p pidfile and returns the PID found therein.
  *
- * Returns:
- * On invalid @pidfile -1 and errno set to %EINVAL, when @pidfile does not exist -1
- * and errno set to %ENOENT.  When the pidfile is empty or when its contents cannot
- * be translated this function returns zero (0), on success this function returns
- * a PID value greater than one. PID 1 is reserved for the system init process.
+ * @returns On invalid @p pidfile, -1 with @a errno set. If the @p
+ * pidfile is empty, or when its contents cannot be translated, this
+ * function returns zero (0), on success this function returns a PID
+ * value greater than one.
+ *
+ * @note PID 1 is reserved for the system init  process.
+ *
+ * @exception EINVAL on invalid @p pidfile, or
+ * @exception ENOENT when @p pidfile does not exist.
  */
 pid_t pidfile_read(const char *pidfile)
 {
@@ -66,15 +77,14 @@ pid_t pidfile_read(const char *pidfile)
 }
 
 /**
- * pidfile_poll - Poll for the existence of a pidfile and return PID
- * @pidfile: Path to pidfile to poll for
+ * Poll for the existence of a pidfile and return PID.
+ * @param pidfile  Path to pidfile to poll for
  *
- * This function polls for the pidfile at @pidfile for at most 5 seconds
- * before timing out. If the file is created within that time span the
- * file is read and its PID contents returned.
+ * This function polls for the pidfile at @p pidfile for at most 5
+ * seconds before timing out. If the file is created within that time
+ * span the file is read and its PID contents returned.
  *
- * Returns:
- * The PID read from @pidfile, or zero on timeout.
+ * @returns The PID read from @p pidfile, or zero on timeout.
  */
 pid_t pidfile_poll(const char *pidfile)
 {
@@ -92,15 +102,14 @@ pid_t pidfile_poll(const char *pidfile)
 }
 
 /**
- * pidfile_signal - Send signal to a PID and cleanup pidfile afterwards
- * @pidfile: File containing PID, usually in /var/run/<PROC>.pid
- * @signal: Signal to send to PID found in @pidfile.
+ * Send signal to a PID and cleanup pidfile afterwards.
+ * @param pidfile  File containing PID, usually in @c /var/run/PROCNAME.pid
+ * @param signal  Signal to send to PID found in @p pidfile.
  *
- * If @signal is any of %SIGTERM, %SIGKILL, or if kill() returns -1 the
- * @pidfile is removed.
+ * If @p signal is any of @c SIGTERM or @c SIGKILL, or if kill(2)
+ * returns -1, the @p pidfile is removed.
  *
- * Returns:
- * POSIX OK(0) on success, non-zero otherwise.
+ * @returns POSIX OK(0) on success, non-zero otherwise.
  */
 int pidfile_signal(const char *pidfile, int signal)
 {
@@ -111,10 +120,10 @@ int pidfile_signal(const char *pidfile, int signal)
 		return 1;
 
 	ret = kill(pid, signal);
-	if ((ret == -1) || (signal == SIGTERM) || (signal == SIGKILL))
-		(void)remove(pidfile);
+	if (!ret && signal == SIGKILL)
+		ret = remove(pidfile);
 
-	return 0;
+	return ret;
 }
 
 /**

src/progress.c

@@ -1,6 +1,6 @@
 /* Simple termios based progress bar
  *
- * Copyright (c) 2012-2015  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,6 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file progress.c
+ * @author Joachim Wiberg
+ * @date 2012-2021
+ * @copyright ISC License
+ */
+
 #include <limits.h>		/* INT_MAX */
 #include <stdio.h>
 #include <string.h>
@@ -40,21 +47,21 @@ static char spinner(char *style)
 }
 
 /**
- * progress - Advanced ASCII progress bar with spinner
- * @percent: Start first call with this set to 0, end with 100
- * @max_width: Max width of progress bar, in total characters.
+ * Advanced ASCII progress bar with spinner
+ * @param percent    Start first call with this set to 0, end with 100
+ * @param max_width  Max width of progress bar, in total characters.
  *
  * This function draws an advanced ASCII progressbar at the current
  * line.  It always start from the first column.
  *
- * The progress bar will hide the cursor if started with @percent 0 and
- * show it again at the end, when called with @percent 100.
+ * The progress bar will hide the cursor if started with @p percent 0
+ * and show it again at the end, when called with @p percent 100.
  *
  * While being called with the same percentage the spinner will spin,
  * to show the user the process hasn't frozen.
  *
- * If the output TTY cannot interpret control characters, like \r, it is
- * advised to instead used the progress_simple() function.
+ * If the output TTY cannot interpret control characters, like `\r`, it
+ * is advised to instead used the progress_simple() function.
  */
 void progress(int percent, int max_width)
 {
@@ -85,6 +92,10 @@ void progress(int percent, int max_width)
 	}
 }
 
+/**
+ * Alternative progress bar on systems where progress() doesn't work
+ * @param percent  Start first call with this set to 0, end with 100
+ */
 void progress_simple(int percent)
 {
 	static int last = 1;

src/queue.h

@@ -32,10 +32,20 @@
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef	_SYS_QUEUE_H_
 #define	_SYS_QUEUE_H_
 
-/*
+/**
+ * @file queue.h
+ * @author The Regents of the University of California
+ * @date 1991, 1993
+ * @copyright 3-clause BSD License
+ *
  * This file defines five types of data structures: singly-linked lists,
  * lists, simple queues, tail queues and XOR simple queues.
  *
@@ -531,3 +541,7 @@ struct {								\
 } while (0)
 
 #endif	/* !_SYS_QUEUE_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/reallocarray.c

@@ -15,6 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file reallocarray.c
+ * @author Otto Moerbeek
+ * @date 2008
+ * @copyright ISC License
+ */
+
 #include <sys/types.h>
 #include <errno.h>
 #include <stdint.h>
@@ -26,8 +33,15 @@
  */
 #define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
 
-void *
-reallocarray(void *optr, size_t nmemb, size_t size)
+/**
+ * Similar to realloc() but for an array of items, like calloc()
+ * @param optr   Pointer to old (current) array
+ * @param nmemb  Number of elements
+ * @param size   Size of each element, in bytes
+ *
+ * @returns A pointer to the new array, or @c NULL on error.
+ */
+void *reallocarray(void *optr, size_t nmemb, size_t size)
 {
 	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
 	    nmemb > 0 && SIZE_MAX / nmemb < size) {

src/rsync.c

@@ -1,6 +1,6 @@
 /* Micro "rsync" implementation.
  *
- * Copyright (c) 2011, 2012  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2011-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file rsync.c
+ * @author Joachim Wiberg
+ * @date 2011-2021
+ * @copyright ISC License
+ */
+
 #include <errno.h>
+#include <fcntl.h>	/* AT_* macros */
 #include <stdlib.h>	/* NULL, free() */
 #include <string.h>	/* strlen() */
 #include <strings.h>	/* rindex() */
@@ -26,37 +34,48 @@
 
 #include "lite.h"
 
-static int copy(char *src, char *dst);
-static int mdir(char *buf, size_t buf_len, char *dir, char *name, mode_t mode);
+static int copy(char *src, char *dst, int opt);
+static int mdir(char *buf, size_t buf_len, char *dir, char *name, struct stat *st);
 static int prune(char *dst, char **new_files, int new_num);
+static int set_mtime(char *fn, struct stat *st);
 
 
 /**
- * rsync - Synchronize contents and optionally remove non-existing backups
- * @src: Source directory
- * @dst: Destination directory
- * @delete: Prune files from @dst that no longer exist in @src.
- * @filter: Optional filtering function for source directory.
+ * Synchronize contents and optionally remove non-existing backups
+ * @param src     Source directory
+ * @param dst     Destination directory
+ * @param opt     An option mask of ::LITE_FOPT_RSYNC_DELETE, ::LITE_FOPT_KEEP_MTIME
+ * @param filter  Optional filtering function for source directory.
  *
- * This is a miniature implementation of the famous rsync for local use only.
- * In fact, it is not even a true rsync since it copies all files from @src
- * to @dst.  The @delete option is useful for creating backups, when set all
- * files removed from src since last backup are pruned from the destination
- * (backup) directory.
+ * This is a miniature implementation of the famous rsync for local use
+ * only.  In fact, it is not even a true rsync since it copies all files
+ * from @p src to @p dst.  The ::LITE_FOPT_RSYNC_DELETE @p opt flag is
+ * useful for creating backups, when set all files removed from src
+ * since last backup are pruned from the destination (backup) directory.
  *
- * The filter callback, @filter, if provided, is used to determine what files to
- * include from the source directory when backing up.  If a file is to be skipped
- * the callback should simply return zero.
+ * The @p opt parameter to rsync() is an option mask for the most common
+ * rsync(1) options.  Previously this argument was called @p delete and
+ * to maintain backwards compatibility the value 1 is reserved:
+ *
+ * %LITE_FOPT_RSYNC_DELETE: Prune files from @p dst that no longer exist in @p src.
+ * %LITE_FOPT_KEEP_MTIME:   Preserve modification time
+ *
+ * The filter callback, @p filter, if provided, is used to determine
+ * what files to include from the source directory when backing up.  If
+ * a file is to be skipped the callback should simply return zero.
  *
  * Returns:
- * POSIX OK(0), or non-zero with @errno set on error.
+ * POSIX OK(0), or non-zero with @a errno set on error.
  */
-int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
+int rsync(char *src, char *dst, int opt, int (*filter)(const char *file))
 {
 	char source[256];
 	char dest[256];
-	int i = 0, num = 0, result = 0;
+	int delete = (opt & LITE_FOPT_RSYNC_DELETE) != 0;
+	int keep_mtim = (opt & LITE_FOPT_KEEP_MTIME);
+	int i = 0, num = 0, result = 0, do_mtim = 0;
 	char **files;		/* Array of file names. */
+	struct stat st;
 
 	if (!fisdir(dst))
 		makedir(dst, 0755);
@@ -65,7 +84,7 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 		if (!fexist(src))
 			return 1;
 
-		if (copy(src, dst))
+		if (copy(src, dst, keep_mtim))
 			result++;
 
 		return errno;
@@ -80,9 +99,13 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 		else
 			ptr++;
 
-		if (mdir(dest, sizeof(dest), dst, ptr, fmode(src)))
+		if (stat(src, &st))
+			return 1;
+
+		if (mdir(dest, sizeof(dest), dst, ptr, &st))
 			return 1;
 		dst = dest;
+		do_mtim = keep_mtim;
 	}
 
 	num = dir(src, "", filter, &files, 0);
@@ -91,21 +114,33 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 		snprintf(source, sizeof(source), "%s%s%s", src, fisslashdir(src) ? "" : "/", files[i]);
 		if (fisdir(source)) {
 			char dst2[256];
+			struct stat sb;
 
 			strcat(source, "/");
-			if (mdir (dst2, sizeof(dst2), dst, files[i], fmode(source))) {
+			if (stat(source, &sb)) {
 				result++;
 				continue;
 			}
 
-			rsync(source, dst2, delete, filter);
+			if (mdir(dst2, sizeof(dst2), dst, files[i], &sb)) {
+				result++;
+				continue;
+			}
+
+			rsync(source, dst2, opt, filter);
+			if (keep_mtim)
+				set_mtime(dst2, &sb);
+
 			continue;	/* Next file/dir in @src to copy... */
 		}
 
-		if (copy(source, dst))
+		if (copy(source, dst, keep_mtim))
 			result++;
 	}
 
+	if (do_mtim)
+		set_mtime(dest, &st);
+
 	/* We ignore any errors from the pruning, that phase albeit useful is only
 	 * cosmetic. --Jocke 2011-03-24 */
 	if (delete)
@@ -120,11 +155,9 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 	return result;
 }
 
-static int copy(char *src, char *dst)
+static int copy(char *src, char *dst, int opt)
 {
-	errno = 0;
-
-	copyfile(src, dst, 0, 1);
+	copyfile(src, dst, 0, opt | LITE_FOPT_COPYFILE_SYM);
 	if (errno) {
 		if (errno != EEXIST)
 			return 1;
@@ -136,10 +169,10 @@ static int copy(char *src, char *dst)
 }
 
 /* Creates dir/name @mode ... skipping / if dir already ends so. */
-static int mdir(char *buf, size_t buf_len, char *dir, char *name, mode_t mode)
+static int mdir(char *buf, size_t buf_len, char *dir, char *name, struct stat *st)
 {
-	snprintf(buf, buf_len, "%s%s%s/", dir, fisslashdir(dir) ? "" : "/", name);
-	if (mkdir(buf, mode)) {
+	snprintf(buf, buf_len, "%s%s%s", dir, fisslashdir(dir) ? "" : "/", name);
+	if (mkdir(buf, st->st_mode)) {
 		if (EEXIST != errno)
 			return 1;
 
@@ -193,6 +226,16 @@ static int prune(char *dst, char **new_files, int new_num)
 	return result;
 }
 
+static int set_mtime(char *fn, struct stat *st)
+{
+	struct timespec tv[2];
+
+	tv[0] = st->st_atim;
+	tv[1] = st->st_mtim;
+
+	return utimensat(AT_FDCWD, fn, tv, AT_SYMLINK_NOFOLLOW);
+}
+
 /**
  * Local Variables:
  *  indent-tabs-mode: t

src/strdupa.h

@@ -23,8 +23,21 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  * ==========================================================================
  */
-#ifndef LITE_STRDUPA_H
-#define LITE_STRDUPA_H
+
+/**
+ * @file strdupa.h
+ * @author William Ahern
+ * @date 2009
+ * @copyright MIT License
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef LIBITE_STRDUPA_H
+#define LIBITE_STRDUPA_H
 
 #if !defined(HAVE_STRDUPA)
 #if defined(strdupa)
@@ -37,6 +50,11 @@
 #include <stddef.h>	/* size_t */
 #include <string.h>	/* memcpy(3) strlen(3) */
 
+/**
+ * Duplicate string on stack.
+ * @param src string to duplicate
+ * @returns the result of memcpy(3)
+ */
 #define strdupa(src) (__extension__ ({			\
 	size_t len_	= strlen(src);			\
 	char *dst_	= __builtin_alloca(len_ + 1);	\
@@ -49,4 +67,8 @@
 #endif /* __GNUC__ */
 #endif /* !HAVE_STRDUPA */
 
-#endif /* LITE_STRDUPA_H */
+#endif /* LIBITE_STRDUPA_H */
+
+#ifdef __cplusplus
+}
+#endif

src/strlcat.c

@@ -16,16 +16,30 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file strlcat.c
+ * @author Todd C. Miller
+ * @date 1998, 2015
+ * @copyright ISC License
+ */
+
 #include <sys/types.h>
 #include <string.h>
 
 #ifndef strlcat
-/*
- * Appends src to string dst of size dsize (unlike strncat, dsize is the
- * full size of dst, not space left).  At most dsize-1 characters
- * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
- * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
- * If retval >= dsize, truncation occurred.
+/**
+ * Safe version of strncat() from OpenBSD
+ * @param dst   Destination string
+ * @param src   Source string
+ * @param dsize Total maximum size of @p dst
+ *
+ * Appends @p src to string @p dst of size @p dsize (unlike strncat(),
+ * @p dsize is the full size of @p dst, not space left).  At most
+ * dsize-1 characters will be copied.  Always NUL terminates (unless
+ * dsize <= strlen(dst)).
+ *
+ * @returns strlen(src) + MIN(dsize, strlen(initial dst)).  
+ *          If retval >= dsize, truncation occurred.
  */
 size_t
 strlcat(char *dst, const char *src, size_t dsize)

src/strlcpy.c

@@ -16,14 +16,29 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file strlcpy.c
+ * @author Todd C. Miller
+ * @date 1998, 2015
+ * @copyright ISC License
+ */
+
+
 #include <sys/types.h>
 #include <string.h>
 
 #ifndef strlcpy
-/*
- * Copy string src to buffer dst of size dsize.  At most dsize-1
- * chars will be copied.  Always NUL terminates (unless dsize == 0).
- * Returns strlen(src); if retval >= dsize, truncation occurred.
+/**
+ * Safe version of strncpy() from OpenBSD
+ * @param dst   Destination string
+ * @param src   Source string
+ * @param dsize Total maximum size of @p dst
+ *
+ * This function copies string @p src to buffer @p dst of size @p dsize
+ * bytes.  At most dsize-1 chars will be copied.  Always NUL terminates
+ * (unless dsize==0).
+ *
+ * @returns strlen(src); if retval >= dsize, truncation occurred.
  */
 size_t
 strlcpy(char *dst, const char *src, size_t dsize)

src/strlite.h

@@ -1,6 +1,6 @@
 /* Collection of frog DNA
  *
- * Copyright (c) 2008-2016  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,14 +21,51 @@
  * THE SOFTWARE.
  */
 
-#ifndef LITE_STRING_H_
-#define LITE_STRING_H_
+/**
+ * @file strlite.h
+ * @author Joachim Wiberg
+ * @date 2008-2021
+ * @copyright MIT License
+ */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef LIBITE_STRING_H_
+#define LIBITE_STRING_H_
+
+#include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
 #include <string.h>
+#include <sys/param.h> /* MAX(), isset(), setbit(), TRUE, FALSE, et consortes. :-) */
+
 #include "strdupa.h"
 #include "strndupa.h"
 #include "strnlen.h"
 
+#ifndef min
+/** Geneirc min() macro, if a < b => a, else b */
+#define min(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a < _b ? _a : _b;		\
+	})
+#endif
+#ifndef max
+/** Geneirc max() macro, if a > b => a, else b */
+#define max(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a > _b ? _a : _b;		\
+	})
+#endif
+
+int     strnmatch  (const char *str, const char **list, size_t num);
+int     strmatch   (const char *str, const char **list);
+
 #ifndef strlcpy
 size_t  strlcpy    (char *dst, const char *src, size_t siz);
 #endif
@@ -39,7 +76,13 @@ size_t  strlcat    (char *dst, const char *src, size_t siz);
 long long strtonum (const char *numstr, long long minval, long long maxval, const char **errstrp);
 #endif
 
-/* Convert string to natural number (0-2147483647), returns -1 on error. */
+char   *strtrim    (char *str);
+
+/**
+ * Convert string to natural number (0-2147483647)
+ * @param str string to convert to number.
+ * @returns -1 on error.
+ */
 static inline int atonum(const char *str)
 {
 	int val = -1;
@@ -54,13 +97,22 @@ static inline int atonum(const char *str)
 	return val;
 }
 
-/* Validate string, non NULL and not zero length */
-static inline int string_valid(const char *s)
+/**
+ * Validate string, non NULL and not zero length
+ * @param str string to validate
+ * @returns @c TRUE(1) or @c FALSE(0).
+ */
+static inline int string_valid(const char *str)
 {
-   return s && strlen(s);
+   return str && strlen(str);
 }
 
-/* Relaxed comparison, e.g., sys_string_match("small", "smaller") => TRUE */
+/**
+ * Relaxed comparison, e.g., sys_string_match("small", "smaller") => TRUE
+ * @param a first string
+ * @param b second string
+ * @returns @c TRUE(1) or @c FALSE(0).
+ */
 static inline int string_match(const char *a, const char *b)
 {
    size_t min = MIN(strlen(a), strlen(b));
@@ -68,33 +120,31 @@ static inline int string_match(const char *a, const char *b)
    return !strncasecmp(a, b, min);
 }
 
-/* Strict comparison, e.g., sys_string_match("small", "smaller") => FALSE */
+/**
+ * Strict comparison, e.g., sys_string_match("small", "smaller") => FALSE
+ * @param a first string
+ * @param b second string
+ * @returns @c TRUE(1) or @c FALSE(0).
+ */
 static inline int string_compare(const char *a, const char *b)
 {
    return strlen(a) == strlen(b) && !strcmp(a, b);
 }
 
-/* Strict comparison, like sys_string_compare(), but case insensitive,
+/**
+ * Strict comparison, like sys_string_compare(), but case insensitive,
  * e.g., sys_string_match("small", "SmAlL") => TRUE
+ * @param a first string
+ * @param b second string
+ * @returns @c TRUE(1) or @c FALSE(0).
  */
 static inline int string_case_compare(const char *a, const char *b)
 {
-   return strlen (a) == strlen (b) && !strcasecmp (a, b);
+   return strlen(a) == strlen(b) && !strcasecmp(a, b);
 }
 
-#define min(a,b)				\
-	({					\
-		__typeof__ (a) _a = (a);	\
-		__typeof__ (b) _b = (b);	\
-		_a < _b ? _a : _b;		\
-	})
+#endif /* LIBITE_STRING_H_ */
 
-#define max(a,b)				\
-	({					\
-		__typeof__ (a) _a = (a);	\
-		__typeof__ (b) _b = (b);	\
-		_a > _b ? _a : _b;		\
-	})
-
-
-#endif /* LITE_STRING_H_ */
+#ifdef __cplusplus
+}
+#endif

src/strmatch.c

@@ -0,0 +1,94 @@
+/* Simple string matcher function, finds partial matches.
+ *
+ * Copyright (c) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file strmatch.c
+ * @author Joachim Wiberg
+ * @date 2009-2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <string.h>
+
+
+/**
+ * Finds matching strings from a finite list
+ * @param str   String to look for
+ * @param list  List of strings to search.
+ * @param num   Number of entries in @p list.
+ *
+ * This function searches the @p list of strings for @p str.  If a
+ * (partial) match is found it returns the index in the @p list.
+ *
+ * Very similar in function to strmatch(), but works for sets of strings
+ * that are not @c NUL terminated.
+ *
+ * @returns -1 on error, otherwise the index to the matching string.
+ */
+int strnmatch(const char *str, const char **list, size_t num)
+{
+	size_t i;
+
+	if (!str || !list) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	for (i = 0; i < num; i++) {
+		if (!strncasecmp (str, list[i], strlen (str)))
+			return i;
+	}
+
+	errno = ENOENT;
+	return -1;
+}
+
+/**
+ * Finds matching strings from a list
+ * @param str   String to look for.
+ * @param list  NUL terminated list of strings to search.
+ *
+ * This function searches the @p list of strings for @p str.  If a
+ * (partial) match is found it returns the index in the @p list.
+ *
+ * Please note, the @p list MUST be terminated by a NUL element.  If
+ * that is not possible, we recommend using strnmatch() instead.
+ *
+ * @returns -1 on error, otherwise the index to the matching string.
+ */
+int strmatch(const char *str, const char **list)
+{
+	size_t i;
+
+	if (!list) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	for (i = 0; list[i]; i++)
+		;
+
+	return strnmatch(str, list, i);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/strndupa.h

@@ -23,8 +23,21 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  * ==========================================================================
  */
-#ifndef LITE_STRNDUPA_H_
-#define LITE_STRNDUPA_H_
+
+/**
+ * @file strndupa.h
+ * @author William Ahern
+ * @date 2009
+ * @copyright MIT License
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef LIBITE_STRNDUPA_H_
+#define LIBITE_STRNDUPA_H_
 
 #if !defined(HAVE_STRNDUPA)
 #if defined(strndupa)
@@ -38,6 +51,12 @@
 #include <string.h>	/* memcpy(3) */
 #include "strnlen.h"
 
+/**
+ * Duplicate part of string on stack
+ * @param src string to duplicate
+ * @param lim number of bytes to dupliate
+ * @returns the result of memcpy(3)
+ */
 #define strndupa(src, lim) (__extension__ ({		\
 	size_t len_	= strnlen(src, lim);		\
 	char *dst_	= __builtin_alloca(len_ + 1);	\
@@ -50,4 +69,8 @@
 #endif /* __GNUC__ */
 #endif /* !HAVE_STRNDUPA */
 
-#endif /* GNU_STRING_STRNDUPA_H */
+#endif /* LIBITE_STRNDUPA_H */
+
+#ifdef __cplusplus
+}
+#endif

src/strnlen.h

@@ -1,6 +1,6 @@
 /* strnlen.h - Re-implementation of GLIBC strnlen()
  *
- * Copyright (c) 2016  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef LITE_STRNLEN_H_
-#define LITE_STRNLEN_H_
+/**
+ * @file strnlen.h
+ * @author Joachim Wiberg
+ * @date 2016-2021
+ * @copyright ISC License
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef LIBITE_STRNLEN_H_
+#define LIBITE_STRNLEN_H_
 
 #if !defined(HAVE_STRNLEN)
 #if defined(strnlen)
@@ -27,17 +39,27 @@
 #if !HAVE_STRNLEN
 #include <stddef.h>	/* size_t */
 
-#define strnlen(str, lim) xstrnlen(str, lim)
+#define strnlen(str, lim) xstrnlen(str, lim) /**< Wrapper for xstrnlen() */
 
+/**
+ * Reimplementation of GLIBC strnlen()
+ * @param str string to return length of
+ * @param lim max number of bytes to read
+ * @returns length of @p str in bytes, but at most @lim bytes.
+ */
 static inline size_t xstrnlen(const char *str, size_t lim)
 {
 	size_t i = 0;
 
-	while (str[i] && i < lim)
+	while (i < lim && str[i])
 		i++;
 
 	return i;
 }
 #endif
 
-#endif /* LITE_STRNLEN_H_ */
+#endif /* LIBITE_STRNLEN_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/strtonum.c

@@ -0,0 +1,112 @@
+/*	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $	*/
+
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file strtonum.c
+ * @author Ted Unangst
+ * @author Todd Miller
+ * @date 2004
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#ifndef strtonum
+#define	INVALID		1		/**< internal */
+#define	TOOSMALL	2		/**< internal */
+#define	TOOLARGE	3		/**< internal */
+
+#ifndef LLONG_MAX
+# define LLONG_MAX	0x7fffffffffffffffLL        /**< internal */
+#endif
+
+#ifndef LLONG_MIN
+# define LLONG_MIN	(-0x7fffffffffffffffLL - 1) /**< internal */
+#endif
+
+/**
+ * Reliably convert string value to an integer
+ * @param numstr  String to convert to a number
+ * @param minval  Lower bound to check number against
+ * @param maxval  Upper bound to check number against
+ * @param errstrp Pointer to error string
+ *
+ * This function converts the string in @p numstr to a long long value.
+ * The function was designed to facilitate safe, robust programming and
+ * overcome the shortcomings of the atoi(3) and strtol(3) family of
+ * interfaces.
+ *
+ * The string may begin with an arbitrary amount of whitespace (as
+ * determined by isspace(3)) followed by a single optional ‘+’ or ‘-’
+ * sign.
+ *
+ * The remainder of the string is converted to a long long value
+ * according to base 10.
+ *
+ * The value obtained is then checked against the provided @p minval and
+ * @p maxval bounds. If @p errstrp is non-NULL, strtonum() stores an
+ * error string in @p *errstrp indicating the failure.
+ *
+ * @returns The result of the conversion, unless the value would exceed
+ * the provided bounds or is invalid. On error, 0 is returned, @a errno
+ * is set, and @p errstrp points to an error message. @p *errstr* is set
+ * to @c NULL on success; this fact can be used to differentiate a
+ * successful return of 0 from an error.
+ */
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+    const char **errstrp)
+{
+	long long ll = 0;
+	int error = 0;
+	char *ep;
+	struct errval {
+		const char *errstr;
+		int err;
+	} ev[4] = {
+		{ NULL,		0 },
+		{ "invalid",	EINVAL },
+		{ "too small",	ERANGE },
+		{ "too large",	ERANGE },
+	};
+
+	ev[0].err = errno;
+	errno = 0;
+	if (minval > maxval) {
+		error = INVALID;
+	} else {
+		ll = strtoll(numstr, &ep, 10);
+		if (errno == EINVAL || numstr == ep || *ep != '\0')
+			error = INVALID;
+		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+			error = TOOSMALL;
+		else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+			error = TOOLARGE;
+	}
+	if (errstrp != NULL)
+		*errstrp = ev[error].errstr;
+	errno = ev[error].err;
+	if (error)
+		ll = 0;
+
+	return (ll);
+}
+#endif

src/strtrim.c

@@ -0,0 +1,77 @@
+/* Trim a string from whitespace
+ *
+ * Copyright (c) 2014  Mattias Walström <lazzer@gmail.com>
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file strtrim.c
+ * @author Mattias Walström
+ * @author Joachim Wiberg
+ * @date 2014,2021
+ * @copyright ISC License
+ */
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "lite.h"
+
+/**
+ * Strip leading and trailing whitespace from a string
+ * @param str  The string to trim
+ *
+ * Trims a string from any leading and trailing white-space, returns the
+ * trimmed result in the same buffer.
+ *
+ * @returns If @p str is a valid, non-NULL string this function returns
+ * the same string stripped from whitespace.  This function only returns
+ * @c NULL if @p str itself is @c NULL.
+ */
+char *strtrim(char *str)
+{
+	char *start, *end;
+
+	if (!str) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	start = str;
+	while (isspace(*start))
+		start++;
+
+	if (*start == 0) {
+		str[0] = 0;
+		return str;
+	}
+
+	end = start + strlen(start) - 1;
+	while (end > start && isspace(*end))
+		end--;
+	*(++end) = 0;
+
+	memmove(str, start, end - start + 1);
+
+	return str;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/systemf.c

@@ -0,0 +1,85 @@
+/* Formatted system() which returns actual return status of command
+ *
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file systemf.c
+ * @author Joachim Wiberg
+ * @date 2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+
+/**
+ * Like system(), but takes a formatted string as argument.
+ * @param fmt  printf style format list to command to run
+ *
+ * This system() wrapper greatly simplifies operations that usually
+ * consist of composing a command from parts into a dynamic buffer
+ * before calling it.  The return value from system() is also parsed,
+ * checking for proper exit and signals.
+ *
+ * @returns If the command exits normally, the return code of the command
+ * is returned.  Otherwise, if the command is signalled, the return code
+ * is -1 and @a errno is set to @c EINTR.
+ */
+int systemf(const char *fmt, ...)
+{
+	va_list ap;
+	char *cmd;
+	int len;
+	int rc;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	cmd = alloca(++len);
+	if (!cmd) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(cmd, len, fmt, ap);
+	va_end(ap);
+
+	rc = system(cmd);
+	if (rc == -1)
+		return -1;
+
+	if (WIFEXITED(rc)) {
+		errno = 0;
+		rc = WEXITSTATUS(rc);
+	} else if (WIFSIGNALED(rc)) {
+		errno = EINTR;
+		rc = -1;
+	}
+
+	return rc;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/telnet.c

@@ -0,0 +1,317 @@
+/* Poor mans telnet expect in C.
+ *
+ * Copyright (c) 2010-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file telnet.c
+ * @author Joachim Wiberg
+ * @date 2010-2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <poll.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+
+#include "lite.h"
+
+#define  EXPECT_DEBUG        0
+#define  EXPECT_POLL_TIMEOUT 3000	/* 3 sec timeout waiting for server. */
+
+#if EXPECT_DEBUG
+# define TELL(fmt, args...) fprintf (stderr, fmt "\n", ##args)
+#else
+# define TELL(fmt, args...)
+#endif
+
+/** @private for internal use only */
+struct sdbuf {
+	int   sd;
+	char *buf;
+};
+
+/**
+ * Open telnet connection to addr:port and connect.
+ * @param addr  Integer encoded IPv4 address in network byte order
+ * @param port  Internet port number in network byte order
+ *
+ * @returns An @ref sdbuf_t socket buffer context.
+ */
+sdbuf_t *telnet_open(int addr, short port)
+{
+	struct sockaddr_in *sin;
+	struct sockaddr s;
+	sdbuf_t *ctx;
+	int saved;
+	int retries = 10;
+
+	ctx = (sdbuf_t *)malloc(sizeof(sdbuf_t));
+	if (!ctx) {
+//		perror("Failed allocating expect ctxect");
+		return NULL;
+	}
+
+	ctx->buf = (char *)malloc(BUFSIZ);
+	if (!ctx->buf) {
+//		perror("Failed allocating expect buffer");
+		free(ctx);
+		return NULL;
+	}
+
+	ctx->sd = socket(PF_INET, SOCK_STREAM, 0);
+	if (-1 == ctx->sd) {
+		saved = errno;
+//		perror ("Failed creating socket");
+		free(ctx->buf);
+		free(ctx);
+
+		errno = saved;
+		return NULL;
+	}
+
+ retry:
+	sin = (struct sockaddr_in *)&s;
+	sin->sin_family = AF_INET;
+	sin->sin_port = port;
+	sin->sin_addr.s_addr = addr;
+	if (-1 == connect(ctx->sd, &s, sizeof(s))) {
+		if (ETIMEDOUT == errno && retries-- > 0) {
+			sleep(1);
+			goto retry;
+		}
+
+		saved = errno;
+//		perror ("Cannot connect to telnet daemon");
+		telnet_close(ctx);
+		errno = saved;
+
+		return NULL;
+	}
+
+	return ctx;
+}
+
+/**
+ * Close a telnet session previously opened with telnet_open()
+ * @param ctx  An @ref sdbuf_t socket buffer context
+ *
+ * @returns Always returns POSIX OK(0).
+ */
+int telnet_close(sdbuf_t *ctx)
+{
+	free(ctx->buf);
+	close(ctx->sd);
+	free(ctx);
+
+	return 0;
+}
+
+static int wait_substr(sdbuf_t *ctx, char *str)
+{
+	struct pollfd pfd = { ctx->sd, POLLIN, 0 };
+	ssize_t len, tot = 0;
+	int err;
+
+	while (1) {
+		err = poll(&pfd, 1, EXPECT_POLL_TIMEOUT);
+		if (err <= 0) {
+			if (0 == err)
+				errno = ETIMEDOUT;
+
+			if (EINTR == errno)
+				continue;
+
+//			perror("No prompt");
+			return 1;
+		}
+
+		len = read(ctx->sd, &ctx->buf[tot], BUFSIZ);
+		if (len <= 0) {
+			errno = ENOMSG;
+			return 1;
+		}
+
+		tot += len;
+		ctx->buf[tot] = 0;
+		TELL("Got line: '%s' is it '%s'?", ctx->buf, str);
+
+		if (strstr(ctx->buf, str))
+			return 0;
+	}
+}
+
+/**
+ * Poor man's telnet expect
+ * @param ctx     Telnet session context from telnet_open()
+ * @param script  @c NULL terminated list of expect and response strings
+ * @param output  Optional output from session
+ *
+ * Issues @p script sequence on telnet session specified in @p ctx, with
+ * optional @p output from session.
+ *
+ * The @p script consists of strings of expect and response pairs.  For
+ * example, expect "ogin: " followed by response "root\n", expect
+ * "assword: "with response "secret\n", concluded by @c NULL.
+ *
+ * @returns POSIX OK(0) or non-zero on error.
+ */
+int telnet_expect(sdbuf_t *ctx, char *script[], FILE *output)
+{
+	struct pollfd fd = { ctx->sd, POLLIN, 0 };
+	ssize_t len;
+	int i, first = 1, cont = 1, result = 0;
+
+	for (i = 0; script[i]; i++) {
+		/* when expecting the empty string, just wipe any available input */
+		if (!strlen(script[i])) {
+			result = poll(&fd, 1, 0);
+			if (result > 0)
+				lseek(ctx->sd, 0, SEEK_END);
+		} else {
+			if (wait_substr(ctx, script[i])) {
+				result = ENOMSG;
+				return 1;
+			}
+		}
+
+		i++;
+
+		if (strlen(script[i])) {
+			TELL("Sending line: '%s'", script[i]);
+			if (-1 == write(ctx->sd, script[i], strlen(script[i]))) {
+				errno = ENOSPC;
+				return 1;
+			}
+		}
+	}
+
+	while (cont) {
+		char *ptr = ctx->buf;
+		char *tmp;
+
+		result = poll(&fd, 1, EXPECT_POLL_TIMEOUT);
+		if (result <= 0) {
+			if (0 == result)
+				errno = ETIMEDOUT;
+
+			if (EINTR == errno)
+				continue;
+
+//			perror ("No result");
+			result = errno;
+			break;
+		}
+
+		/*
+		 * On VERY long outputs we need to send some love back to the
+		 * server, otherwise it terminates the connection. --Jocke
+		 */
+		if (-1 == write(ctx->sd, "\n", 1))
+			goto retry;
+
+		len = read(ctx->sd, ctx->buf, BUFSIZ);
+		if (len == -1) {
+		retry:
+			if (EINTR == errno)
+				continue;
+
+			result = errno;
+			break;
+		}
+		ctx->buf[len] = 0;
+
+		TELL("Read line: '%s'", ctx->buf);
+
+		/* Skip first line -- only an echo of the last command */
+		if (first) {
+			first = 0;
+			ptr = strchr(ctx->buf, '\n');
+			if (ptr)
+				ptr++;
+			else
+				ptr = ctx->buf;
+		}
+
+		TELL("Comparing '%s' with '%s'", ptr, script[i - 2]);
+
+		/* Skip last line -- only the returning prompt. */
+		tmp = strstr(ptr, script[i - 2]);
+		if (tmp) {
+			TELL("OK, last line.  Good bye!");
+			result = 0;
+			cont = 0;
+			*tmp = 0;
+
+			tmp = strrchr(ptr, '\n');
+			if (tmp)
+				*++tmp = 0;
+		}
+
+		if (output && *ptr) {
+			if (EOF == fputs(ptr, output)) {
+				/* Only happens when /tmp is full :( */
+				result = ENOSPC;
+				/* We must complete read-out of descriptor */
+				output = NULL;
+			}
+		}
+	}
+
+	return result;
+}
+
+/**
+ * Very simple expect-like implementation for telnet.
+ * @param addr    Integer encoded IPv4 address, in network byte order, use htonl().
+ * @param port    Internet port to connect to, in network byte order, use htons().
+ * @param script  Expect like script of paired 'expect', 'response' strings.
+ * @param output  A FILE pointer to a tempfile() for output from the last command.
+ *
+ * This is a very simple expect-like implementation for querying and
+ * operating daemons remotely over telnet.
+ *
+ * The @p script is a query-response type of list of strings leading up
+ * to a final command, which output is then written to the given @p
+ * output file.
+ *
+ * @returns POSIX OK(0), or non-zero with @a errno set on error.
+ */
+int telnet_session(int addr, short port, char *script[], FILE *output)
+{
+	sdbuf_t *sdbuf;
+	int result = 0;
+
+	sdbuf = telnet_open(addr, port);
+	if (!sdbuf)
+		return errno;
+
+	if (telnet_expect(sdbuf, script, output))
+		result = errno;
+
+	telnet_close(sdbuf);
+
+	return errno = result;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/tempfile.c

@@ -1,6 +1,6 @@
 /* A secure tmpfile() replacement.
  *
- * Copyright (c) 2015-2016  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,23 +15,46 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/**
+ * @file tempfile.c
+ * @author Joachim Wiberg
+ * @date 2015-2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
 #include <paths.h>
 #include <fcntl.h>		/* O_TMPFILE requires -D_GNU_SOURCE */
 #include <stdio.h>		/* fdopen() */
+#include <stdlib.h>		/* mkostemp() */
 #include <sys/stat.h>		/* umask() */
 
+static FILE *fallback(void)
+{
+	char nm[15] = _PATH_TMP "XXXXXXXX";
+	int fd;
+
+	fd = mkostemp(nm, O_CLOEXEC);
+	if (-1 == fd)
+		return NULL;
+
+	return fdopen(fd, "w+");
+}
+
 /**
- * tempfile - A secure tmpfile() replacement
+ * A secure tmpfile() replacement
  *
  * This is the secure replacement for tmpfile() that does not exist in
- * GLIBC.  The function uses the Linux specific %O_TMPFILE and %O_EXCL
- * for security.  When the %FILE is fclose()'ed the file contents is
- * lost.  The file is hidden in the %_PATH_TMP directory on the system.
+ * GLIBC.  It uses the Linux specific @c O_TMPFILE and @c O_EXCL to hide
+ * the filename.  When the @c FILE is fclose()'ed, the file contents is
+ * lost.  The file is hidden in the @c _PATH_TMP ("/tmp") directory in
+ * the system.
  *
- * This function requires Linux 3.11, or later, due to %O_TMPFILE.
+ * This function requires Linux 3.11, or later, due to @c O_TMPFILE.
+ * Not all file systems support hidden inodes, in which case this
+ * function defaults to call tmpfile() as a fallback.
  *
- * Returns:
- * An open %FILE pointer, or %NULL on error.
+ * @returns An open @c FILE pointer, or @c NULL on error.
  */
 FILE *tempfile(void)
 {
@@ -42,12 +65,16 @@ FILE *tempfile(void)
 	oldmask = umask(0077);
 	fd = open(_PATH_TMP, O_TMPFILE | O_RDWR | O_EXCL | O_CLOEXEC, S_IRUSR | S_IWUSR);
 	umask(oldmask);
-	if (-1 == fd)
-		return NULL;
+	if (-1 == fd) {
+		if (errno == EOPNOTSUPP)
+			return fallback();
 
-	return fdopen(fd, "rw");
+		return NULL;
+	}
+
+	return fdopen(fd, "w+");
 #else
-	return tmpfile(); /* Fallback on older GLIBC/Linux and actual UNIX systems */
+	return fallback();
 #endif
 }
 

src/touchf.c

@@ -0,0 +1,72 @@
+/* Formatted touch()
+ *
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file touchf.c
+ * @author Joachim Wiberg
+ * @date 2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "lite.h"
+
+/**
+ * Like touch() but with formatted string support
+ * @param fmt  Formatted string to be composed into a pathname
+ *
+ * This is a wrapper for the touch() function in lite.h, lessening the
+ * burden of having to compose the filename from parts in a seprate
+ * buffer.
+ *
+ * @returns Upon successful completion touchf() returns POSIX OK(0),
+ * otherwise, -1 is returned and @a errno is set to indicate error.
+ */
+int touchf(const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return touch(file);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/tree.h

@@ -24,10 +24,20 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef	_SYS_TREE_H_
 #define	_SYS_TREE_H_
 
-/*
+/**
+ * @file tree.h
+ * @author Niels Provos
+ * @date 2002
+ * @copyright 2-clause BSD License
+ *
  * This file defines data structures for different types of trees:
  * splay trees and red-black trees.
  *
@@ -746,3 +756,7 @@ name##_RB_MINMAX(struct name *head, int val)				\
 	     (x) = (y))
 
 #endif	/* _SYS_TREE_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/truncatef.c

@@ -0,0 +1,70 @@
+/* Formatted truncate()
+ *
+ * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file truncatef.c
+ * @author Joachim Wiberg
+ * @date 2021
+ * @copyright ISC License
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+/**
+ * Truncate a file based on the formatted string
+ * @param length  Size in bytes to truncate file to, zero to empty it
+ * @param fmt     Formatted string to be composed into a pathname
+ *
+ * This is an extension to the truncate() family, lessening the burden
+ * of having to compose the filename from parts in a seprate buffer.
+ *
+ * @returns Upon successful completion truncate() returns POSIX OK(0),
+ * otherwise, -1 is returned and @a errno is set to indicate error.
+ */
+int truncatef(off_t length, const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return truncate(file, length);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/which.c

@@ -0,0 +1,140 @@
+/* C implementation of UNIX which(1)
+ *
+ * Copyright (c) 2017-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file which.c
+ * @author Joachim Wiberg
+ * @date 2017-2021
+ * @copyright ISC License
+ */
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>		/* snprintf() */
+#include <stdlib.h>		/* realloc(), free() */
+#include <string.h>		/* strtok_r() */
+#include <unistd.h>		/* access() */
+
+/* Strip any arguments in "/path/to/bin --some args", modifies input string */
+static char *strip_args(char *path)
+{
+	size_t i = 0;
+
+	if (!path)
+		return NULL;
+
+	/* Find first whitespace (space/tab/etc.) */
+	while (path[i] && !isspace(path[i]))
+		i++;
+	path[i] = 0;
+
+	return path;
+}
+
+/**
+ * Like which(1), or `command -v foo`
+ * @param cmd  Command to look for in $PATH
+ *
+ * @returns A malloc()'ed path to @a cmd on success, or @c NULL.
+ */
+char *which(const char *cmd)
+{
+	size_t pathlen = 0;
+	char *ptr, *tok, *env, *path = NULL;
+
+	if (!cmd) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	if (cmd[0] == '/') {
+		path = strip_args(strdup(cmd));
+		if (!path)
+			return NULL;
+
+		if (!access(path, X_OK))
+			return path;
+
+		if (path)
+			free(path);
+
+		return NULL;
+	}
+
+	ptr = getenv("PATH");
+	if (!ptr)
+		return NULL;
+
+	env = strdup(ptr);
+	if (!env)
+		return NULL;
+
+	tok = strtok_r(env, ":", &ptr);
+	while (tok) {
+		size_t len = strlen(tok) + strlen(cmd) + 2;
+
+		if (pathlen < len) {
+			path = realloc(path, len);
+			if (!path) {
+				free(env);
+				return NULL;
+			}
+			pathlen = len;
+		}
+
+		snprintf(path, pathlen, "%s/%s", tok, cmd);
+		path = strip_args(path);
+		if (!path || !access(path, X_OK)) {
+			free(env);
+			return path;
+		}
+
+		tok = strtok_r(NULL, ":", &ptr);
+	}
+
+	if (path)
+		free(path);
+	free(env);
+
+	return NULL;
+}
+
+/**
+ * Predicate variant of which()
+ * @param cmd  Command to look for in $PATH
+ *
+ * @returns @c TRUE(1) or @c FALSE(0) if @p cmd exists in $PATH.
+ */
+int whichp(const char *cmd)
+{
+	char *path;
+
+	path = which(cmd);
+	if (path) {
+		free(path);
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/yorn.c

@@ -0,0 +1,98 @@
+/* Safe yes-or-no with prompt
+ *
+ * Copyright (c) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file yorn.c
+ * @author Joachim Wiberg
+ * @date 2009-2021
+ * @copyright ISC License
+ */
+
+#include <stdio.h>
+#include <stdio_ext.h>		/* __fpurge() */
+#include <stdarg.h>
+#include <termios.h>
+#include <unistd.h>
+
+static char rawgetch(void)
+{
+	struct termios savemodes, modmodes;
+	char val;
+
+	if (!isatty(STDIN_FILENO))
+		return getchar();
+
+	/* Backup terminal settings. */
+	if (tcgetattr(STDIN_FILENO, &savemodes) < 0) {
+		return -1;
+	}
+
+	/* "stty cbreak -echo" */
+	modmodes = savemodes;
+	modmodes.c_lflag &= ~ICANON;
+	modmodes.c_lflag &= ~ECHO;
+	modmodes.c_cc[VMIN] = 1;
+	modmodes.c_cc[VTIME] = 0;
+
+	/* Set terminal in raw mode. */
+	if (tcsetattr(STDIN_FILENO, TCSANOW, &modmodes) < 0) {
+		tcsetattr(STDIN_FILENO, TCSANOW, &savemodes);
+		return -1;
+	}
+
+	val = getchar();
+
+	/* Restore terminal to previous state. */
+	tcsetattr(STDIN_FILENO, TCSANOW, &savemodes);
+
+	return val;
+}
+
+/**
+ * Pose a a Yes or No question and return answer
+ * @param fmt  Standard printf() style argument(s).
+ *
+ * This function prints the given question on screen, waits for user
+ * input in the form of yes or no.
+ *
+ * @returns TRUE(1) or FALSE(0).  True if the answer is yes.
+ */
+int yorn(const char *fmt, ...)
+{
+	va_list ap;
+	char yorn;
+
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+
+	__fpurge(stdin);
+	yorn = rawgetch();
+	printf("%c\n", yorn);
+	fflush(stdout);
+	if (yorn != 'y' && yorn != 'Y')
+		return 0;
+
+	return 1;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

strtonum.c

@@ -1,67 +0,0 @@
-/*	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $	*/
-
-/*
- * Copyright (c) 2004 Ted Unangst and Todd Miller
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#ifndef strtonum
-#define	INVALID		1
-#define	TOOSMALL	2
-#define	TOOLARGE	3
-
-long long
-strtonum(const char *numstr, long long minval, long long maxval,
-    const char **errstrp)
-{
-	long long ll = 0;
-	int error = 0;
-	char *ep;
-	struct errval {
-		const char *errstr;
-		int err;
-	} ev[4] = {
-		{ NULL,		0 },
-		{ "invalid",	EINVAL },
-		{ "too small",	ERANGE },
-		{ "too large",	ERANGE },
-	};
-
-	ev[0].err = errno;
-	errno = 0;
-	if (minval > maxval) {
-		error = INVALID;
-	} else {
-		ll = strtoll(numstr, &ep, 10);
-		if (numstr == ep || *ep != '\0')
-			error = INVALID;
-		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
-			error = TOOSMALL;
-		else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
-			error = TOOLARGE;
-	}
-	if (errstrp != NULL)
-		*errstrp = ev[error].errstr;
-	errno = ev[error].err;
-	if (error)
-		ll = 0;
-
-	return (ll);
-}
-#endif

test/.gitignore

@@ -0,0 +1,25 @@
+*.o
+*.log
+*.trs
+.deps/
+/chomp
+/copyfile
+/dir
+/fexist
+/fisdir
+/fopenf
+/fsendfile
+/lfile
+/makepath
+/pidfile
+/printhdr
+/progress
+/rsync
+/str
+/strmatch
+/systemf
+/tempfile
+/touch
+/tree
+/which
+/yorn

test/Makefile.am

@@ -0,0 +1,41 @@
+# Ignore warnings about unused result, in e.g. write()
+AM_CFLAGS       = -W -Wall -Wextra -Wno-unused-result
+AM_CPPFLAGS     = -D_GNU_SOURCE
+AM_LDFLAGS      = -L../src/ ../src/libite.la -static
+
+EXTRA_DIST      = check.h data/fexist/dir/.placeholder data/fexist/executable
+EXTRA_DIST     += data/fexist/link data/fexist/regular data/lfile/fstab
+EXTRA_DIST     += data/lfile/group data/lfile/passwd data/lfile/protocols
+EXTRA_DIST     += data/lfile/services data/which/executable
+EXTRA_DIST     += data/which/executable-link data/which/regular
+
+CLEANFILES      = *~ *.trs *.log
+
+TESTS_ENVIRONMENT = ([ -d data ] || ln -sf $(srcdir)/data) &&
+
+clean-local:
+	-find -type l -name data -exec rm {} \;
+
+TESTS           =
+TESTS          += chomp
+TESTS          += copyfile
+TESTS          += dir
+TESTS          += fexist
+TESTS          += fisdir
+TESTS          += fopenf
+TESTS          += fsendfile
+TESTS          += lfile
+TESTS          += makepath
+TESTS          += pidfile
+TESTS          += printhdr
+TESTS          += progress
+TESTS          += rsync
+TESTS          += str
+TESTS          += strmatch
+TESTS          += systemf
+TESTS          += touch
+TESTS          += tempfile
+TESTS          += which
+TESTS          += yorn
+
+check_PROGRAMS  = $(TESTS)

test/check.h

@@ -1,12 +1,15 @@
-#ifndef LITE_TESTS_CHECK_H_
-#define LITE_TESTS_CHECK_H_
+#ifndef LIBLITE_TESTS_CHECK_H_
+#define LIBLITE_TESTS_CHECK_H_
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "../lite.h"
+#include "../src/conio.h"
+#include "../src/lite.h"
+
+#define PRINT(args...) if (verbose) printf(args)
 
 #define fail_unless(test)						\
   do {									\
@@ -25,8 +28,8 @@ static inline int test(int result, const char *fmt, ...)
 	char buf[80];
 	size_t len;
 	va_list ap;
-	const char success[] = " \e[1m[ OK ]\e[0m\n";
-	const char failure[] = " \e[7m[FAIL]\e[0m\n";
+	const char success[] = " \033[1m[ OK ]\033[0m\n";
+	const char failure[] = " \033[7m[FAIL]\033[0m\n";
 	const char dots[] = " .....................................................................";
 
 	va_start(ap, fmt);
@@ -75,4 +78,4 @@ static inline char *timespec2str(struct timespec *ts, char *buf, size_t len)
 	return buf;
 }
 
-#endif /* LITE_TESTS_CHECK_H_ */
+#endif /* LIBLITE_TESTS_CHECK_H_ */

test/data/fexist/broken-link

@@ -0,0 +1 @@
+nonexistence

test/data/fexist/link

@@ -0,0 +1 @@
+regular

test/data/lfile/fstab

@@ -0,0 +1,3 @@
+UUID=xxxxxxxxxx /               xfs     defaults        0       1
+/dev/sda1  /boot/efi       vfat    umask=0077      0       1
+/dev/sr0        /media/cdrom0   udf,iso9660 user,noauto     0       0

test/data/lfile/group

@@ -0,0 +1,39 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mail:x:8:
+news:x:9:
+uucp:x:10:
+man:x:12:
+proxy:x:13:
+kmem:x:15:
+dialout:x:20:
+fax:x:21:
+voice:x:22:
+cdrom:x:24:
+floppy:x:25:
+tape:x:26:
+sudo:x:27:
+audio:x:29:
+dip:x:30:
+www-data:x:33:
+backup:x:34:
+operator:x:37:
+list:x:38:
+irc:x:39:
+src:x:40:
+gnats:x:41:
+shadow:x:42:
+utmp:x:43:
+video:x:44:
+sasl:x:45:
+plugdev:x:46:
+staff:x:50:
+games:x:60:
+users:x:100:
+nogroup:x:65534:

test/data/lfile/passwd

@@ -0,0 +1,18 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
+bin:x:2:2:bin:/bin:/usr/sbin/nologin
+sys:x:3:3:sys:/dev:/usr/sbin/nologin
+sync:x:4:65534:sync:/bin:/bin/sync
+games:x:5:60:games:/usr/games:/usr/sbin/nologin
+man:x:6:12:man:/var/cache/man:/usr/sbin/nologin
+lp:x:7:7:lp:/var/spool/lpd:/usr/sbin/nologin
+mail:x:8:8:mail:/var/mail:/usr/sbin/nologin
+news:x:9:9:news:/var/spool/news:/usr/sbin/nologin
+uucp:x:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin
+proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
+www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
+backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
+list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
+irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
+gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
+nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin

test/data/lfile/protocols

@@ -0,0 +1,64 @@
+# Internet (IP) protocols
+#
+# Updated from http://www.iana.org/assignments/protocol-numbers and other
+# sources.
+# New protocols will be added on request if they have been officially
+# assigned by IANA and are not historical.
+# If you need a huge list of used numbers please install the nmap package.
+
+ip	0	IP		# internet protocol, pseudo protocol number
+hopopt	0	HOPOPT		# IPv6 Hop-by-Hop Option [RFC1883]
+icmp	1	ICMP		# internet control message protocol
+igmp	2	IGMP		# Internet Group Management
+ggp	3	GGP		# gateway-gateway protocol
+ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
+st	5	ST		# ST datagram mode
+tcp	6	TCP		# transmission control protocol
+egp	8	EGP		# exterior gateway protocol
+igp	9	IGP		# any private interior gateway (Cisco)
+pup	12	PUP		# PARC universal packet protocol
+udp	17	UDP		# user datagram protocol
+hmp	20	HMP		# host monitoring protocol
+xns-idp	22	XNS-IDP		# Xerox NS IDP
+rdp	27	RDP		# "reliable datagram" protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4 [RFC905]
+dccp	33	DCCP		# Datagram Congestion Control Prot. [RFC4340]
+xtp	36	XTP		# Xpress Transfer Protocol
+ddp	37	DDP		# Datagram Delivery Protocol
+idpr-cmtp 38	IDPR-CMTP	# IDPR Control Message Transport
+ipv6	41	IPv6		# Internet Protocol, version 6
+ipv6-route 43	IPv6-Route	# Routing Header for IPv6
+ipv6-frag 44	IPv6-Frag	# Fragment Header for IPv6
+idrp	45	IDRP		# Inter-Domain Routing Protocol
+rsvp	46	RSVP		# Reservation Protocol
+gre	47	GRE		# General Routing Encapsulation
+esp	50	IPSEC-ESP	# Encap Security Payload [RFC2406]
+ah	51	IPSEC-AH	# Authentication Header [RFC2402]
+skip	57	SKIP		# SKIP
+ipv6-icmp 58	IPv6-ICMP	# ICMP for IPv6
+ipv6-nonxt 59	IPv6-NoNxt	# No Next Header for IPv6
+ipv6-opts 60	IPv6-Opts	# Destination Options for IPv6
+rspf	73	RSPF CPHB	# Radio Shortest Path First (officially CPHB)
+vmtp	81	VMTP		# Versatile Message Transport
+eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+ax.25	93	AX.25		# AX.25 frames
+ipip	94	IPIP		# IP-within-IP Encapsulation Protocol
+etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation [RFC3378]
+encap	98	ENCAP		# Yet Another IP encapsulation [RFC1241]
+#	99			# any private encryption scheme
+pim	103	PIM		# Protocol Independent Multicast
+ipcomp	108	IPCOMP		# IP Payload Compression Protocol
+vrrp	112	VRRP		# Virtual Router Redundancy Protocol [RFC5798]
+l2tp	115	L2TP		# Layer Two Tunneling Protocol [RFC2661]
+isis	124	ISIS		# IS-IS over IPv4
+sctp	132	SCTP		# Stream Control Transmission Protocol
+fc	133	FC		# Fibre Channel
+mobility-header 135 Mobility-Header # Mobility Support for IPv6 [RFC3775]
+udplite	136	UDPLite		# UDP-Lite [RFC3828]
+mpls-in-ip 137	MPLS-in-IP	# MPLS-in-IP [RFC4023]
+manet	138			# MANET Protocols [RFC5498]
+hip	139	HIP		# Host Identity Protocol
+shim6	140	Shim6		# Shim6 Protocol [RFC5533]
+wesp	141	WESP		# Wrapped Encapsulating Security Payload
+rohc	142	ROHC		# Robust Header Compression

test/data/lfile/services

@@ -0,0 +1,417 @@
+# Network services, Internet style
+#
+# Note that it is presently the policy of IANA to assign a single well-known
+# port number for both TCP and UDP; hence, officially ports have two entries
+# even if the protocol doesn't support UDP operations.
+#
+# Updated from https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml .
+#
+# New ports will be added on request if they have been officially assigned
+# by IANA and used in the real-world or are needed by a debian package.
+# If you need a huge list of used numbers please install the nmap package.
+
+tcpmux		1/tcp				# TCP port service multiplexer
+echo		7/tcp
+echo		7/udp
+discard		9/tcp		sink null
+discard		9/udp		sink null
+systat		11/tcp		users
+daytime		13/tcp
+daytime		13/udp
+netstat		15/tcp
+qotd		17/tcp		quote
+chargen		19/tcp		ttytst source
+chargen		19/udp		ttytst source
+ftp-data	20/tcp
+ftp		21/tcp
+fsp		21/udp		fspd
+ssh		22/tcp				# SSH Remote Login Protocol
+telnet		23/tcp
+smtp		25/tcp		mail
+time		37/tcp		timserver
+time		37/udp		timserver
+whois		43/tcp		nicname
+tacacs		49/tcp				# Login Host Protocol (TACACS)
+tacacs		49/udp
+domain		53/tcp				# Domain Name Server
+domain		53/udp
+bootps		67/udp
+bootpc		68/udp
+tftp		69/udp
+gopher		70/tcp				# Internet Gopher
+finger		79/tcp
+http		80/tcp		www		# WorldWideWeb HTTP
+kerberos	88/tcp		kerberos5 krb5 kerberos-sec	# Kerberos v5
+kerberos	88/udp		kerberos5 krb5 kerberos-sec	# Kerberos v5
+iso-tsap	102/tcp		tsap		# part of ISODE
+acr-nema	104/tcp		dicom		# Digital Imag. & Comm. 300
+pop3		110/tcp		pop-3		# POP version 3
+sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper
+sunrpc		111/udp		portmapper
+auth		113/tcp		authentication tap ident
+nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
+ntp		123/udp				# Network Time Protocol
+epmap		135/tcp		loc-srv		# DCE endpoint resolution
+netbios-ns	137/tcp				# NETBIOS Name Service
+netbios-ns	137/udp
+netbios-dgm	138/tcp				# NETBIOS Datagram Service
+netbios-dgm	138/udp
+netbios-ssn	139/tcp				# NETBIOS session service
+netbios-ssn	139/udp
+imap2		143/tcp		imap		# Interim Mail Access P 2 and 4
+snmp		161/tcp				# Simple Net Mgmt Protocol
+snmp		161/udp
+snmp-trap	162/tcp		snmptrap	# Traps for SNMP
+snmp-trap	162/udp		snmptrap
+cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
+cmip-man	163/udp
+cmip-agent	164/tcp
+cmip-agent	164/udp
+mailq		174/tcp			# Mailer transport queue for Zmailer
+xdmcp		177/udp			# X Display Manager Control Protocol
+bgp		179/tcp				# Border Gateway Protocol
+smux		199/tcp				# SNMP Unix Multiplexer
+qmtp		209/tcp				# Quick Mail Transfer Protocol
+z3950		210/tcp		wais		# NISO Z39.50 database
+ipx		213/udp				# IPX [RFC1234]
+ptp-event	319/udp
+ptp-general	320/udp
+pawserv		345/tcp				# Perf Analysis Workbench
+zserv		346/tcp				# Zebra server
+rpc2portmap	369/tcp
+rpc2portmap	369/udp				# Coda portmapper
+codaauth2	370/tcp
+codaauth2	370/udp				# Coda authentication server
+clearcase	371/udp		Clearcase
+ldap		389/tcp			# Lightweight Directory Access Protocol
+ldap		389/udp
+svrloc		427/tcp				# Server Location
+svrloc		427/udp
+https		443/tcp				# http protocol over TLS/SSL
+snpp		444/tcp				# Simple Network Paging Protocol
+microsoft-ds	445/tcp				# Microsoft Naked CIFS
+microsoft-ds	445/udp
+kpasswd		464/tcp
+kpasswd		464/udp
+submissions	465/tcp		ssmtp smtps urd # Submission over TLS [RFC8314]
+saft		487/tcp			# Simple Asynchronous File Transfer
+isakmp		500/udp				# IPSEC key management
+rtsp		554/tcp			# Real Time Stream Control Protocol
+rtsp		554/udp
+nqs		607/tcp				# Network Queuing system
+asf-rmcp	623/udp		# ASF Remote Management and Control Protocol
+qmqp		628/tcp
+ipp		631/tcp				# Internet Printing Protocol
+#
+# UNIX specific services
+#
+exec		512/tcp
+biff		512/udp		comsat
+login		513/tcp
+who		513/udp		whod
+shell		514/tcp		cmd syslog	# no passwords used
+syslog		514/udp
+printer		515/tcp		spooler		# line printer spooler
+talk		517/udp
+ntalk		518/udp
+route		520/udp		router routed	# RIP
+gdomap		538/tcp				# GNUstep distributed objects
+gdomap		538/udp
+uucp		540/tcp		uucpd		# uucp daemon
+klogin		543/tcp				# Kerberized `rlogin' (v5)
+kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
+dhcpv6-client	546/udp
+dhcpv6-server	547/udp
+afpovertcp	548/tcp				# AFP over TCP
+nntps		563/tcp		snntp		# NNTP over SSL
+submission	587/tcp				# Submission [RFC4409]
+ldaps		636/tcp				# LDAP over SSL
+ldaps		636/udp
+tinc		655/tcp				# tinc control port
+tinc		655/udp
+silc		706/tcp
+kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
+#
+domain-s	853/tcp				# DNS over TLS [RFC7858]
+domain-s	853/udp				# DNS over DTLS [RFC8094]
+rsync		873/tcp
+ftps-data	989/tcp				# FTP over SSL (data)
+ftps		990/tcp
+telnets		992/tcp				# Telnet over SSL
+imaps		993/tcp				# IMAP over SSL
+pop3s		995/tcp				# POP-3 over SSL
+#
+# From ``Assigned Numbers'':
+#
+#> The Registered Ports are not controlled by the IANA and on most systems
+#> can be used by ordinary user processes or programs executed by ordinary
+#> users.
+#
+#> Ports are used in the TCP [45,106] to name the ends of logical
+#> connections which carry long term conversations.  For the purpose of
+#> providing services to unknown callers, a service contact port is
+#> defined.  This list specifies the port used by the server process as its
+#> contact port.  While the IANA can not control uses of these ports it
+#> does register or list uses of these ports as a convienence to the
+#> community.
+#
+socks		1080/tcp			# socks proxy server
+proofd		1093/tcp
+rootd		1094/tcp
+openvpn		1194/tcp
+openvpn		1194/udp
+rmiregistry	1099/tcp			# Java RMI Registry
+lotusnote	1352/tcp	lotusnotes	# Lotus Note
+ms-sql-s	1433/tcp			# Microsoft SQL Server
+ms-sql-s	1433/udp
+ms-sql-m	1434/tcp			# Microsoft SQL Monitor
+ms-sql-m	1434/udp
+ingreslock	1524/tcp
+datametrics	1645/tcp	old-radius
+datametrics	1645/udp	old-radius
+sa-msg-port	1646/tcp	old-radacct
+sa-msg-port	1646/udp	old-radacct
+kermit		1649/tcp
+groupwise	1677/tcp
+l2f		1701/udp	l2tp
+radius		1812/tcp
+radius		1812/udp
+radius-acct	1813/tcp	radacct		# Radius Accounting
+radius-acct	1813/udp	radacct
+cisco-sccp	2000/tcp			# Cisco SCCP
+nfs		2049/tcp			# Network File System
+nfs		2049/udp			# Network File System
+gnunet		2086/tcp
+gnunet		2086/udp
+rtcm-sc104	2101/tcp			# RTCM SC-104 IANA 1/29/99
+rtcm-sc104	2101/udp
+gsigatekeeper	2119/tcp
+gris		2135/tcp		# Grid Resource Information Server
+cvspserver	2401/tcp			# CVS client/server operations
+venus		2430/tcp			# codacon port
+venus		2430/udp			# Venus callback/wbc interface
+venus-se	2431/tcp			# tcp side effects
+venus-se	2431/udp			# udp sftp side effect
+codasrv		2432/tcp			# not used
+codasrv		2432/udp			# server port
+codasrv-se	2433/tcp			# tcp side effects
+codasrv-se	2433/udp			# udp sftp side effect
+mon		2583/tcp			# MON traps
+mon		2583/udp
+dict		2628/tcp			# Dictionary server
+f5-globalsite	2792/tcp
+gsiftp		2811/tcp
+gpsd		2947/tcp
+gds-db		3050/tcp	gds_db		# InterBase server
+icpv2		3130/tcp	icp		# Internet Cache Protocol
+icpv2		3130/udp	icp
+isns		3205/tcp			# iSNS Server Port
+isns		3205/udp			# iSNS Server Port
+iscsi-target	3260/tcp
+mysql		3306/tcp
+ms-wbt-server	3389/tcp
+nut		3493/tcp			# Network UPS Tools
+nut		3493/udp
+distcc		3632/tcp			# distributed compiler
+distcc		3632/udp
+daap		3689/tcp			# Digital Audio Access Protocol
+daap		3689/udp
+svn		3690/tcp	subversion	# Subversion protocol
+svn		3690/udp	subversion
+suucp		4031/tcp			# UUCP over SSL
+suucp		4031/udp
+sysrqd		4094/tcp			# sysrq daemon
+sysrqd		4094/udp
+sieve		4190/tcp			# ManageSieve Protocol
+epmd		4369/tcp			# Erlang Port Mapper Daemon
+epmd		4369/udp
+remctl		4373/tcp		# Remote Authenticated Command Service
+remctl		4373/udp
+f5-iquery	4353/tcp			# F5 iQuery
+f5-iquery	4353/udp
+ipsec-nat-t	4500/udp			# IPsec NAT-Traversal [RFC3947]
+iax		4569/tcp			# Inter-Asterisk eXchange
+iax		4569/udp
+mtn		4691/tcp			# monotone Netsync Protocol
+mtn		4691/udp
+radmin-port	4899/tcp			# RAdmin Port
+radmin-port	4899/udp
+sip		5060/tcp			# Session Initiation Protocol
+sip		5060/udp
+sip-tls		5061/tcp
+sip-tls		5061/udp
+xmpp-client	5222/tcp	jabber-client	# Jabber Client Connection
+xmpp-server	5269/tcp	jabber-server	# Jabber Server Connection
+cfengine	5308/tcp
+mdns		5353/udp			# Multicast DNS
+postgresql	5432/tcp	postgres	# PostgreSQL Database
+freeciv		5556/tcp	rptp		# Freeciv gameplay
+amqps		5671/tcp			# AMQP protocol over TLS/SSL
+amqp		5672/tcp
+amqp		5672/udp
+amqp		5672/sctp
+x11		6000/tcp	x11-0		# X Window System
+x11-1		6001/tcp
+x11-2		6002/tcp
+x11-3		6003/tcp
+x11-4		6004/tcp
+x11-5		6005/tcp
+x11-6		6006/tcp
+x11-7		6007/tcp
+gnutella-svc	6346/tcp			# gnutella
+gnutella-svc	6346/udp
+gnutella-rtr	6347/tcp			# gnutella
+gnutella-rtr	6347/udp
+sge-qmaster	6444/tcp	sge_qmaster	# Grid Engine Qmaster Service
+sge-execd	6445/tcp	sge_execd	# Grid Engine Execution Service
+mysql-proxy	6446/tcp			# MySQL Proxy
+babel		6696/udp			# Babel Routing Protocol
+ircs-u		6697/tcp		# Internet Relay Chat via TLS/SSL
+afs3-fileserver 7000/tcp	bbs		# file server itself
+afs3-fileserver 7000/udp	bbs
+afs3-callback	7001/tcp			# callbacks to cache managers
+afs3-callback	7001/udp
+afs3-prserver	7002/tcp			# users & groups database
+afs3-prserver	7002/udp
+afs3-vlserver	7003/tcp			# volume location database
+afs3-vlserver	7003/udp
+afs3-kaserver	7004/tcp			# AFS/Kerberos authentication
+afs3-kaserver	7004/udp
+afs3-volser	7005/tcp			# volume managment server
+afs3-volser	7005/udp
+afs3-errors	7006/tcp			# error interpretation service
+afs3-errors	7006/udp
+afs3-bos	7007/tcp			# basic overseer process
+afs3-bos	7007/udp
+afs3-update	7008/tcp			# server-to-server updater
+afs3-update	7008/udp
+afs3-rmtsys	7009/tcp			# remote cache manager service
+afs3-rmtsys	7009/udp
+font-service	7100/tcp	xfs		# X Font Service
+http-alt	8080/tcp	webcache	# WWW caching service
+puppet		8140/tcp			# The Puppet master service
+bacula-dir	9101/tcp			# Bacula Director
+bacula-fd	9102/tcp			# Bacula File Daemon
+bacula-sd	9103/tcp			# Bacula Storage Daemon
+xmms2		9667/tcp	# Cross-platform Music Multiplexing System
+nbd		10809/tcp			# Linux Network Block Device
+zabbix-agent	10050/tcp			# Zabbix Agent
+zabbix-trapper	10051/tcp			# Zabbix Trapper
+amanda		10080/tcp			# amanda backup services
+dicom		11112/tcp
+hkp		11371/tcp			# OpenPGP HTTP Keyserver
+db-lsp		17500/tcp			# Dropbox LanSync Protocol
+dcap		22125/tcp			# dCache Access Protocol
+gsidcap		22128/tcp			# GSI dCache Access Protocol
+wnn6		22273/tcp			# wnn6
+
+#
+# Datagram Delivery Protocol services
+#
+rtmp		1/ddp			# Routing Table Maintenance Protocol
+nbp		2/ddp			# Name Binding Protocol
+echo		4/ddp			# AppleTalk Echo Protocol
+zip		6/ddp			# Zone Information Protocol
+
+#=========================================================================
+# The remaining port numbers are not as allocated by IANA.
+#=========================================================================
+
+# Kerberos (Project Athena/MIT) services
+kerberos4	750/udp		kerberos-iv kdc	# Kerberos (server)
+kerberos4	750/tcp		kerberos-iv kdc
+kerberos-master	751/udp		kerberos_master	# Kerberos authentication
+kerberos-master	751/tcp
+passwd-server	752/udp		passwd_server	# Kerberos passwd server
+krb-prop	754/tcp		krb_prop krb5_prop hprop # Kerberos slave propagation
+zephyr-srv	2102/udp			# Zephyr server
+zephyr-clt	2103/udp			# Zephyr serv-hm connection
+zephyr-hm	2104/udp			# Zephyr hostmanager
+iprop		2121/tcp			# incremental propagation
+supfilesrv	871/tcp			# Software Upgrade Protocol server
+supfiledbg	1127/tcp		# Software Upgrade Protocol debugging
+
+#
+# Services added for the Debian GNU/Linux distribution
+#
+poppassd	106/tcp				# Eudora
+poppassd	106/udp
+moira-db	775/tcp		moira_db	# Moira database
+moira-update	777/tcp		moira_update	# Moira update protocol
+moira-ureg	779/udp		moira_ureg	# Moira user registration
+spamd		783/tcp				# spamassassin daemon
+skkserv		1178/tcp			# skk jisho server port
+predict		1210/udp			# predict -- satellite tracking
+rmtcfg		1236/tcp			# Gracilis Packeten remote config server
+xtel		1313/tcp			# french minitel
+xtelw		1314/tcp			# french minitel
+support		1529/tcp			# GNATS
+cfinger		2003/tcp			# GNU Finger
+frox		2121/tcp			# frox: caching ftp proxy
+zebrasrv	2600/tcp			# zebra service
+zebra		2601/tcp			# zebra vty
+ripd		2602/tcp			# ripd vty (zebra)
+ripngd		2603/tcp			# ripngd vty (zebra)
+ospfd		2604/tcp			# ospfd vty (zebra)
+bgpd		2605/tcp			# bgpd vty (zebra)
+ospf6d		2606/tcp			# ospf6d vty (zebra)
+ospfapi		2607/tcp			# OSPF-API
+isisd		2608/tcp			# ISISd vty (zebra)
+afbackup	2988/tcp			# Afbackup system
+afbackup	2988/udp
+afmbackup	2989/tcp			# Afmbackup system
+afmbackup	2989/udp
+fax		4557/tcp			# FAX transmission service (old)
+hylafax		4559/tcp			# HylaFAX client-server protocol (new)
+distmp3		4600/tcp			# distmp3host daemon
+munin		4949/tcp	lrrd		# Munin
+enbd-cstatd	5051/tcp			# ENBD client statd
+enbd-sstatd	5052/tcp			# ENBD server statd
+pcrd		5151/tcp			# PCR-1000 Daemon
+noclog		5354/tcp			# noclogd with TCP (nocol)
+noclog		5354/udp			# noclogd with UDP (nocol)
+hostmon		5355/tcp			# hostmon uses TCP (nocol)
+hostmon		5355/udp			# hostmon uses UDP (nocol)
+rplay		5555/udp			# RPlay audio service
+nrpe		5666/tcp			# Nagios Remote Plugin Executor
+nsca		5667/tcp			# Nagios Agent - NSCA
+mrtd		5674/tcp			# MRT Routing Daemon
+bgpsim		5675/tcp			# MRT Routing Simulator
+canna		5680/tcp			# cannaserver
+syslog-tls	6514/tcp			# Syslog over TLS [RFC5425]
+sane-port	6566/tcp	sane saned	# SANE network scanner daemon
+ircd		6667/tcp			# Internet Relay Chat
+zope-ftp	8021/tcp			# zope management by ftp
+tproxy		8081/tcp			# Transparent Proxy
+omniorb		8088/tcp			# OmniORB
+omniorb		8088/udp
+clc-build-daemon 8990/tcp			# Common lisp build daemon
+xinetd		9098/tcp
+mandelspawn	9359/udp	mandelbrot	# network mandelbrot
+git		9418/tcp			# Git Version Control System
+zope		9673/tcp			# zope server
+webmin		10000/tcp
+kamanda		10081/tcp			# amanda backup services (Kerberos)
+amandaidx	10082/tcp			# amanda backup services
+amidxtape	10083/tcp			# amanda backup services
+smsqp		11201/tcp			# Alamin SMS gateway
+smsqp		11201/udp
+xpilot		15345/tcp			# XPilot Contact Port
+xpilot		15345/udp
+sgi-cmsd	17001/udp		# Cluster membership services daemon
+sgi-crsd	17002/udp
+sgi-gcd		17003/udp			# SGI Group membership daemon
+sgi-cad		17004/tcp			# Cluster Admin daemon
+isdnlog		20011/tcp			# isdn logging system
+isdnlog		20011/udp
+vboxd		20012/tcp			# voice box system
+vboxd		20012/udp
+binkp		24554/tcp			# binkp fidonet protocol
+asp		27374/tcp			# Address Search Protocol
+asp		27374/udp
+csync2		30865/tcp			# cluster synchronization tool
+dircproxy	57000/tcp			# Detachable IRC Proxy
+tfido		60177/tcp			# fidonet EMSI over telnet
+fido		60179/tcp			# fidonet EMSI over TCP
+
+# Local services

test/data/which/executable-link

@@ -0,0 +1 @@
+executable