Update ChangeLog and bump version for v1.5.0 release

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
ABI revision bump
2026-10-14 10:19:31 +00:00 · 2016-03-20 02:24:26 +01:00 · 2016-03-20 02:21:33 +01:00 · 2016-03-20 02:15:35 +01:00 · 2016-03-20 02:14:55 +01:00 · 2016-03-20 02:14:30 +01:00
47 changed files with 2358 additions and 504 deletions
@@ -1,5 +1,24 @@
+*~
 *.d
 *.o
 *.so
 *.so.*
 *.a
+.deps
+.libs
+tmp/
+compile
+config.*
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+Makefile
+Makefile.in
+aclocal.m4
+ar-lib
+autom4te.cache
+libite*
@@ -0,0 +1,19 @@
+# Travis CI integration -- https://travis-ci.org/troglobit/libuev
+# Defaults to GNU GCC and autotools: ./configure && make && make test
+language: c
+
+# Some of the autotests may use sudo, so use non-dockerized build atm.
+# http://stackoverflow.com/questions/26299552/travis-sudo-is-disabled
+#sudo: true
+sudo: false
+
+# Test build with both GCC and Clang (LLVM)
+compiler:
+  - gcc
+  - clang
+
+#  - make test
+script:
+  - ./autogen.sh
+  - ./configure --disable-silent-rules
+  - make -j5 clean all
@@ -0,0 +1,161 @@
+Change Log
+==========
+
+All notable changes to the project are documented in this file.
+
+
+[v1.5.0][] - 2016-03-20
+-----------------------
+
+This release changes the header file namespace.  Apologies for any
+problems this may cause!
+
+### Changes
+
+- Change namespace for header files: `libite/` to `lite/`, e.g. using
+  `pkg-config` your C program must now `#include <lite/lite.h>`
+- Update `pidfile()` to use `utimensat()` to update atime+mtime instead
+  of opening and writing PID again.  Less overhead and nanonsecond res.
+
+
+[v1.4.4][] - 2016-02-23
+-----------------------
+
+### Changes
+- Add `ibite.pc.in` for `pkg-config` support.
+
+### Fixes
+- Fix issue #3: `tempfile()` fails with bad `O_TMPFILE` on some embedded
+  targets, in particular PowerPC.  On systems with older GLIBC but with
+  a sufficiently new kernel `O_TMPFILE` is missing and the local libite
+  definition was wrong, hard coded for x86.  Fixed by Johan Askerin.
+
+
+[v1.4.3][] - 2016-02-02
+-----------------------
+
+### Fixes
+- Remove symlinks to Markdown files from GIT
+- Distribute and install Markdown files: README.md, etc.
+
+
+[v1.4.2][] - 2016-01-23
+-----------------------
+
+### Fixes
+- Fix issue #2: GCC6 `-Wmisleading-indentation` causing FTBFS in pimd,
+  which enables `-Werror`
+
+
+[v1.4.1][] - 2016-01-22
+-----------------------
+
+### Fixes
+- Fix install path for include files, regression in v1.4.0 With the
+  introduction of GNU autotools include file namespace was unfortunately
+  lost.  All include files were therefore installed in $(prefix)/include
+  instead of $(prefix)/include/libite.
+
+
+[v1.4.0][] - 2016-01-22
+-----------------------
+
+### Changes
+- Change to GNU configure and build system
+- Add Niels Provos' splay and red-black tree implementation from OpenBSD
+  `sys/tree.h`, r1.14
+- Make `pidfile()` file name accessible as `__pidfile_name`
+- Step ABI revision to 2.1, with help from http://250bpm.com/blog:41
+
+
+[v1.3.0][] - 2016-01-07
+-----------------------
+
+### Changes
+- Add highly useful typeless `min()`/`max()` macros to `lite.h`,
+  courtesy of Tobias Waldekranz
+- Add BSD `queue.h` and Borland inspired `conio.h` to `install-dev`
+  target.  Needed by [Finit][].
+- Note, this release update `queue.h` to OpenBSD v1.43, which removes
+  support for circular queues (CIRCLEQ).
+- Update `strlcpy.c` to OpenBSD v1.12, readability fixes.
+- Update `strlcat.c` to OpenBSD v1.14, readability fixes.
+- Update `strtonum.c` to OpenBSD v1.7, tiniest of style tweaks.
+
+### Fixes
+- Only update mtime if `pidfile()` is called more than once, do not
+  install multiple `atexit()` handlers.
+- Add `#ifndef pidfile`, as for other BSD functions, in case the user
+  already have a local copy, or a C library with one.
+
+
+[v1.2.0][] - 2015-11-23
+-----------------------
+
+### Changes
+-  Add simple parser for UNIX configuration files, e.g. `/etc/group`,
+   `/etc/passwd`, and `/etc/protocols`:
+  - `lfopen()`
+  - `lfclose()`
+  - `lftok()`
+  - `lfgetkey()`
+  - `lfgetint()`
+  - `fgetint()`
+
+### Fixes
+- Do not allow `VERSION` to be overloaded by build system.
+- Make sure we don't inherit `LDFLAGS` from environment.
+
+
+[v1.1.1][] - 2015-09-27
+-----------------------
+
+### Fixes
+* Silence annoying warnings from GNU ar
+* Fix macro definitions for compat APIs
+
+
+[v1.1.0][] - 2015-09-16
+-----------------------
+
+### Changes
+- Support for `make distdir` used by automake based projects
+- `lite.h` move from `error.h` to more BSD friendly `err.h`
+- Add highly useful `NELEMS()` and bitmanip macros
+- Lots of autotests added
+- Add support for running autotests from Travis
+- Add `progress()` simple progress bar
+- Add `tree()` simple command line tree replacement
+- Bump `SONAME` to `libite.so.2` on behalf of [Finit][]
+
+### Fixes
+- `pidfile()` upgrade to OpenBSD r1.11
+- Lots of README updates, fixes and additions
+
+
+[v1.0.0][] - 2015-07-12
+-----------------------
+
+Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
+
+
+[UNRELEASED]: https://github.com/troglobit/libite/compare/v1.5.0...HEAD
+[v1.5.0]: https://github.com/troglobit/libite/compare/v1.4.4...v1.5.0
+[v1.4.4]: https://github.com/troglobit/libite/compare/v1.4.3...v1.4.4
+[v1.4.3]: https://github.com/troglobit/libite/compare/v1.4.2...v1.4.3
+[v1.4.2]: https://github.com/troglobit/libite/compare/v1.4.1...v1.4.2
+[v1.4.1]: https://github.com/troglobit/libite/compare/v1.4.0...v1.4.1
+[v1.4.0]: https://github.com/troglobit/libite/compare/v1.3.0...v1.4.0
+[v1.3.0]: https://github.com/troglobit/libite/compare/v1.2.0...v1.3.0
+[v1.2.0]: https://github.com/troglobit/libite/compare/v1.1.1...v1.2.0
+[v1.1.1]: https://github.com/troglobit/libite/compare/v1.1.0...v1.1.1
+[v1.1.0]: https://github.com/troglobit/libite/compare/v1.0.0...v1.1.0
+[v1.0.0]: https://github.com/troglobit/libite/compare/TAIL...v1.0.0
+[Finit]:  https://github.com/troglobit/finit/
+[README]: https://github.com/troglobit/libite/blob/v1.0.0/README.md
+
+<!--
+  -- Local Variables:
+  -- mode: markdown
+  -- End:
+  -->
@@ -4,7 +4,7 @@ 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-2015  Joachim Nilsson <troglobit@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
@@ -1,145 +0,0 @@
-# libite -- Light-weight utility functions and C-library extensions
-# 
-# Copyright (c) 2008-2015  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.
-.PHONY: all install clean
-
-# Figure out root of library, unless used as submodule
-ROOTDIR    ?= $(shell pwd)
-
-#VERSION    = $(shell git tag -l | tail -1)
-VERSION    ?= 1.0.0
-NAME        = libite
-PKG         = $(NAME)-$(VERSION)
-ARCHIVE     = $(PKG).tar.xz
-
-CC         ?= $(CROSS)gcc
-AR         ?= $(CROSS)ar
-STRIP      ?= $(CROSS)strip
-INSTALL    := install --backup=off
-STRIPINST  := $(INSTALL) -s --strip-program=$(CROSS)strip -m 0755
-
-CFLAGS     += -fPIC
-CFLAGS     += -Os
-CPPFLAGS   += -D_GNU_SOURCE
-CPPFLAGS   += -W -Wall
-ARFLAGS     = crus
-
-# Default to silent build, use V=1 to get verbose mode.
-ifeq ($V,1)
-Q           =
-PRINT       = @true
-MAKEFLAGS   =
-else
-Q           = @
-PRINT       = @printf
-MAKEFLAGS   = --no-print-directory --silent
-endif
-
-DISTFILES   = README LICENSE
-HEADERS     = lite.h
-OBJS       := chomp.o copyfile.o dir.o fexist.o fisdir.o fmode.o fsendfile.o
-OBJS       += ifconfig.o makepath.o pidfile.o pidfilefn.o rsync.o
-OBJS       += strlcpy.o strlcat.o strtonum.o tempfile.o
-DEPS       := $(OBJS:.o=.d)
-JUNK        = *~ *.bak *.map .*.d *.d DEADJOE semantic.cache *.gdb *.elf core core.*
-
-VER         = 1
-LIBNAME     = $(NAME)
-SOLIB       = $(LIBNAME).so.$(VER)
-SYMLIB      = $(LIBNAME).so
-STATICLIB   = $(LIBNAME).a
-TARGET      = $(STATICLIB) $(SOLIB)
-
-# Default install paths
-prefix     ?= /usr/local
-libdir     ?= $(prefix)/lib
-datadir    ?= $(prefix)/share/doc/$(LIBNAME)
-incdir     ?= $(prefix)/include
-
-# This magic trick looks like a comment, but works on BSD PMake
-#include <rules.mk>
-include rules.mk
-
-# Build rules
-all: $(TARGET)
-
-$(OBJS): Makefile
-
-$(SOLIB): Makefile $(OBJS)
-	$(PRINT) "  LINK    %s\n" $@
-	$(Q)$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $(OBJS)
-
-$(STATICLIB): Makefile $(OBJS)
-	$(Q)$(PRINT) "  ARCHIVE $@\n"
-	$(Q)$(AR) $(ARFLAGS) $@ $(OBJS)
-
-install-exec: all
-	$(PRINT) "  INSTALL $(DESTDIR)$(libdir)/$(SOLIB)\n"
-	$(Q)install -d $(DESTDIR)$(libdir)
-	$(Q)$(STRIPINST) $(SOLIB) $(DESTDIR)$(libdir)/$(SOLIB)
-	$(Q)ln -sf $(SOLIB) $(DESTDIR)$(libdir)/$(SYMLIB)
-
-install-dev:
-	$(Q)install -d $(DESTDIR)$(incdir)/$(LIBNAME)
-	$(Q)for file in $(HEADERS); do	                                		\
-		printf "  INSTALL $(DESTDIR)$(incdir)/$(LIBNAME)/$$file\n";		\
-		$(INSTALL) -m 0644 $$file $(DESTDIR)$(incdir)/$(LIBNAME)/$$file;	\
-	done
-	$(PRINT) "  INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n"
-	$(Q)install -d $(DESTDIR)$(libdir)
-	$(Q)$(INSTALL) $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
-	$(Q)install -d $(DESTDIR)$(datadir)
-	$(Q)for file in $(DISTFILES); do					\
-		printf "  INSTALL $(DESTDIR)$(datadir)/$$file\n";	\
-		install -m 0644 $$file $(DESTDIR)$(datadir)/$$file;	\
-	done
-
-install: install-exec install-dev
-
-uninstall:
-	-$(Q)$(RM) -r $(DESTDIR)$(datadir)
-	-$(Q)$(RM) -r $(DESTDIR)$(incdir)/$(LIBNAME)
-	-$(Q)$(RM) $(DESTDIR)$(libdir)/$(SOLIB)
-	-$(Q)$(RM) $(DESTDIR)$(libdir)/$(SYMLIB)
-	-$(Q)$(RM) $(DESTDIR)$(libdir)/$(STATICLIB)
-
-strip: $(TARGET)
-	$(Q)$(PRINT) "  STRIP   %s\n" $(TARGET)
-	$(Q)$(STRIP) --strip-unneeded $(TARGET)
-	$(Q)size $(TARGET)
-
-# Runs Clang scan-build on the whole tree
-check: clean
-	$(Q)scan-build $(MAKE) all
-
-clean:
-	-$(Q)$(RM) $(OBJS) $(DEPS) $(TARGET) $(SOLIB) $(STATICLIB)
-
-distclean:
-	-$(Q)$(RM) $(JUNK) unittest *.o *.a *.so* *.unittest
-
-dist:
-	$(Q)echo "Building .xz tarball of $(PKG) in parent dir..."
-	git archive --format=tar --prefix=$(PKG)/ v$(VERSION) | xz >../$(ARCHIVE)
-	$(Q)(cd ..; md5sum $(ARCHIVE) | tee $(ARCHIVE).md5)
-
-# Include automatically generated rules
-include $(DEPS)
@@ -0,0 +1,50 @@
+ACLOCAL_AMFLAGS     = -I m4
+
+lib_LTLIBRARIES     = libite.la
+pkgincludedir       = $(includedir)/lite
+pkginclude_HEADERS  = lite.h queue.h conio.h tree.h
+libite_la_SOURCES   = chomp.c copyfile.c dir.c fexist.c fisdir.c fmode.c fsendfile.c	\
+			ifconfig.c lfile.c makepath.c pidfile.c pidfilefn.c progress.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 2:2:0
+
+pkgconfigdir        = $(libdir)/pkgconfig
+pkgconfig_DATA      = libite.pc
+doc_DATA            = README.md LICENSE
+EXTRA_DIST          = README.md LICENSE ChangeLog.md
+
+## Generate MD5 checksum file
+MD5 = md5sum
+md5-dist:
+	@for file in $(DIST_ARCHIVES); do	\
+		$(MD5) $$file > $$file.md5;	\
+	done
+
+## Check if tagged in git
+release-hook:
+	if [ ! `git tag | 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;			\
+		if [ "$$yorn" != "y" -a "$$yorn" != "Y" ]; then				\
+			printf "OK, aborting release.\n";				\
+			exit 1;								\
+		fi;									\
+		echo;									\
+	else										\
+		echo;									\
+		printf "\e[1m\e[42mFound GIT release tag $(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[44m>>Remember to push tags!\e[0m\n";			\
+		echo;									\
+	fi
+
+## Target to run when building a release
+release: dist release-hook md5-dist
+	@for file in $(DIST_ARCHIVES); do						\
+		printf "$$file    \tDistribution tarball\n";				\
+		printf "$$file.md5\t"; cat $$file.md5 | cut -f1 -d' ';			\
+		mv $$file* ../;								\
+	done
@@ -1 +0,0 @@
-README.md
@@ -1,16 +1,17 @@
 -lite | Frog DNA, basically
 ===========================
+[![Travis Status][]][Travis]

 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][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] API.
+useful *BSD [sys/queue.h][4] and [sys/tree.h][7] API's.

-Libite aims to fill in the gaps missing in GLIBC/EGLIBC.  (It does not
-aimo to become another [GLIB][5] though.)  One such gap in GLIBC is the
-missing `_SAFE` macros in `sys/queue.h` &mdash; highly recommended when
-traversing lists to delete/free nodes.
+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 tje BSD `sys/queue.h` API &mdash; 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
@@ -21,6 +22,25 @@ For an introduction to why Libite happened, and how you can use it, see
 [this blog post][6].


+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 a
+include file namespace `lite/`, 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>
+
+The output from the `pkg-config` tool holds no surprises in this regard:
+
+    $ pkg-config --libs --static --cflags libite
+    -I/usr/local/include -L/usr/local/lib -lite
+
+
 Helper Macros
 -------------

@@ -31,11 +51,11 @@ Helper Macros

 - `blkdev(dev)`

-Create block device
+  Create block device

 - `chardev(dev)`

-Create character device
+  Create character device

 - `erase(path)`

@@ -49,17 +69,46 @@ Create character device

  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
+  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)`
+
+  Is 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))`
+  Shorter and more readable version of `var __attribute__ ((unused))`


 Generic Functions
@@ -107,6 +156,29 @@ Generic Functions
  Basic ifconfig like operations on an interface.  Only supports IPv4
  adresses.  Note that mask is not CIDR notation.

+- `lfopen(file, sep)`, `lfclose(lf)`
+
+  API for parsing UNIX style configuration files like `/etc/protocols`
+  and `/etc/services`.
+
+- `lftok(lf)`
+
+  Read tokens, delimeted 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.
@@ -123,20 +195,26 @@ Generic Functions

 - `pidfile(basename)`

-  Write a daemon pid file.  Creates a pidfile in `_PATH_VARRUN` using
-  either `basename` or, if `basename` is `NULL`, `__progname`.  The
-  file name has the form `/var/run/basename.pid`.
+  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:

-  Use this function to create a pid file for your daemon when it is
+        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 pidfile 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)`
@@ -147,6 +225,13 @@ Generic Functions

  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
@@ -156,18 +241,32 @@ Generic Functions

  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.
+  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.


 OpenBSD Functions
 -----------------

-The following are the popular OpenBSD string functions.
+The following are popular OpenBSD functions and highly useful macros.

 - `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, and also to export the path to the PID
+  file `__pidfile_name`, similar to `__progname`.  See previous section
+  for details.
+
 - `strlcpy(dst, src, len)`

  http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strlcpy.3
@@ -184,6 +283,24 @@ The following are the popular OpenBSD string functions.

  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
+
+
+Build & Install
+---------------
+
+The library is built for and developed on GNU/Linux systems as a light
+weight utility library.  Libite (LITE) employs the de facto standard GNU
+configure and build system:
+
+    ./configure
+    make all
+    make install
+

 TODO
 ----
@@ -197,10 +314,12 @@ TODO
 [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:
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoreconf -W portability -visfm
@@ -50,13 +50,13 @@ char *chomp(char *str)
 int main(void)
 {
 	int i; char t[][16] = { "hej\ndej", "Slime\n\n\\n", "Tripple\n\n\n", "" };
-	for (i = 0; t[i][0]; i++) printf("'%s'\n", chomp(t[i])); return 0;
+	for (i = 0; t[i][0]; i++) printf("[%02d]: '%s'\n", i, chomp(t[i])); return 0;
 }
 #endif

 /**
 * Local Variables:
- *  compile-command: "gcc -DUNITTEST -o chompy chomp.c && ./chompy"
+ *  compile-command: "make V=1 -f chomp.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = chomp.test clean
+
+include rules.mk
@@ -0,0 +1,19 @@
+# Use v2.61 for backwards compat with Ubuntu 12.04 LTS
+AC_PREREQ([2.61])
+AC_INIT(libite, 1.5.0, https://github.com/troglobit/libite/issues)
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AM_SILENT_RULES([yes])
+
+AC_CONFIG_SRCDIR(lite.h)
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_FILES([Makefile libite.pc])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CC
+AM_PROG_AR
+LT_INIT
+
+AC_HEADER_STDC
+AC_C_CONST
+
+AC_OUTPUT
@@ -0,0 +1,82 @@
+/* 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:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -261,6 +261,8 @@ int fcopyfile(FILE *src, FILE *dst)
 }

 #ifdef UNITTEST
+#include <err.h>
+
 int main(void)
 {
 	int i = 0;
@@ -272,14 +274,15 @@ int main(void)
 	};
 	FILE *src, *dst;

-	fprintf(stderr, "\n=>Start testing copy_filep()\n");
+	printf("=>Start testing fcopyfile()\n");
 	while (files[i]) {
-		fprintf(stderr, "fcopyfile(%s, %s)\t", files[i],
-			files[i + 1]);
+		printf("fcopyfile(%s, %s)\t", files[i], files[i + 1]);
 		src = fopen(files[i], "r");
 		dst = fopen(files[i + 1], "w");
-		if (fcopyfile(src, dst))
-			perror("Failed");
+		if (fcopyfile(src, dst)) {
+			if (!fisdir(files[i + 1]))
+			    err(1, "Failed fcopyfile(%s, %s)", files[i], files[i + 1]);
+		}

 		if (src)
 			fclose(src);
@@ -287,21 +290,23 @@ int main(void)
 			fclose(dst);

 		if (fexist(files[i + 2]))
-			fprintf(stderr, "OK => %s\n", files[i + 2]);
+			printf("OK => %s", files[i + 2]);
+		printf("\n");

 		erase(files[i + 2]);
 		i += 3;
 	}

-	printf("\n\n=>Start testing copyfile()\n");
+	printf("\n=>Start testing copyfile()\n");
 	i = 0;
 	while (files[i]) {
-		fprintf(stderr, "copyfile(%s, %s)\t", files[i], files[i + 1]);
+		printf("copyfile(%s, %s)\t", files[i], files[i + 1]);
 		if (!copyfile(files[i], files[i + 1], 0, 0))
-			perror("Failed");
+			err(1, "Failed copyfile(%s, %s)", files[i], files[i + 1]);

 		if (fexist(files[i + 2]))
-			fprintf(stderr, "OK => %s\n", files[i + 2]);
+			printf("OK => %s", files[i + 2]);
+		printf("\n");

 		erase(files[i + 2]);
 		i += 3;
@@ -313,7 +318,7 @@ int main(void)

 /**
 * Local Variables:
- *  compile-command: "gcc -g -o coppy -DUNITTEST copyfile.c fisdir.c fexist.c fmode.c && ./coppy"
+ *  compile-command: "make V=1 -f copyfile.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = fisdir.o fexist.o fmode.o
+TARGET      = $(OBJS) copyfile.test clean
+
+include rules.mk
@@ -123,7 +123,7 @@ int dir(const char *dir, const char *type, int (*filter) (const char *file), cha
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "otn/c.h"
+#include "lite.h"

 #define DIR_TYPE_IMAGE  ".img"
 #define DIR_TYPE_SYSLOG ""
@@ -138,7 +138,7 @@ int simulate_files(int creat)
 		"rr109.img", "rx100.img", "rx107.img", "rm957.img", "messages"
 	};

-	for (i = 0; i < ARRAY_ELEMENTS(files); i++) {
+	for (i = 0; i < NELEMS(files); i++) {
 		if (creat)
 			touch(files[i]);
 		else
@@ -217,11 +217,11 @@ int main(int argc, char *argv[])

 	return 0;
 }
-#endif				/* UNITTEST */
+#endif /* UNITTEST */

 /**
 * Local Variables:
- *  compile-command: "gcc -g -DUNITTEST -o unittest dir.c"
+ *  compile-command: "make V=1 -f dir.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = dir.test clean
+
+include rules.mk
@@ -44,8 +44,36 @@ int fexist(char *file)
 	return 1;
 }

+#ifdef UNITTEST
+#include "lite.h"
+
+int main(void)
+{
+	int i = 0;
+	struct { char *file; int exist; } arr[] = {
+		{ "/etc/passwd", 1 },
+		{ "/etc/kalle",  0 },
+		{ "/sbin/init",  1 },
+		{ "/dev/null",   1 },
+		{ NULL,  0 },
+	};
+	FILE *src, *dst;
+
+	for (i = 0; i < NELEMS(arr); i++) {
+		if (fexist(arr[i].file) != arr[i].exist)
+			err(1, "Failed fexist(%s)", arr[i].file ?: "NULL");
+		else
+			printf("File %-11s %-14s => OK!\n", arr[i].file ?: "NULL",
+			       arr[i].exist ? "does exist" : "does not exist");
+	}
+
+	return 0;
+}
+#endif /* UNITTEST */
+
 /**
 * Local Variables:
+ *  compile-command: "make V=1 -f fexist.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = fexist.test clean
+
+include rules.mk
@@ -42,8 +42,37 @@ int fisdir(char *file)
 	return 0;
 }

+#ifdef UNITTEST
+#include "lite.h"
+
+int main(void)
+{
+	int i = 0;
+	struct { char *file; int exist; } arr[] = {
+		{ "/etc/passwd", 0 },
+		{ "/etc/",       1 },
+		{ "/sbin/init",  0 },
+		{ "/dev/null",   0 },
+		{ "/dev/",       1 },
+		{ NULL,  0 },
+	};
+	FILE *src, *dst;
+
+	for (i = 0; i < NELEMS(arr); i++) {
+		if (fisdir(arr[i].file) != arr[i].exist)
+			err(1, "Failed fisdir(%s)", arr[i].file ?: "NULL");
+		else
+			printf("fisdir() %-11s %-18s => OK!\n", arr[i].file ?: "NULL",
+			       arr[i].exist ? "is a directory" : "is NOT a directory");
+	}
+
+	return 0;
+}
+#endif /* UNITTEST */
+
 /**
 * Local Variables:
+ *  compile-command: "make V=1 -f fisdir.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = fisdir.test clean
+
+include rules.mk
@@ -77,6 +77,7 @@ size_t fsendfile(FILE *src, FILE *dst, size_t len)
 }

 #ifdef UNITTEST
+#include <err.h>
 #include <unistd.h>

 int main(void)
@@ -93,12 +94,12 @@ int main(void)
 	while (files[i]) {
                src = fopen(files[i], "r");
                dst = fopen(files[i + 1], "w");
-		fprintf(stderr, "fsendfile(%s, %s, 512)\t", files[i], files[i + 1]);
+		printf("fsendfile(%s, %s, 512)\t", files[i], files[i + 1]);
 		if (-1 == fsendfile(src, dst, 512))
-			perror("Failed");
+			err(1, "Failed fsendfile(%s, %s)", files[i], files[i + 1]);

 		if (!access(files[i + 1], F_OK))
-			fprintf(stderr, "OK => %s\n", files[i + 1]);
+			printf("OK => %s\n", files[i + 1]);

 		remove(files[i + 1]);
 		i += 2;
@@ -110,7 +111,7 @@ int main(void)

 /**
 * Local Variables:
- *  compile-command: "gcc -g -o sendy -DUNITTEST fsendfile.c && ./sendy"
+ *  compile-command: "make V=1 -f fsendfile.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = fsendfile.test clean
+
+include rules.mk
@@ -0,0 +1,235 @@
+/* Parse UNIX /etc configuration files like /etc/protocols and /etc/services
+ *
+ * Copyright (c) 2015  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 <stdio.h>		/* FILE */
+#include <stdlib.h>		/* atoi() */
+#include <string.h>		/* strlen(), strncmp(), strtok_r() */
+#include <sys/param.h>		/* MAX() */
+
+typedef struct lfile {
+	FILE *fp;
+	char buf[256];
+	char *sep, *save;
+} lfile_t;
+
+/**
+ * lfopen - Open file and return parsing context
+ * @file: File to parse
+ * @sep:  Separator(s) to use in lftok()
+ *
+ * Returns:
+ * Pointer to a &lftile_t parser context, or %NULL on error.
+ */
+lfile_t *lfopen(char *file, char *sep)
+{
+	lfile_t *lf;
+
+	if (!file || !sep) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	/* Use calloc for clearing buf on behalf of lftok() */
+	lf = calloc(sizeof(*lf), sizeof(char));
+	if (lf) {
+		lf->fp   = fopen(file, "r");
+		lf->sep  = sep;
+		lf->save = lf->buf;
+
+		if (!lf->fp) {
+			free(lf);
+			return NULL;
+		}
+	}
+
+	return lf;
+}
+
+/**
+ * lfclose - Close a parser context
+ * @lf: Pointer to &lfile_t context from lfopen()
+ */
+void lfclose(lfile_t *lf)
+{
+	if (!lf)
+		return;
+
+	if (lf->fp)
+		fclose(lf->fp);
+	free(lf);
+}
+
+/**
+ * lftok - Get next token in file
+ * @lf: Pointer to &lfile_t context from lfopen()
+ *
+ * Returns:
+ * Next token, read from file previously opened with lfopen(),
+ * or %NULL if EOF.
+ */
+char *lftok(lfile_t *lf)
+{
+	char *token;
+
+	if (!lf || !lf->fp || !lf->sep) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	token = strtok_r(NULL, lf->sep, &lf->save);
+	if (!token) {
+		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)
+				continue;
+			
+			return token;
+		}
+
+		errno = ENOENT;
+		return NULL;
+	}
+
+	return token;
+}
+
+/**
+ * lfgetkey - Find key in file
+ * @lf:  Pointer to &lfile_t context from lfopen()
+ * @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
+ * 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.
+ */
+char *lfgetkey(lfile_t *lf, char *key)
+{
+	char *token;
+
+	while ((token = lftok(lf))) {
+		if (token[0] == '#')
+			continue;
+
+		if (!strncmp(token, key, MAX(strlen(token), strlen(key))))
+			return lftok(lf);
+	}
+
+	return NULL;
+}
+
+/**
+ * lfgetint - Same as lfgetkey() but returns an integer
+ * @lf:  Pointer to &lfile_t context from lfopen()
+ * @key: Key to look for
+ *
+ * This function is the same as lfgetkey() but returns the positive
+ * integer value for the matching @key, if found.
+ *
+ * Returns:
+ * The positive integer value for @key, or -1 if not found.
+ */
+int lfgetint(lfile_t *lf, char *key)
+{
+	char *token = lfgetkey(lf, key);
+
+	if (token)
+		return atoi(token);
+
+	return -1;
+}
+
+/**
+ * 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
+ *
+ * This is a convenience wrapper for lfopen(), lfgetint(), and
+ * lfclose().
+ *
+ * Returns:
+ * The positive integer value for @key, or -1 if not found.
+ */
+int fgetint(char *file, char *sep, char *key)
+{
+	int val = -1;
+	lfile_t *lf;
+
+	lf = lfopen(file, sep);
+	if (lf) {
+		val = lfgetint(lf, key);
+		lfclose(lf);
+	}
+
+	return val;
+}
+
+#ifdef UNITTEST
+int main(void)
+{
+	int val;
+	lfile_t lf;
+
+	val = fgetint("/etc/protocols", " \n\t", "udp");
+	if (val == -1) {
+		perror("Failed locating 'udp' protocol");
+		return 1;
+	}
+	printf("udp has proto %d\n", val);
+
+	val = fgetint("/etc/services", " /\n\t", "ftp");
+	if (val == -1) {
+		perror("Failed locating 'ftp' service");
+		return 1;
+	}
+	printf("ftp is inet port %d\n", val);
+
+	val = fgetint("/etc/group", "x:\n", "utmp");
+	if (val == -1) {
+		perror("Failed locating group 'utmp'");
+		return 1;
+	}
+	printf("utmp is gid %d\n", val);
+
+	val = fgetint("/etc/passwd", "x:\n", "nobody");
+	if (val == -1) {
+		perror("Failed locating user 'nobody'");
+		return 1;
+	}
+	printf("nobody is uid %d\n", val);
+
+	return 0;
+}
+#endif
+
+/**
+ * Local Variables:
+ *  compile-command: "make V=1 -f lfile.mk"
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = lfile.test clean
+
+include rules.mk
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@
+Description: Frog DNA, basically
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lite
+Cflags: -I${includedir}
+
@@ -1,7 +1,7 @@
-/* Collection of utility funcs and C library extensions for finit & its plugins
+/* Collection of frog DNA
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2015  Joachim Nilsson <troglobit@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
@@ -22,10 +22,10 @@
 * THE SOFTWARE.
 */

-#ifndef FINIT_LITE_H_
-#define FINIT_LITE_H_
+#ifndef LITE_H_
+#define LITE_H_

-#include <error.h>
+#include <err.h>
 #include <stdio.h>
 #include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
 #include <string.h>
@@ -34,6 +34,8 @@
 #include <sys/param.h> /* MAX(), isset(), setbit(), TRUE, FALSE, et consortes. :-) */
 #include <unistd.h>

+typedef struct lfile lfile_t;
+
 char   *chomp      (char *str);

 int     fexist     (char *file);
@@ -48,6 +50,13 @@ size_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);

@@ -69,17 +78,19 @@ 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

+int tree(char *path, int show_perms);
+
 #ifndef touch
-# define touch(x) do { if (mknod((x), S_IFREG|0644, 0) && errno != EEXIST) error(0, errno, "Failed creating %s", x); } while (0)
+# 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) error(0, errno, "Failed creating directory %s", x); } while (0)
+# 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) error(0, errno, "Failed creating FIFO %s", x); } while (0)
+# 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) error(0, errno, "Failed removing %s", x); } while (0)
+# 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)))
@@ -87,19 +98,48 @@ long long strtonum (const char *numstr, long long minval, long long maxval, cons
 #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;
+   if (!dir)
+	   return 0;
+
+   if (strlen(dir) > 0)
+	   return dir[strlen(dir) - 1] == '/';
+
+   return 0;
 }

 /* Convert string to natural number (0-2147483647), returns -1 on error. */
@@ -118,23 +158,23 @@ static inline int atonum(const char *str)
 }

 /* Validate string, non NULL and not zero length */
-static inline int string_valid (const char *s)
+static inline int string_valid(const char *s)
 {
-   return s && strlen (s);
+   return s && strlen(s);
 }

 /* Relaxed comparison, e.g., sys_string_match("small", "smaller") => TRUE */
-static inline int string_match (const char *a, const char *b)
+static inline int string_match(const char *a, const char *b)
 {
-   size_t min = MIN(strlen (a), strlen (b));
+   size_t min = MIN(strlen(a), strlen(b));

-   return !strncasecmp (a, b, min);
+   return !strncasecmp(a, b, min);
 }

 /* Strict comparison, e.g., sys_string_match("small", "smaller") => FALSE */
 static inline int string_compare (const char *a, const char *b)
 {
-   return strlen (a) == strlen (b) && !strcmp (a, b);
+   return strlen(a) == strlen(b) && !strcmp(a, b);
 }

 /* Strict comparison, like sys_string_compare(), but case insensitive,
@@ -145,12 +185,26 @@ static inline int string_case_compare (const char *a, const char *b)
   return strlen (a) == strlen (b) && !strcasecmp (a, b);
 }

-/* 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)
+#define min(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a < _b ? _a : _b;		\
+	})

-#endif /* FINIT_LITE_H_ */
+#define max(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a > _b ? _a : _b;		\
+	})
+
+/* 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:
@@ -0,0 +1 @@
+*.m4
@@ -55,7 +55,7 @@ int makepath(char *dir)

 /********************************* UNIT TESTS ************************************/
 #ifdef UNITTEST
-#include <stdio.h>
+#include "lite.h"

 int checkpath(char *dir)
 {
@@ -63,7 +63,8 @@ int checkpath(char *dir)
 	struct stat sb;

 	snprintf(tmp, sizeof(tmp), "ls -ld %s", dir);
-	system(tmp);
+	if (system(tmp))
+		perror("system");

 	if (!stat(dir, &sb) && S_ISDIR(sb.st_mode))
 		return 0;
@@ -98,11 +99,14 @@ int main(void)
 		NULL
 	};

-	fprintf(stderr, "Testing makepath() ...\n");
+	for (i = 0; list[i]; i++)
+		rmdir(list[i]);
+
+	printf("Testing makepath() ...\n");
 	for (i = 0; list[i] && !ret; i++)
 		ret = test_makepath(list[i]);

-	fprintf(stderr, "\nCleaning up ...\n");
+	printf("\nCleaning up ...\n");
 	for (i = 0; list[i]; i++)
 		rmdir(list[i]);

@@ -112,7 +116,7 @@ int main(void)

 /**
 * Local Variables:
- *  compile-command: "gcc -g -o unittest -D_GNU_SOURCE -DUNITTEST makepath.c && ./unittest"
+ *  compile-command: "make V=1 -f makepath.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = makepath.test clean
+
+include rules.mk
@@ -1,4 +1,5 @@
-/*	$OpenBSD: pidfile.c,v 1.10 2014/06/30 00:26:22 deraadt Exp $	*/
+/*	Updated by troglobit for libite/finit/uftpd projects 2016/03/19 */
+/*	$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 $	*/

 /*-
@@ -30,6 +31,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#include <sys/stat.h>		/* utimensat() */
 #include <sys/types.h>
 #include <errno.h>
 #include <paths.h>
@@ -37,31 +39,43 @@
 #include <stdlib.h>
 #include <unistd.h>

-static char *pidfile_path;
+#ifndef pidfile
+static char *pidfile_path = NULL;
 static pid_t pidfile_pid;

 static void pidfile_cleanup(void);

+const  char *__pidfile_name = NULL;
 extern char *__progname;

 int
 pidfile(const char *basename)
 {
-	int save_errno, result;
+	int save_errno;
+	int atexit_already;
 	pid_t pid;
 	FILE *f;

 	if (basename == NULL)
 		basename = __progname;

+	pid = getpid();
+	atexit_already = 0;
+
 	if (pidfile_path != NULL) {
+		if (0) { //pid == pidfile_pid) {
+			printf("Updating mtime ...\n");
+			utimensat(0, pidfile_path, NULL, 0);
+			return 0;
+		}
 		free(pidfile_path);
 		pidfile_path = NULL;
+		__pidfile_name = NULL;
+		atexit_already = 1;
 	}

 	/* _PATH_VARRUN includes trailing / */
-	result = asprintf(&pidfile_path, "%s%s.pid", _PATH_VARRUN, basename);
-	if (result == -1 || pidfile_path == NULL)
+	if (asprintf(&pidfile_path, "%s%s.pid", _PATH_VARRUN, basename) == -1)
 		return (-1);

 	if ((f = fopen(pidfile_path, "w")) == NULL) {
@@ -72,7 +86,6 @@ pidfile(const char *basename)
 		return (-1);
 	}

-	pid = getpid();
 	if (fprintf(f, "%ld\n", (long)pid) <= 0 || fflush(f) != 0) {
 		save_errno = errno;
 		(void) fclose(f);
@@ -84,6 +97,13 @@ pidfile(const char *basename)
 	}
 	(void) fclose(f);

+	/*
+	 * LITE extension, no need to set up another atexit() handler
+	 * if user only called us to update the mtime of the PID file
+	 */
+	if (atexit_already)
+		return (0);
+
 	pidfile_pid = pid;
 	if (atexit(pidfile_cleanup) < 0) {
 		save_errno = errno;
@@ -94,6 +114,7 @@ pidfile(const char *basename)
 		errno = save_errno;
 		return (-1);
 	}
+	__pidfile_name = pidfile_path;

 	return (0);
 }
@@ -105,3 +126,4 @@ pidfile_cleanup(void)
 	if (pidfile_path != NULL && pidfile_pid == getpid())
 		(void) unlink(pidfile_path);
 }
+#endif
@@ -21,6 +21,7 @@
 #include <signal.h>
 #include <unistd.h>

+extern char *__pidfile_name;
 extern char *chomp(char *str);

 /**
@@ -119,47 +120,132 @@ int pidfile_signal(const char *pidfile, int signal)


 /********************************* UNIT TESTS ************************************/
-#ifdef UTEST_PIDFN
-#define PIDFILE "/var/run/unittest.pid"
+#ifdef UNITTEST
+#include <paths.h>
+#include <stdarg.h>
+#include <time.h>
+#include "lite.h"

-static void sigterm_handler(int signo)
+extern char *__progname;
+static char PIDFILE[42];
+static int verbose = 0;
+static struct stat before, after;
+
+static int test(int result, const char *fmt, ...)
 {
-	fprintf(stderr, "Exiting ...\n");
+	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 dots[] = " .....................................................................";
+
+	va_start(ap, fmt);
+	len = vsnprintf(buf, sizeof(buf), fmt, ap);
+	va_end(ap);
+
+	write(STDERR_FILENO, buf, len);
+	write(STDERR_FILENO, dots, 60 - len); /* pad with dots. */
+
+	if (!result)
+		write(STDERR_FILENO, success, strlen(success));
+	else
+		write(STDERR_FILENO, failure, strlen(failure));
+
+	return result;
 }

-static void sigalrm_handler(int signo)
+static inline int timespec_newer(const struct timespec *a, const struct timespec *b)
+{
+	if (a->tv_sec != b->tv_sec)
+		return a->tv_sec > b->tv_sec;
+
+	return a->tv_nsec > b->tv_nsec;
+}
+
+char *timespec2str(struct timespec *ts, char *buf, size_t len)
+{
+	size_t ret, pos;
+	struct tm t;
+
+	memset(buf, 0, len);
+
+	tzset();
+	if (localtime_r(&(ts->tv_sec), &t) == NULL)
+		return buf;
+
+	ret = strftime(buf, len, "%F %T", &t);
+	if (ret == 0)
+		return buf;
+	len -= ret - 1;
+
+	pos  = strlen(buf);
+	len -= pos;
+	snprintf(&buf[pos], len, ".%09ld", ts->tv_nsec);
+
+	return buf;
+}
+
+static void sigterm_handler(int UNUSED(signo))
+{
+	if (verbose)
+		printf("Exiting ...\n");
+}
+
+static void sigalrm_handler(int UNUSED(signo))
 {
-	fprintf(stderr, "Testing pidfile() ...\n");
 	pidfile(NULL);
+	if (!fexist(PIDFILE))
+		err(1, "failed creating %s", PIDFILE);
+	stat(PIDFILE, &before);
 }

-int main(void)
+static int mtime()
 {
+	int ret;
+	char buf[80];
+
+	/* Must sleep a while here otherwise we execute too fast => no mtime change :-( */
+	usleep(10000);
+
+	if (verbose)
+		printf("Calling pidfile() again to update mtime ...\n");
+	pidfile(NULL);
+	stat(PIDFILE, &after);
+
+	ret = timespec_newer(&after.st_mtim, &before.st_mtim);
+	if (verbose) {
+		printf("Before: %s\n", timespec2str(&before.st_mtim, buf, sizeof(buf)));
+		printf("After : %s\n", timespec2str(&after.st_mtim, buf, sizeof(buf)));
+	}
+
+	return !ret;
+}
+
+int main(int argc, char *argv[])
+{
+	if (argc > 1 && !strcmp(argv[1], "-v"))
+		verbose = 1;
+
+	snprintf(PIDFILE, sizeof(PIDFILE), "%s%s.pid", _PATH_VARRUN, __progname);
+
 	signal(SIGTERM, sigterm_handler);
 	signal(SIGALRM, sigalrm_handler);
-	alarm(3);
+	alarm(1);

-	fprintf(stderr, "Testing pidfile_poll() ...\n");
-	if (!pidfile_poll(PIDFILE))
-		fprintf(stderr, "Timed out!\n");
-	else
-		fprintf(stderr, "We got signal!\n");
+	return     test(pidfile_poll(PIDFILE) != getpid(), "Testing pidfile_poll()")
+		|| test(strcmp(__pidfile_name, PIDFILE),   "Testing __pidfile_name vs guessed PID filename")
+		|| test(mtime(),                           "Testing mtime update of followup pidfile() call")
+		|| test(pidfile_signal(PIDFILE, SIGTERM),  "Testing signalling ourselves")
+		;

-	system("ls -ld " PIDFILE);
-
-	fprintf(stderr, "Reading pid file, should be %d ...\n", getpid());
-        fprintf(stderr, "=> %d\n", pidfile_read(PIDFILE));
-
-        fprintf(stderr, "Signalling ourselves ...\n");
-
-	return pidfile_signal(PIDFILE, SIGTERM);
+	return 0;
 }
-#endif  /* UTEST_PIDFN */
+#endif /* UNITTEST */

 /**
 * Local Variables:
- *  compile-command: "gcc -g -o unittest -DUTEST_PIDFN pidfile.c chomp.c pidfilefn.c && ./unittest"
- *  version-control: t
+ *  compile-command: "make V=1 -f pidfilefn.mk"
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
 * End:
@@ -0,0 +1,6 @@
+CFLAGS      = -W -Wall -Wextra -Werror
+OBJS        = pidfile.o chomp.o fexist.o
+ASROOT      = 1
+TARGET      = clean $(OBJS) pidfilefn.test
+
+include rules.mk
@@ -0,0 +1,175 @@
+/* Simple termios based progress bar
+ *
+ * Copyright (c) 2012-2015  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 <limits.h>		/* INT_MAX */
+#include <stdio.h>
+#include <string.h>
+
+#include "conio.h"
+
+#define SPINNER_THROB   ".oOo"
+#define SPINNER_PULSAR  ".oO°Oo."
+#define SPINNER_ARROW   "v<^>"
+#define SPINNER_STAR    ".oO@*"
+#define SPINNER_DEFAULT "|/-\\"
+
+static char spinner(char *style)
+{
+	size_t num;
+	static unsigned int i = 0;
+
+	if (!style)
+		style = SPINNER_DEFAULT;
+	num = strlen(style);
+
+	return style[i++ % num]; /* % Number of states in 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.
+ *
+ * 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.
+ *
+ * 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.
+ */
+void progress(int percent, int max_width)
+{
+	int i, bar;
+
+	/* Adjust for progress bar overhead */
+	max_width -= 10;
+
+	if (0 == percent)
+		hidecursor();
+
+	fprintf(stderr, "\r%3d%% %c [", percent, spinner(NULL));
+
+	bar = percent * max_width / 100;
+	for (i = 0; i < max_width; i++) {
+		if (i > bar)
+			fputc(' ', stderr);
+		else if (i == bar)
+			fputc('>', stderr);
+		else
+			fputc('=', stderr);
+	}
+
+	fprintf(stderr, "]");
+	if (100 == percent) {
+		showcursor();
+		fputc('\n', stderr);
+	}
+}
+
+void progress_simple(int percent)
+{
+	static int last = 1;
+	int ratio, numout;
+
+	if (!percent && last) {
+		last = 0;
+		fputs("0%       25%       50%       75%       100%\n"
+		      "|---------+---------+---------+---------|\n"
+		      "|", stderr);
+		return;
+	}
+
+	ratio = 40 * percent / 100;
+	numout = ratio - last;
+
+	if (ratio <= last)
+		return;
+
+	last = ratio;
+
+	while (numout--) {
+		if (ratio != 40 || numout)
+			putc('=', stderr);
+		else
+			putc('|', stderr);
+	}
+}
+
+#ifdef UNITTEST
+#include <stdlib.h>		/* atexit() */
+#include <unistd.h>		/* usleep() */
+
+#define MAX_WIDTH    80
+#define msleep(msec) usleep(msec * 1000)
+
+static void bye(void)
+{
+	showcursor();
+}
+
+static void testit(int fn, int percent)
+{
+	if (fn)
+		progress(percent, MAX_WIDTH);
+	else
+		progress_simple(percent);
+}
+
+static void test(int fn)
+{
+	int i, percent, block = 0, num = 85;
+
+	while (block < num) {
+		percent = block * 100 / num;
+		for (i = 0; i < 10; i++) {
+			testit(fn, percent);
+			msleep(5);
+		}
+		block++;
+		msleep(10);
+	}
+	testit(fn, 100);
+}
+
+int main(void)
+{
+	atexit(bye);
+	hidecursor();
+
+	printf("\nAdvanced:\n");
+	test(1);
+	printf("\nSimple:\n");
+	test(0);
+	printf("\n");
+
+	return 0;
+}
+#endif	/* UNITTEST */
+
+/**
+ * Local Variables:
+ *  compile-command: "make V=1 -f progress.mk"
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = progress.test clean
+
+include rules.mk
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.h,v 1.38 2013/07/03 15:05:21 fgsch Exp $	*/
+/*	$OpenBSD: queue.h,v 1.43 2015/12/28 19:38:40 millert Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/

 /*
@@ -36,8 +36,8 @@
 #define	_SYS_QUEUE_H_

 /*
- * This file defines five types of data structures: singly-linked lists, 
- * lists, simple queues, tail queues, and circular queues.
+ * This file defines five types of data structures: singly-linked lists,
+ * lists, simple queues, tail queues and XOR simple queues.
 *
 *
 * A singly-linked list is headed by a single forward pointer. The elements
@@ -57,7 +57,7 @@
 * or after an existing element or at the head of the list. A list
 * may only be traversed in the forward direction.
 *
- * A simple queue is headed by a pair of pointers, one the head of the
+ * A simple queue is headed by a pair of pointers, one to the head of the
 * list and the other to the tail of the list. The elements are singly
 * linked to save space, so elements can only be removed from the
 * head of the list. New elements can be added to the list before or after
@@ -71,13 +71,10 @@
 * after an existing element, at the head of the list, or at the end of
 * the list. A tail queue may be traversed in either direction.
 *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
+ * An XOR simple queue is used in the same way as a regular simple queue.
+ * The difference is that the head structure also includes a "cookie" that
+ * is XOR'd with the queue pointer (first, last or next) to generate the
+ * real pointer value.
 *
 * For details on the use of these macros, see the queue(3) manual page.
 */
@@ -95,15 +92,15 @@
 struct name {								\
 	struct type *slh_first;	/* first element */			\
 }
- 
+
 #define	SLIST_HEAD_INITIALIZER(head)					\
 	{ NULL }
- 
+
 #define SLIST_ENTRY(type)						\
 struct {								\
 	struct type *sle_next;	/* next element */			\
 }
- 
+
 /*
 * Singly-linked List access methods.
 */
@@ -157,8 +154,8 @@ struct {								\
 			curelm = curelm->field.sle_next;		\
 		curelm->field.sle_next =				\
 		    curelm->field.sle_next->field.sle_next;		\
-		_Q_INVALIDATE((elm)->field.sle_next);			\
 	}								\
+	_Q_INVALIDATE((elm)->field.sle_next);				\
 } while (0)

 /*
@@ -179,7 +176,7 @@ struct {								\
 }

 /*
- * List access methods
+ * List access methods.
 */
 #define	LIST_FIRST(head)		((head)->lh_first)
 #define	LIST_END(head)			NULL
@@ -316,6 +313,14 @@ struct {								\
 		(head)->sqh_last = &(elm)->field.sqe_next;		\
 } while (0)

+#define SIMPLEQ_CONCAT(head1, head2) do {				\
+	if (!SIMPLEQ_EMPTY((head2))) {					\
+		*(head1)->sqh_last = (head2)->sqh_first;		\
+		(head1)->sqh_last = (head2)->sqh_last;			\
+		SIMPLEQ_INIT((head2));					\
+	}								\
+} while (0)
+
 /*
 * XOR Simple queue definitions.
 */
@@ -395,7 +400,7 @@ struct {								\
 		    XSIMPLEQ_XOR(head, &(elm)->field.sqx_next);		\
 } while (0)

-		    
+
 /*
 * Tail queue definitions.
 */
@@ -414,8 +419,8 @@ struct {								\
 	struct type **tqe_prev;	/* address of previous next element */	\
 }

-/* 
- * tail queue access methods 
+/*
+ * Tail queue access methods.
 */
 #define	TAILQ_FIRST(head)		((head)->tqh_first)
 #define	TAILQ_END(head)			NULL
@@ -516,133 +521,13 @@ struct {								\
 	_Q_INVALIDATE((elm)->field.tqe_next);				\
 } while (0)

-/*
- * Circular queue definitions.
- */
-#define CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define CIRCLEQ_HEAD_INITIALIZER(head)					\
-	{ CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
-
-#define CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue access methods 
- */
-#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
-#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
-#define	CIRCLEQ_END(head)		((void *)(head))
-#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
-#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
-#define	CIRCLEQ_EMPTY(head)						\
-	(CIRCLEQ_FIRST(head) == CIRCLEQ_END(head))
-
-#define CIRCLEQ_FOREACH(var, head, field)				\
-	for((var) = CIRCLEQ_FIRST(head);				\
-	    (var) != CIRCLEQ_END(head);					\
-	    (var) = CIRCLEQ_NEXT(var, field))
-
-#define	CIRCLEQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = CIRCLEQ_FIRST(head);				\
-	    (var) != CIRCLEQ_END(head) &&				\
-	    ((tvar) = CIRCLEQ_NEXT(var, field), 1);			\
-	    (var) = (tvar))
-
-#define CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-	for((var) = CIRCLEQ_LAST(head);					\
-	    (var) != CIRCLEQ_END(head);					\
-	    (var) = CIRCLEQ_PREV(var, field))
-
-#define	CIRCLEQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = CIRCLEQ_LAST(head, headname);			\
-	    (var) != CIRCLEQ_END(head) && 				\
-	    ((tvar) = CIRCLEQ_PREV(var, headname, field), 1);		\
-	    (var) = (tvar))
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) do {						\
-	(head)->cqh_first = CIRCLEQ_END(head);				\
-	(head)->cqh_last = CIRCLEQ_END(head);				\
-} while (0)
-
-#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == CIRCLEQ_END(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-} while (0)
-
-#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == CIRCLEQ_END(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-} while (0)
-
-#define CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = CIRCLEQ_END(head);			\
-	if ((head)->cqh_last == CIRCLEQ_END(head))			\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-} while (0)
-
-#define CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.cqe_next = CIRCLEQ_END(head);			\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == CIRCLEQ_END(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-} while (0)
-
-#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
-	if ((elm)->field.cqe_next == CIRCLEQ_END(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == CIRCLEQ_END(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-	_Q_INVALIDATE((elm)->field.cqe_prev);				\
-	_Q_INVALIDATE((elm)->field.cqe_next);				\
-} while (0)
-
-#define CIRCLEQ_REPLACE(head, elm, elm2, field) do {			\
-	if (((elm2)->field.cqe_next = (elm)->field.cqe_next) ==		\
-	    CIRCLEQ_END(head))						\
-		(head)->cqh_last = (elm2);				\
-	else								\
-		(elm2)->field.cqe_next->field.cqe_prev = (elm2);	\
-	if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) ==		\
-	    CIRCLEQ_END(head))						\
-		(head)->cqh_first = (elm2);				\
-	else								\
-		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
-	_Q_INVALIDATE((elm)->field.cqe_prev);				\
-	_Q_INVALIDATE((elm)->field.cqe_next);				\
+#define TAILQ_CONCAT(head1, head2, field) do {				\
+	if (!TAILQ_EMPTY(head2)) {					\
+		*(head1)->tqh_last = (head2)->tqh_first;		\
+		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
+		(head1)->tqh_last = (head2)->tqh_last;			\
+		TAILQ_INIT((head2));					\
+	}								\
 } while (0)

 #endif	/* !_SYS_QUEUE_H_ */
@@ -198,7 +198,8 @@ static int prune(char *dst, char **new_files, int new_num)
 #define SRC  BASE "src/"
 #define DST  BASE "dst/"

-char *files[] = {
+static int verbose = 0;
+static char *files[] = {
 	SRC "sub1/1.tst",
 	SRC "sub1/2.tst",
 	SRC "sub1/3.tst",
@@ -240,51 +241,62 @@ void setup_test(void)
 	}
 }

-int run_test()
+static void check_tree(char *heading, char *dir)
 {
+	if (verbose) {
+		char cmd[128];
+
+		if (heading)
+			puts(heading);
+
+		tree(dir, 1);
+	}
+}
+
+int run_test(void)
+{
+	int result = 0;
+
 #if 0
 	setup_test();
-	puts("Before:");
-	system("tree -np " BASE);
+	check_tree("Before:", BASE);

-	rsync(SRC, DST, 0, NULL);
-	puts("After:");
-	system("tree -np " BASE);
+	result += rsync(SRC, DST, 0, NULL);
+	check_tree("After:", BASE);
 	cleanup_test();
 #endif

 	setup_test();
-	rsync(BASE "src", DST, 0, NULL);
-	puts("Only partial rsync of src <-- No slash!");
-	system("tree -np " BASE);
+	result += rsync(BASE "src", DST, 0, NULL);
+	check_tree("Only partial rsync of src <-- No slash!", BASE);
 #if 0
 	cleanup_test();
 	setup_test();
-	rsync(BASE "src/sub1", BASE "dst", 0, NULL);
-	puts("Only partial rsync of src/sub1 <-- No slashes!!");
-	system("tree -np " BASE);
+	result += rsync(BASE "src/sub1", BASE "dst", 0, NULL);
+	check_tree("Only partial rsync of src/sub1 <-- No slashes!!", BASE);

 	cleanup_test();
 	setup_test();
-	rsync(BASE "src/sub1/", DST, 0, NULL);
-	puts("Only partial rsync of src/sub1/");
-	system("tree -np " BASE);
+	result += rsync(BASE "src/sub1/", DST, 0, NULL);
+	check_tree("Only partial rsync of src/sub1/", BASE);

 	cleanup_test();
 	setup_test();
-	rsync(BASE "src/sub1", DST, 0, NULL);
-	puts("Only partial rsync of src/sub1 <-- No slash!");
-	system("tree -np " BASE);
+	result += rsync(BASE "src/sub1", DST, 0, NULL);
+	check_tree("Only partial rsync of src/sub1 <-- No slash!", BASE);

-	rsync("/etc", "/var/tmp", 0, NULL);
-	puts("Real life test:");
-	system("tree -np /var/tmp");
+	result += rsync("/etc", "/var/tmp", 0, NULL);
+	check_tree("Real life test:", "/var/tmp");
 #endif
-	return 0;
+
+	return result;
 }

 int main(int argc, char *argv[])
 {
+	if (argc > 1)
+		verbose = !strncmp("-v", argv[1], 2);
+
 	atexit(cleanup_test);

 	return run_test();
@@ -293,7 +305,7 @@ int main(int argc, char *argv[])

 /**
 * Local Variables:
- *  compile-command: "make -f rsync.mk"
+ *  compile-command: "make V=1 -f rsync.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -1,22 +1,4 @@
-# Unittest makefile for rsync.c
-.PHONY: clean
-
-SRC      = rsync.c
-OBJS     = dir.o copyfile.o fexist.o fisdir.o fmode.o
-UNIT     = rsync.unittest
-#CPPFLAGS = -DDEBUG -I../../.. -I../../include
-
-all: build run
-
-clean:
-	@rm -f $(OBJS) $(UNIT)
-
-# This rule also forces a cleanup of built objects to not leave any object files
-# lingering in the tree to interfere with cross builds.
-build: clean $(OBJS)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(UNIT) -DUNITTEST $(SRC) $(OBJS)
-	@rm -f $(OBJS)
-
-run:
-	@./$(UNIT)
+OBJS        = dir.o copyfile.o fexist.o fisdir.o fmode.o tree.o
+TARGET      = clean $(OBJS) rsync.test

+include rules.mk
@@ -1,3 +1,45 @@
+.PHONY: all clean distclean
+
+# Figure out root of library, unless used as submodule
+ROOTDIR    ?= $(shell pwd)
+
+CC         ?= $(CROSS)gcc
+AR         ?= $(CROSS)ar
+STRIP      ?= $(CROSS)strip
+INSTALL    := install --backup=off
+STRIPINST  := $(INSTALL) -s --strip-program=$(CROSS)strip -m 0755
+CFLAGS     += -g -O0
+CPPFLAGS   += -D_GNU_SOURCE
+ARFLAGS     = crus
+
+# Default to silent build, use V=1 to get verbose mode.
+ifeq ($V,1)
+Q           =
+PRINT       = @true
+REDIRECT    =
+MAKEFLAGS   =
+VERBOSE     = -v
+else
+Q           = @
+PRINT       = @printf
+REDIRECT    = >/dev/null
+MAKEFLAGS   = --no-print-directory --silent
+VERBOSE     =
+endif
+
+# Some tests may need to be run as root, e.g. pidfile()
+ifeq ($(ASROOT), 1)
+SUDO        = sudo -n
+else
+SUDO        =
+endif
+
+# Default install paths
+prefix     ?= /usr/local
+libdir     ?= $(prefix)/lib
+datadir    ?= $(prefix)/share/doc/$(LIBNAME)
+incdir     ?= $(prefix)/include
+
 # Pretty printing and GCC -M for auto dep files
 %.o: %.c
 	$(PRINT) "  CC      $(subst $(ROOTDIR)/,,$(shell pwd)/)$@\n"
@@ -7,3 +49,20 @@
 	$(PRINT) "  LINK    $(subst $(ROOTDIR)/,,$(shell pwd)/)$@\n"
 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $^ $(LDLIBS$(LDLIBS-$(@)))

+.PHONY: %.test
+%.test: %.c
+	$(PRINT) "  TEST    $(subst $(ROOTDIR)/,,$(shell pwd)/)$(@:.test=)\n"
+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -g -o $@ -DUNITTEST $< $(OBJS)
+	$(Q)$(RM) $(OBJS)
+	$(Q)$(SUDO) ./$@ $(VERBOSE) $(REDIRECT)
+
+
+# Default build rules for both main and unit test makefiles
+all:: $(TARGET)
+
+clean::
+	-$(Q)$(RM) $(OBJS) $(DEPS) $(TARGET) $(SOLIB) $(STATICLIB)
+
+distclean::
+	-$(Q)$(RM) $(JUNK) unittest *.o *.a *.so* *.unittest *.test
+
@@ -1,7 +1,7 @@
-/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+/*	$OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $	*/

 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -21,46 +21,37 @@

 #ifndef strlcat
 /*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
+ * 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.
 */
 size_t
-strlcat(char *dst, const char *src, size_t siz)
+strlcat(char *dst, const char *src, size_t dsize)
 {
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
+	const char *odst = dst;
+	const char *osrc = src;
+	size_t n = dsize;
 	size_t dlen;

-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
+	/* Find the end of dst and adjust bytes left but don't go past end. */
+	while (n-- != 0 && *dst != '\0')
+		dst++;
+	dlen = dst - odst;
+	n = dsize - dlen;

-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
+	if (n-- == 0)
+		return(dlen + strlen(src));
+	while (*src != '\0') {
+		if (n != 0) {
+			*dst++ = *src;
 			n--;
 		}
-		s++;
+		src++;
 	}
-	*d = '\0';
+	*dst = '\0';

-	return(dlen + (s - src));	/* count does not include NUL */
+	return(dlen + (src - osrc));	/* count does not include NUL */
 }
 #endif
-
-/**
- * Local Variables:
- *  version-control: t
- *  c-file-style: "bsd"
- * End:
- */
-
-
@@ -1,7 +1,7 @@
-/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+/*	$OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $	*/

 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -21,41 +21,32 @@

 #ifndef strlcpy
 /*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
+ * 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.
 */
 size_t
-strlcpy(char *dst, const char *src, size_t siz)
+strlcpy(char *dst, const char *src, size_t dsize)
 {
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
+	const char *osrc = src;
+	size_t nleft = dsize;

-	/* Copy as many bytes as will fit */
-	if (n != 0) {
-		while (--n != 0) {
-			if ((*d++ = *s++) == '\0')
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\0')
 				break;
 		}
 	}

-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0';		/* NUL-terminate dst */
+		while (*src++)
 			;
 	}

-	return(s - src - 1);	/* count does not include NUL */
+	return(src - osrc - 1);	/* count does not include NUL */
 }
-
 #endif
-
-/**
- * Local Variables:
- *  version-control: t
- *  c-file-style: "bsd"
- * End:
- */
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/
+/*	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $	*/

 /*
 * Copyright (c) 2004 Ted Unangst and Todd Miller
@@ -22,17 +22,17 @@
 #include <stdlib.h>

 #ifndef strtonum
-#define INVALID 	1
-#define TOOSMALL 	2
-#define TOOLARGE 	3
+#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;
-	char *ep;
 	int error = 0;
+	char *ep;
 	struct errval {
 		const char *errstr;
 		int err;
@@ -45,9 +45,9 @@ strtonum(const char *numstr, long long minval, long long maxval,

 	ev[0].err = errno;
 	errno = 0;
-	if (minval > maxval)
+	if (minval > maxval) {
 		error = INVALID;
-	else {
+	} else {
 		ll = strtoll(numstr, &ep, 10);
 		if (numstr == ep || *ep != '\0')
 			error = INVALID;
@@ -17,13 +17,15 @@

 #include <paths.h>
 #include <fcntl.h>		/* O_TMPFILE requires -D_GNU_SOURCE */
+#include <linux/version.h>
 #include <stdlib.h>		/* mkstemp() */
 #include <stdio.h>		/* fdopen() */
 #include <sys/stat.h>		/* umask() */

 #ifndef  O_TMPFILE		/* Too old GLIBC or kernel */
 #warning O_TMPFILE missing on your system, tempfile() may not work!
-#define  O_TMPFILE 020200000	/* Define and let it fail at runtime */
+#define  __O_TMPFILE 020000000
+#define  O_TMPFILE (__O_TMPFILE | O_DIRECTORY) /* Define and let it fail at runtime */
 #endif

 /**
@@ -41,6 +43,7 @@
 */
 FILE *tempfile(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
 	int fd;
 	mode_t oldmask;

@@ -51,6 +54,10 @@ FILE *tempfile(void)
 		return NULL;

 	return fdopen(fd, "rw");
+#else
+#warning Too old kernel, reverting to wrap unsafe tmpfile() ...
+	return tmpfile();
+#endif
 }

 #ifdef UNITTEST
@@ -63,7 +70,7 @@ int main(void)

 /**
 * Local Variables:
- *  compile-command: "gcc -D_GNU_SOURCE -DUNITTEST -o tempy tempfile.c && ./tempy"
+ *  compile-command: "make V=1 -f tempfile.mk"
 *  version-control: t
 *  indent-tabs-mode: t
 *  c-file-style: "linux"
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = tempfile.test clean
+
+include rules.mk
@@ -0,0 +1,151 @@
+/* Simple /bin/tree replacement
+ *
+ * Copyright (c) 2015  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 <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+static int all = 0;
+
+static int filter(const struct dirent *entry)
+{
+	/* Skip current dir ".", and prev dir "..", from list of files */
+	if ((1 == strlen(entry->d_name) && entry->d_name[0] == '.') ||
+	    (2 == strlen(entry->d_name) && !strcmp(entry->d_name, "..")))
+		return 0;
+
+	if (!all && entry->d_name[0] == '.')
+		return 0;
+	
+	return 1;
+}
+
+static void get_perms(struct stat *st, char *buf, size_t len)
+{
+	mode_t m = st->st_mode;
+
+	snprintf(buf, len, "[%c%c%c%c%c%c%c%c%c%c] ",
+		 S_ISCHR(m) ? 'c' : S_ISBLK(m) ? 'b' : S_ISFIFO(m) ? 'p' : S_ISLNK(m) ? 'l' : S_ISSOCK(m) ? 's' : '-',
+		 (m & S_IRUSR) ? 'r' : '-',
+		 (m & S_IWUSR) ? 'w' : '-',
+		 (m & S_ISUID ) ? 's' : (m & S_IXUSR) ? 'x' : '-',
+		 (m & S_IRGRP) ? 'r' : '-',
+		 (m & S_IWGRP) ? 'w' : '-',
+		 (m & S_ISGID) ? 's' : (m & S_IXGRP) ? 'x' : '-',
+		 (m & S_IROTH) ? 'r' : '-',
+		 (m & S_IWOTH) ? 'w' : '-',
+		 (m & S_IXOTH) ? 'x' : '-'
+		);
+}
+
+static int descend(char *path, int show_perms, char *pfx)
+{
+	int result = 0;
+	struct stat st;
+
+	if (-1 == lstat(path, &st))
+		return 1;
+
+	if ((st.st_mode & S_IFMT) == S_IFDIR) {
+		int i, n;
+		struct dirent **namelist = NULL;
+
+		n = scandir(path, &namelist, filter, alphasort);
+		if (n) {
+			for (i = 0; i < n; i++) {
+				char t = ' ', p[14] = "", s[256] = "";
+				char buf[256];
+				char dir[80];
+
+				if (i + 1 == n) {
+					printf("%s `- ", pfx);
+					snprintf(dir, sizeof(dir), "%s     ", pfx);
+				} else {
+					printf("%s|-- ", pfx);
+					snprintf(dir, sizeof(dir), "%s|    ", pfx);
+				}
+
+				snprintf(buf, sizeof(buf), "%s/%s", path, namelist[i]->d_name);
+				if (!lstat(buf, &st)) {
+					if (show_perms)
+						get_perms(&st, p, sizeof(p));
+					if ((st.st_mode & S_IFMT) == S_IFDIR)
+						t = '/';
+					if (S_ISLNK(st.st_mode)) {
+						snprintf(s, sizeof(s), "-> ");
+						if (-1 == readlink(buf, &s[3], sizeof(s) - 3))
+							s[0] = 0;
+					}
+				}
+
+				printf("%s%s%c%s\n", p, namelist[i]->d_name, t, s);
+				if (t == '/')
+					result += descend(buf, show_perms, dir);
+
+				free(namelist[i]);
+			}
+
+			free(namelist);
+		}
+	} else {
+		errno = ENOTDIR;
+		result = -1;
+	}
+
+	return result;
+}
+
+int tree(char *path, int show_perms)
+{
+	printf("[%s]\n", path);
+	return descend(path, show_perms, "");
+}
+
+#ifdef UNITTEST
+#include "lite.h"
+
+int main(void)
+{
+	int i, result = 0;
+	struct { char *path; int fail; } arr[] = {
+		{ "/etc/passwd", -1 },
+		{ "/dev",         0 },
+		{ "/sbin",        0 },
+	};
+
+	for (i = 0; i < NELEMS(arr); i++) {
+		if (tree(arr[i].path, 1) != arr[i].fail)
+			result++;
+	}
+
+	return result;
+}
+#endif
+
+/**
+ * Local Variables:
+ *  compile-command: "make V=1 -f tree.mk"
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -0,0 +1,748 @@
+/*	$OpenBSD: tree.h,v 1.14 2015/05/25 03:07:49 deraadt Exp $	*/
+/*
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef	_SYS_TREE_H_
+#define	_SYS_TREE_H_
+
+/*
+ * This file defines data structures for different types of trees:
+ * splay trees and red-black trees.
+ *
+ * A splay tree is a self-organizing data structure.  Every operation
+ * on the tree causes a splay to happen.  The splay moves the requested
+ * node to the root of the tree and partly rebalances it.
+ *
+ * This has the benefit that request locality causes faster lookups as
+ * the requested nodes move to the top of the tree.  On the other hand,
+ * every lookup causes memory writes.
+ *
+ * The Balance Theorem bounds the total access time for m operations
+ * and n inserts on an initially empty tree as O((m + n)lg n).  The
+ * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
+ *
+ * A red-black tree is a binary search tree with the node color as an
+ * extra attribute.  It fulfills a set of conditions:
+ *	- every search path from the root to a leaf consists of the
+ *	  same number of black nodes,
+ *	- each red node (except for the root) has a black parent,
+ *	- each leaf node is black.
+ *
+ * Every operation on a red-black tree is bounded as O(lg n).
+ * The maximum height of a red-black tree is 2lg (n+1).
+ */
+
+#define SPLAY_HEAD(name, type)						\
+struct name {								\
+	struct type *sph_root; /* root of the tree */			\
+}
+
+#define SPLAY_INITIALIZER(root)						\
+	{ NULL }
+
+#define SPLAY_INIT(root) do {						\
+	(root)->sph_root = NULL;					\
+} while (0)
+
+#define SPLAY_ENTRY(type)						\
+struct {								\
+	struct type *spe_left; /* left element */			\
+	struct type *spe_right; /* right element */			\
+}
+
+#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
+#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
+#define SPLAY_ROOT(head)		(head)->sph_root
+#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
+
+/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
+#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
+	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
+	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
+	(head)->sph_root = tmp;						\
+} while (0)
+
+#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
+	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
+	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
+	(head)->sph_root = tmp;						\
+} while (0)
+
+#define SPLAY_LINKLEFT(head, tmp, field) do {				\
+	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
+	tmp = (head)->sph_root;						\
+	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
+} while (0)
+
+#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
+	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
+	tmp = (head)->sph_root;						\
+	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
+} while (0)
+
+#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
+	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
+	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
+	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
+	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
+} while (0)
+
+/* Generates prototypes and inline functions */
+
+#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
+void name##_SPLAY(struct name *, struct type *);			\
+void name##_SPLAY_MINMAX(struct name *, int);				\
+struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
+struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
+									\
+/* Finds the node with the same key as elm */				\
+static __inline struct type *						\
+name##_SPLAY_FIND(struct name *head, struct type *elm)			\
+{									\
+	if (SPLAY_EMPTY(head))						\
+		return(NULL);						\
+	name##_SPLAY(head, elm);					\
+	if ((cmp)(elm, (head)->sph_root) == 0)				\
+		return (head->sph_root);				\
+	return (NULL);							\
+}									\
+									\
+static __inline struct type *						\
+name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
+{									\
+	name##_SPLAY(head, elm);					\
+	if (SPLAY_RIGHT(elm, field) != NULL) {				\
+		elm = SPLAY_RIGHT(elm, field);				\
+		while (SPLAY_LEFT(elm, field) != NULL) {		\
+			elm = SPLAY_LEFT(elm, field);			\
+		}							\
+	} else								\
+		elm = NULL;						\
+	return (elm);							\
+}									\
+									\
+static __inline struct type *						\
+name##_SPLAY_MIN_MAX(struct name *head, int val)			\
+{									\
+	name##_SPLAY_MINMAX(head, val);					\
+        return (SPLAY_ROOT(head));					\
+}
+
+/* Main splay operation.
+ * Moves node close to the key of elm to top
+ */
+#define SPLAY_GENERATE(name, type, field, cmp)				\
+struct type *								\
+name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
+{									\
+    if (SPLAY_EMPTY(head)) {						\
+	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
+    } else {								\
+	    int __comp;							\
+	    name##_SPLAY(head, elm);					\
+	    __comp = (cmp)(elm, (head)->sph_root);			\
+	    if(__comp < 0) {						\
+		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
+		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
+		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
+	    } else if (__comp > 0) {					\
+		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
+		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
+		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
+	    } else							\
+		    return ((head)->sph_root);				\
+    }									\
+    (head)->sph_root = (elm);						\
+    return (NULL);							\
+}									\
+									\
+struct type *								\
+name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
+{									\
+	struct type *__tmp;						\
+	if (SPLAY_EMPTY(head))						\
+		return (NULL);						\
+	name##_SPLAY(head, elm);					\
+	if ((cmp)(elm, (head)->sph_root) == 0) {			\
+		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
+			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
+		} else {						\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
+			name##_SPLAY(head, elm);			\
+			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
+		}							\
+		return (elm);						\
+	}								\
+	return (NULL);							\
+}									\
+									\
+void									\
+name##_SPLAY(struct name *head, struct type *elm)			\
+{									\
+	struct type __node, *__left, *__right, *__tmp;			\
+	int __comp;							\
+\
+	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
+	__left = __right = &__node;					\
+\
+	while ((__comp = (cmp)(elm, (head)->sph_root))) {		\
+		if (__comp < 0) {					\
+			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if ((cmp)(elm, __tmp) < 0){			\
+				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
+				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKLEFT(head, __right, field);		\
+		} else if (__comp > 0) {				\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if ((cmp)(elm, __tmp) > 0){			\
+				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
+				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKRIGHT(head, __left, field);		\
+		}							\
+	}								\
+	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
+}									\
+									\
+/* Splay with either the minimum or the maximum element			\
+ * Used to find minimum or maximum element in tree.			\
+ */									\
+void name##_SPLAY_MINMAX(struct name *head, int __comp) \
+{									\
+	struct type __node, *__left, *__right, *__tmp;			\
+\
+	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
+	__left = __right = &__node;					\
+\
+	while (1) {							\
+		if (__comp < 0) {					\
+			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if (__comp < 0){				\
+				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
+				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKLEFT(head, __right, field);		\
+		} else if (__comp > 0) {				\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if (__comp > 0) {				\
+				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
+				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKRIGHT(head, __left, field);		\
+		}							\
+	}								\
+	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
+}
+
+#define SPLAY_NEGINF	-1
+#define SPLAY_INF	1
+
+#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
+#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
+#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
+#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
+#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
+					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
+#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
+					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
+
+#define SPLAY_FOREACH(x, name, head)					\
+	for ((x) = SPLAY_MIN(name, head);				\
+	     (x) != NULL;						\
+	     (x) = SPLAY_NEXT(name, head, x))
+
+/* Macros that define a red-black tree */
+#define RB_HEAD(name, type)						\
+struct name {								\
+	struct type *rbh_root; /* root of the tree */			\
+}
+
+#define RB_INITIALIZER(root)						\
+	{ NULL }
+
+#define RB_INIT(root) do {						\
+	(root)->rbh_root = NULL;					\
+} while (0)
+
+#define RB_BLACK	0
+#define RB_RED		1
+#define RB_ENTRY(type)							\
+struct {								\
+	struct type *rbe_left;		/* left element */		\
+	struct type *rbe_right;		/* right element */		\
+	struct type *rbe_parent;	/* parent element */		\
+	int rbe_color;			/* node color */		\
+}
+
+#define RB_LEFT(elm, field)		(elm)->field.rbe_left
+#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
+#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
+#define RB_COLOR(elm, field)		(elm)->field.rbe_color
+#define RB_ROOT(head)			(head)->rbh_root
+#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
+
+#define RB_SET(elm, parent, field) do {					\
+	RB_PARENT(elm, field) = parent;					\
+	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
+	RB_COLOR(elm, field) = RB_RED;					\
+} while (0)
+
+#define RB_SET_BLACKRED(black, red, field) do {				\
+	RB_COLOR(black, field) = RB_BLACK;				\
+	RB_COLOR(red, field) = RB_RED;					\
+} while (0)
+
+#ifndef RB_AUGMENT
+#define RB_AUGMENT(x)	do {} while (0)
+#endif
+
+#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
+	(tmp) = RB_RIGHT(elm, field);					\
+	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) {		\
+		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
+	}								\
+	RB_AUGMENT(elm);						\
+	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
+		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
+			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
+		else							\
+			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
+	} else								\
+		(head)->rbh_root = (tmp);				\
+	RB_LEFT(tmp, field) = (elm);					\
+	RB_PARENT(elm, field) = (tmp);					\
+	RB_AUGMENT(tmp);						\
+	if ((RB_PARENT(tmp, field)))					\
+		RB_AUGMENT(RB_PARENT(tmp, field));			\
+} while (0)
+
+#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
+	(tmp) = RB_LEFT(elm, field);					\
+	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) {		\
+		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
+	}								\
+	RB_AUGMENT(elm);						\
+	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
+		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
+			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
+		else							\
+			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
+	} else								\
+		(head)->rbh_root = (tmp);				\
+	RB_RIGHT(tmp, field) = (elm);					\
+	RB_PARENT(elm, field) = (tmp);					\
+	RB_AUGMENT(tmp);						\
+	if ((RB_PARENT(tmp, field)))					\
+		RB_AUGMENT(RB_PARENT(tmp, field));			\
+} while (0)
+
+/* Generates prototypes and inline functions */
+#define	RB_PROTOTYPE(name, type, field, cmp)				\
+	RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
+#define	RB_PROTOTYPE_STATIC(name, type, field, cmp)			\
+	RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __attribute__((__unused__)) static)
+#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)		\
+attr void name##_RB_INSERT_COLOR(struct name *, struct type *);		\
+attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
+attr struct type *name##_RB_REMOVE(struct name *, struct type *);	\
+attr struct type *name##_RB_INSERT(struct name *, struct type *);	\
+attr struct type *name##_RB_FIND(struct name *, struct type *);		\
+attr struct type *name##_RB_NFIND(struct name *, struct type *);	\
+attr struct type *name##_RB_NEXT(struct type *);			\
+attr struct type *name##_RB_PREV(struct type *);			\
+attr struct type *name##_RB_MINMAX(struct name *, int);			\
+									\
+
+/* Main rb operation.
+ * Moves node close to the key of elm to top
+ */
+#define	RB_GENERATE(name, type, field, cmp)				\
+	RB_GENERATE_INTERNAL(name, type, field, cmp,)
+#define	RB_GENERATE_STATIC(name, type, field, cmp)			\
+	RB_GENERATE_INTERNAL(name, type, field, cmp, __attribute__((__unused__)) static)
+#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr)		\
+attr void								\
+name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
+{									\
+	struct type *parent, *gparent, *tmp;				\
+	while ((parent = RB_PARENT(elm, field)) &&			\
+	    RB_COLOR(parent, field) == RB_RED) {			\
+		gparent = RB_PARENT(parent, field);			\
+		if (parent == RB_LEFT(gparent, field)) {		\
+			tmp = RB_RIGHT(gparent, field);			\
+			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
+				RB_COLOR(tmp, field) = RB_BLACK;	\
+				RB_SET_BLACKRED(parent, gparent, field);\
+				elm = gparent;				\
+				continue;				\
+			}						\
+			if (RB_RIGHT(parent, field) == elm) {		\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				tmp = parent;				\
+				parent = elm;				\
+				elm = tmp;				\
+			}						\
+			RB_SET_BLACKRED(parent, gparent, field);	\
+			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
+		} else {						\
+			tmp = RB_LEFT(gparent, field);			\
+			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
+				RB_COLOR(tmp, field) = RB_BLACK;	\
+				RB_SET_BLACKRED(parent, gparent, field);\
+				elm = gparent;				\
+				continue;				\
+			}						\
+			if (RB_LEFT(parent, field) == elm) {		\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				tmp = parent;				\
+				parent = elm;				\
+				elm = tmp;				\
+			}						\
+			RB_SET_BLACKRED(parent, gparent, field);	\
+			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
+		}							\
+	}								\
+	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
+}									\
+									\
+attr void								\
+name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
+{									\
+	struct type *tmp;						\
+	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
+	    elm != RB_ROOT(head)) {					\
+		if (RB_LEFT(parent, field) == elm) {			\
+			tmp = RB_RIGHT(parent, field);			\
+			if (RB_COLOR(tmp, field) == RB_RED) {		\
+				RB_SET_BLACKRED(tmp, parent, field);	\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				tmp = RB_RIGHT(parent, field);		\
+			}						\
+			if ((RB_LEFT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
+			    (RB_RIGHT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
+				RB_COLOR(tmp, field) = RB_RED;		\
+				elm = parent;				\
+				parent = RB_PARENT(elm, field);		\
+			} else {					\
+				if (RB_RIGHT(tmp, field) == NULL ||	\
+				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
+					struct type *oleft;		\
+					if ((oleft = RB_LEFT(tmp, field)))\
+						RB_COLOR(oleft, field) = RB_BLACK;\
+					RB_COLOR(tmp, field) = RB_RED;	\
+					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
+					tmp = RB_RIGHT(parent, field);	\
+				}					\
+				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
+				RB_COLOR(parent, field) = RB_BLACK;	\
+				if (RB_RIGHT(tmp, field))		\
+					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				elm = RB_ROOT(head);			\
+				break;					\
+			}						\
+		} else {						\
+			tmp = RB_LEFT(parent, field);			\
+			if (RB_COLOR(tmp, field) == RB_RED) {		\
+				RB_SET_BLACKRED(tmp, parent, field);	\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				tmp = RB_LEFT(parent, field);		\
+			}						\
+			if ((RB_LEFT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
+			    (RB_RIGHT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
+				RB_COLOR(tmp, field) = RB_RED;		\
+				elm = parent;				\
+				parent = RB_PARENT(elm, field);		\
+			} else {					\
+				if (RB_LEFT(tmp, field) == NULL ||	\
+				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
+					struct type *oright;		\
+					if ((oright = RB_RIGHT(tmp, field)))\
+						RB_COLOR(oright, field) = RB_BLACK;\
+					RB_COLOR(tmp, field) = RB_RED;	\
+					RB_ROTATE_LEFT(head, tmp, oright, field);\
+					tmp = RB_LEFT(parent, field);	\
+				}					\
+				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
+				RB_COLOR(parent, field) = RB_BLACK;	\
+				if (RB_LEFT(tmp, field))		\
+					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				elm = RB_ROOT(head);			\
+				break;					\
+			}						\
+		}							\
+	}								\
+	if (elm)							\
+		RB_COLOR(elm, field) = RB_BLACK;			\
+}									\
+									\
+attr struct type *							\
+name##_RB_REMOVE(struct name *head, struct type *elm)			\
+{									\
+	struct type *child, *parent, *old = elm;			\
+	int color;							\
+	if (RB_LEFT(elm, field) == NULL)				\
+		child = RB_RIGHT(elm, field);				\
+	else if (RB_RIGHT(elm, field) == NULL)				\
+		child = RB_LEFT(elm, field);				\
+	else {								\
+		struct type *left;					\
+		elm = RB_RIGHT(elm, field);				\
+		while ((left = RB_LEFT(elm, field)))			\
+			elm = left;					\
+		child = RB_RIGHT(elm, field);				\
+		parent = RB_PARENT(elm, field);				\
+		color = RB_COLOR(elm, field);				\
+		if (child)						\
+			RB_PARENT(child, field) = parent;		\
+		if (parent) {						\
+			if (RB_LEFT(parent, field) == elm)		\
+				RB_LEFT(parent, field) = child;		\
+			else						\
+				RB_RIGHT(parent, field) = child;	\
+			RB_AUGMENT(parent);				\
+		} else							\
+			RB_ROOT(head) = child;				\
+		if (RB_PARENT(elm, field) == old)			\
+			parent = elm;					\
+		(elm)->field = (old)->field;				\
+		if (RB_PARENT(old, field)) {				\
+			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
+				RB_LEFT(RB_PARENT(old, field), field) = elm;\
+			else						\
+				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
+			RB_AUGMENT(RB_PARENT(old, field));		\
+		} else							\
+			RB_ROOT(head) = elm;				\
+		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
+		if (RB_RIGHT(old, field))				\
+			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
+		if (parent) {						\
+			left = parent;					\
+			do {						\
+				RB_AUGMENT(left);			\
+			} while ((left = RB_PARENT(left, field)));	\
+		}							\
+		goto color;						\
+	}								\
+	parent = RB_PARENT(elm, field);					\
+	color = RB_COLOR(elm, field);					\
+	if (child)							\
+		RB_PARENT(child, field) = parent;			\
+	if (parent) {							\
+		if (RB_LEFT(parent, field) == elm)			\
+			RB_LEFT(parent, field) = child;			\
+		else							\
+			RB_RIGHT(parent, field) = child;		\
+		RB_AUGMENT(parent);					\
+	} else								\
+		RB_ROOT(head) = child;					\
+color:									\
+	if (color == RB_BLACK)						\
+		name##_RB_REMOVE_COLOR(head, parent, child);		\
+	return (old);							\
+}									\
+									\
+/* Inserts a node into the RB tree */					\
+attr struct type *							\
+name##_RB_INSERT(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp;						\
+	struct type *parent = NULL;					\
+	int comp = 0;							\
+	tmp = RB_ROOT(head);						\
+	while (tmp) {							\
+		parent = tmp;						\
+		comp = (cmp)(elm, parent);				\
+		if (comp < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	RB_SET(elm, parent, field);					\
+	if (parent != NULL) {						\
+		if (comp < 0)						\
+			RB_LEFT(parent, field) = elm;			\
+		else							\
+			RB_RIGHT(parent, field) = elm;			\
+		RB_AUGMENT(parent);					\
+	} else								\
+		RB_ROOT(head) = elm;					\
+	name##_RB_INSERT_COLOR(head, elm);				\
+	return (NULL);							\
+}									\
+									\
+/* Finds the node with the same key as elm */				\
+attr struct type *							\
+name##_RB_FIND(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	int comp;							\
+	while (tmp) {							\
+		comp = cmp(elm, tmp);					\
+		if (comp < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	return (NULL);							\
+}									\
+									\
+/* Finds the first node greater than or equal to the search key */	\
+attr struct type *							\
+name##_RB_NFIND(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	struct type *res = NULL;					\
+	int comp;							\
+	while (tmp) {							\
+		comp = cmp(elm, tmp);					\
+		if (comp < 0) {						\
+			res = tmp;					\
+			tmp = RB_LEFT(tmp, field);			\
+		}							\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	return (res);							\
+}									\
+									\
+/* ARGSUSED */								\
+attr struct type *							\
+name##_RB_NEXT(struct type *elm)					\
+{									\
+	if (RB_RIGHT(elm, field)) {					\
+		elm = RB_RIGHT(elm, field);				\
+		while (RB_LEFT(elm, field))				\
+			elm = RB_LEFT(elm, field);			\
+	} else {							\
+		if (RB_PARENT(elm, field) &&				\
+		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
+			elm = RB_PARENT(elm, field);			\
+		else {							\
+			while (RB_PARENT(elm, field) &&			\
+			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
+				elm = RB_PARENT(elm, field);		\
+			elm = RB_PARENT(elm, field);			\
+		}							\
+	}								\
+	return (elm);							\
+}									\
+									\
+/* ARGSUSED */								\
+attr struct type *							\
+name##_RB_PREV(struct type *elm)					\
+{									\
+	if (RB_LEFT(elm, field)) {					\
+		elm = RB_LEFT(elm, field);				\
+		while (RB_RIGHT(elm, field))				\
+			elm = RB_RIGHT(elm, field);			\
+	} else {							\
+		if (RB_PARENT(elm, field) &&				\
+		    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))	\
+			elm = RB_PARENT(elm, field);			\
+		else {							\
+			while (RB_PARENT(elm, field) &&			\
+			    (elm == RB_LEFT(RB_PARENT(elm, field), field)))\
+				elm = RB_PARENT(elm, field);		\
+			elm = RB_PARENT(elm, field);			\
+		}							\
+	}								\
+	return (elm);							\
+}									\
+									\
+attr struct type *							\
+name##_RB_MINMAX(struct name *head, int val)				\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	struct type *parent = NULL;					\
+	while (tmp) {							\
+		parent = tmp;						\
+		if (val < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else							\
+			tmp = RB_RIGHT(tmp, field);			\
+	}								\
+	return (parent);						\
+}
+
+#define RB_NEGINF	-1
+#define RB_INF	1
+
+#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
+#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
+#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
+#define RB_NFIND(name, x, y)	name##_RB_NFIND(x, y)
+#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
+#define RB_PREV(name, x, y)	name##_RB_PREV(y)
+#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
+#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
+
+#define RB_FOREACH(x, name, head)					\
+	for ((x) = RB_MIN(name, head);					\
+	     (x) != NULL;						\
+	     (x) = name##_RB_NEXT(x))
+
+#define RB_FOREACH_SAFE(x, name, head, y)				\
+	for ((x) = RB_MIN(name, head);					\
+	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), 1);		\
+	     (x) = (y))
+
+#define RB_FOREACH_REVERSE(x, name, head)				\
+	for ((x) = RB_MAX(name, head);					\
+	     (x) != NULL;						\
+	     (x) = name##_RB_PREV(x))
+
+#define RB_FOREACH_REVERSE_SAFE(x, name, head, y)			\
+	for ((x) = RB_MAX(name, head);					\
+	    ((x) != NULL) && ((y) = name##_RB_PREV(x), 1);		\
+	     (x) = (y))
+
+#endif	/* _SYS_TREE_H_ */
@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = clean $(OBJS) tree.test
+
+include rules.mk
Author	SHA1	Message	Date
Joachim Nilsson	efc70e3a75	Update ChangeLog and bump version for v1.5.0 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-20 02:24:26 +01:00
Joachim Nilsson	147df0c6da	ABI revision bump Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-20 02:21:33 +01:00
Joachim Nilsson	7f89000c6c	pidfilefn.c: Update unittests, add mtime test and prettyfy output Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-20 02:15:35 +01:00
Joachim Nilsson	7607148d46	Build unit tests with -g -O0 for debugging Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-20 02:14:55 +01:00
Joachim Nilsson	979f76aea7	pidfile(): Use utimensat() to update atime+mtime This patch update the `-lite` patch to OpenBSD `pidfile()` by changing the update atime+mtime patch from writing the PID again to instead use utimensat(). Less overhead and nanosecond resolution. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-20 02:14:30 +01:00
Joachim Nilsson	ac41fa70aa	Update ChangeLog and bump version to v1.5.0-dev Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-13 01:59:41 +01:00
Joachim Nilsson	5f820b17b6	Change namespace for header files libite/lite.h --> lite/lite.h The `libite/` namespace for header files has been the same since the first public release in v1.0.0. This patch surprisingly changes it to the less surprising `lite/`. Hopefully there aren't that many users of this library out there yet, apart from myself. Apologies if you are affected! Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-13 01:58:56 +01:00
Joachim Nilsson	53b715c094	Remove surprise from pkg-config output Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-03-13 00:38:53 +01:00
Joachim Nilsson	1b4cd7b20b	Update ChangeLog and bump version for v1.4.4 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-23 14:23:12 +01:00
Joachim Nilsson	8e379ca358	Update ChangeLog Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-22 19:11:29 +01:00
Joachim Nilsson	12241dcdfe	libite.pc.in: Remove spurious @LTLIBINTL@ after copy-paste from libConfuse Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-20 22:26:24 +01:00
Joachim Nilsson	0ce1b3bf44	Add pkg-config support Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-20 22:03:25 +01:00
Joachim Nilsson	38ff0af61a	Update ChangeLog with details on issue #3 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-15 18:20:25 +01:00
Joachim Nilsson	00737a5b74	Merge pull request #3 from askerin/tempfile-archfix Tempfile() is dependent on $ARCH Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-12 16:15:53 +01:00
Joachim Nilsson	1b8b164ed4	Test build with both GCC and Clang (LLVM) Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-12 16:15:15 +01:00
Joachim Nilsson	9f279c0fec	Disable sudo for build while auto-tests are reintegrated Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-12 16:14:59 +01:00
Johan Askerin	4d7e6d4f78	In tempfile(): O_DIRECTORY is dependent on $ARCH, don't hardcore O_TMPFILE Signed-off-by: Johan Askerin <johan.askerin@gmail.com>	2016-02-12 15:17:25 +01:00
Joachim Nilsson	0a57f2128f	Update ChangeLog and bump version for v1.4.3 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-02 09:37:40 +01:00
Joachim Nilsson	e254db48a8	Remove AUTHORS file from distribution, doesn't exist Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-02 08:40:14 +01:00
Joachim Nilsson	0fe429dcbe	Update ChangeLog in preparation for v1.4.3 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-02 08:25:16 +01:00
Joachim Nilsson	f1a2e01775	Makefile.am: Update to install and distribute README.md, LICENSE, etc. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-02 08:24:15 +01:00
Joachim Nilsson	e5eef2ae59	Remove confusing symlinks, it's a brave Markdown world Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-02-02 08:22:13 +01:00
Joachim Nilsson	f9caffc9b7	Update ChangeLog and bump version for v1.4.2 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-23 11:29:50 +01:00
Joachim Nilsson	604b503b84	Fix issue #2 : GCC6 -Wmisleading-indentation causing FTBFS in pimd - Add function comment - Fix misleading indentaion - Fix coding sttle Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-23 11:16:53 +01:00
Joachim Nilsson	5fc248522c	Update ChangeLog and bump version for v1.4.1 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-22 01:07:35 +01:00
Joachim Nilsson	c0b8bab164	Use pkginclude_HEADERS for libite include files The v1.4.0 release installs the header files in $(prefix)/include, this patch installs them in the proper $(prefix)/include/$(PACKAGE) dir. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-22 01:03:19 +01:00
Joachim Nilsson	c0e9c0431a	Bump version for 1.4.1-dev cycle Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-22 01:01:22 +01:00
Joachim Nilsson	efdd61648a	Update ChangeLog and bump version for release v1.4.0 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-22 00:05:01 +01:00
Joachim Nilsson	2e8e64fd2a	Step ABI version 2:0:0 --> 2:1:0 Slight change in how `pidfile()` behaves, now exporting __pidfile_name. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-22 00:01:19 +01:00
Joachim Nilsson	c4109e7e74	Add Niels Provos' famous splay and red-black tree implementation This is the OpenBSD sys/tree.h r1.14 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-21 23:51:40 +01:00
Joachim Nilsson	5d07594709	Update pidfile() documentation and add unit test for __pidfile_name Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-21 23:30:08 +01:00
Joachim Nilsson	253460b4b8	Make pidfile() name accessible (read-only) to daemon as __pidfile_name Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-21 23:28:59 +01:00
Joachim Nilsson	acc59e0c1f	Remove AM_MAINTAINER_MODE from configure script, not recommended anymore Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-21 22:32:23 +01:00
Joachim Nilsson	90374fc237	README: Add a Build & Install section Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-18 20:11:19 +01:00
Joachim Nilsson	7f375b6e9d	Remove -Werror due to O_TMPFILE is missing on older kernels Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-14 21:49:49 +01:00
Joachim Nilsson	e4236db2bd	Ignore all generated files from build system Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-14 21:43:02 +01:00
Joachim Nilsson	42a5a906fc	ChangeLog: Prepare for upcoming v1.4.0 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-14 21:28:08 +01:00
Joachim Nilsson	10b28127f5	Update .gitignore, add bogus m4/.gitignore to make Travis-CI happy Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-14 21:27:04 +01:00
Joachim Nilsson	d265a05422	Update build script for Travis-CI with GNU configure and build system Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-14 18:56:01 +01:00
Joachim Nilsson	f07c05138d	Initial conversion to the GNU configure and build system Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-14 17:40:26 +01:00
Joachim Nilsson	e1f8224666	Update ChangeLog and bump version for release v1.3.0 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:58:06 +01:00
Joachim Nilsson	84650d8836	Update include file boiler plate We're not in Kansas anymore, Toto. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:58:06 +01:00
Joachim Nilsson	b4fbd54a8c	Update copyright years Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:58:06 +01:00
Joachim Nilsson	c14c6a1e62	pidfile.c: Add LITE #ifdef pidfile and comment LITE mtime extension Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:58:06 +01:00
Joachim Nilsson	8aecba2b7a	strtonum.c: Update to OpenBSD v1.7, style tweaks Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:58:06 +01:00
Joachim Nilsson	74dcaddc55	strlcat.c: Update to OpenBSD v1.14, readability fixes Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:57:59 +01:00
Joachim Nilsson	c5a36ff7bd	strlcpy.c: Update to OpenBSD v1.12, readability fixes Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:57:51 +01:00
Joachim Nilsson	3371e42035	queue.h: Update to OpenBSD v1.43 -- NOTE: Removes CIRCLEQ support! Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-07 02:03:10 +01:00
Joachim Nilsson	4e57a78255	README: Update section on OpenBSD Functions as well Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-06 13:35:35 +01:00
Joachim Nilsson	ce3bd4ec8a	README: Update documentation for pidfile() fn Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-06 13:31:32 +01:00
Joachim Nilsson	805571a7ef	ChangeLog: Fix missing README link Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:34:41 +01:00
Joachim Nilsson	36435997bf	ChangeLog: Fix Markdown links Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:33:34 +01:00
Joachim Nilsson	f961889724	Add documentation for new macros and prepare ChangeLog for v1.3.0 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:27:40 +01:00
Tobias Waldekranz	6605fb9771	Makefile: Make sure queue.h and conio.h also are installed This patch adds the BSD queue.h and the Borland inspired conio.h to the install-dev Makefile target. Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:17:16 +01:00
Tobias Waldekranz	61254279b9	lite.h: Add min() and max() macros These macros take care to avoid double evaluation. Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:16:34 +01:00
Joachim Nilsson	e42aca8856	Makefile: Split install-dev taget into install-dev and install-data This makes it possible to skip installing any unnecessary cruft. Useful for embedded targets. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:14:37 +01:00
Joachim Nilsson	16611f3e5f	Add ChangeLog to project and bump version for new release cycle Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2016-01-05 13:13:26 +01:00
Joachim Nilsson	975df87d6b	Update unit test for pidfile() Add ocular verification step for mtime update when pidfile() is called more than once. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-12-17 00:15:18 +01:00
Joachim Nilsson	148027674a	pidfile: Only update mtime i called multiple times Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-12-16 18:40:34 +01:00
Joachim Nilsson	12ed342d55	Bump version for v1.2.0 release Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-11-23 00:32:56 +01:00
Joachim Nilsson	23badc990d	lfile: Improve unittest/example with /etc/group + passwd Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-10-26 00:50:18 +01:00
Joachim Nilsson	ca53e097c3	lfile: Initialize strtok_r() save pointer Must initialize the save pointer in the parser context, otherwise strtok_r() will fail on statically built embedded targets. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-10-26 00:16:36 +01:00
Joachim Nilsson	a7b5c240c1	Add UNIX lfile_t parser API to lite.h Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-10-25 23:25:17 +01:00
Joachim Nilsson	c4eb5cb124	Add simple parser for UNIX configuration files. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-10-25 22:50:10 +01:00
Joachim Nilsson	db08b20f23	Make sure we don't inherit LDFLAGS from environment. To pass custom LDFLAGS to libite, use EXTRA_LDFLAGS. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-10-22 18:35:35 +02:00
Joachim Nilsson	8779f54125	Do not allow VERSION to be overloaded by build system. When integrating libite as a component in another piece of software, that build system may set VERSION as an environment variable. We do not want that version to be set as the version of libite. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-10-03 09:13:37 +02:00
Joachim Nilsson	bd9a618ea3	Bump version for v1.1.1 patch release. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-09-27 00:59:54 +02:00
Joachim Nilsson	3f89fafe24	Fix macro definitions for compat APIs Seems cpp is a bit uptight about spaces. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-09-27 00:56:20 +02:00
Joachim Nilsson	ebec48d671	Silence annoying warnings from GNU ar In (very) modern versions of binutils, for instance v2.25.1 shipped in Ubuntu 15.10, ar complains about the VERY common `crus` argument. This patch silences this noise: $ make -j5 ARCHIVE libite.a ar: `u' modifier ignored since `D' is the default (see `U') Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-09-27 00:55:26 +02:00
Joachim Nilsson	4d6c32f81a	Bump version to v1.1.0 and drop default optimization. User of library will likely want to have better control over the default optimization level. Either way, defaulting to -Os is a lot more "risky" than, say -O2. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-09-16 17:25:43 +02:00
Joachim Nilsson	25c725c240	Bump SONAME to libite.so.2 so for upcoming Finit v2.0 We need to lock down the ABI and do a new release on behalf of Finit. Finit will have support for using an externally built libite and libuev, so Finit must lock down to a known ABI. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-09-16 17:23:49 +02:00
Joachim Nilsson	039a92b292	progress.c: Merge in latest changes from troglobit/toolbox@d845e67 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-24 23:52:26 +02:00
Joachim Nilsson	5ae5bfb767	Bump version to indicate new feature status, v1.1.0-beta1 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 19:37:08 +02:00
Joachim Nilsson	a00e765789	Update README with info on progress() and tree() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 19:36:21 +02:00
Joachim Nilsson	aff5812c46	Minor whitespace fixes, use Linux KNF Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 13:15:18 +02:00
Joachim Nilsson	3809b109c6	Add autotest for progress() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 13:11:20 +02:00
Joachim Nilsson	1909dd475c	progress(): Very simple ASCII progress bar from troglobit/toolbox@f98c5d0 This patch adds a very simple progress bar I wrote once. It's revision f98c5d0 from https://github.com/troglobit/toolbox Also included in this patch is conio.h, a neat little set of macros for manipulating your terminal using ANSI escape seequences. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 13:07:03 +02:00
Joachim Nilsson	a157fe4162	tree: Minor cleanup, also does not need sudo for tests. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 05:23:54 +02:00
Joachim Nilsson	42b6a03317	rsync.test: Use homegrown tree, instead of out-of-tree tree ... Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 05:19:11 +02:00
Joachim Nilsson	1f1e88a640	New function: tree(), simple /bin/tree replacement. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 05:12:38 +02:00
Joachim Nilsson	bb67fb749d	rsync.c: Refactor unit tests to work on Travis as well. Travis does not have `/bin/tree` installed, and since we do not output intermediate results from `make test`, there is no need to call `/bin/tree` unless `-v` is supplied to the test. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 02:33:33 +02:00
Joachim Nilsson	3e337c7078	rules.mk: When V=1 is used, add -v to autotests. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 02:32:29 +02:00
Joachim Nilsson	407e954f02	tempfile(): Handle kernels older than 3.11 by wrapping tmpfile() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 02:17:45 +02:00
Joachim Nilsson	8978cb9bff	Try `sudo: true` for sake of tests, skip Docker for now. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 01:39:08 +02:00
Joachim Nilsson	9c90ec56a6	Attempt to activate autotests in Travis-CI. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 01:33:24 +02:00
Joachim Nilsson	44e787c966	Add generic support for running tests as root. By setting `ASROOT=1` in a unit test makefile a test will now run as root, using `sudo -n`. This patch allows us to simplify the pidfilefn() test. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-23 01:30:29 +02:00
Joachim Nilsson	e8ff38ad6a	Add autotest for fisdir() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 23:26:41 +02:00
Joachim Nilsson	1138822d19	Add autotest for fexist() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 23:22:38 +02:00
Joachim Nilsson	de8f2b087c	Add autotest for tempfile() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 23:08:22 +02:00
Joachim Nilsson	87d6fe822c	Make sure to start the makepath() tests clean. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 23:07:56 +02:00
Joachim Nilsson	57c49bfe0c	Add autotest for mkpath() and makepath() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 23:01:15 +02:00
Joachim Nilsson	b59249714b	Add autotest for fsendfile() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 22:49:48 +02:00
Joachim Nilsson	36da3aa35e	Add autotest for dir Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 22:46:42 +02:00
Joachim Nilsson	ab2b0f00fa	Add autotest for pidfilefn et al. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 22:41:34 +02:00
Joachim Nilsson	bd69aad13a	Add autotest for copyfile et al. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 22:22:14 +02:00
Joachim Nilsson	ebe2ad4a4c	Add autotest for chomp Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 22:08:25 +02:00
Joachim Nilsson	2ea2357b62	Lay foundation for unit test build framework. GNU Make double colon rules, rule ;-) Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 21:59:52 +02:00
Joachim Nilsson	b7a8042c87	Add Travis-CI status icon Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 16:11:31 +02:00
Joachim Nilsson	7d1423b5b1	Add dockerized Travis-CI autobuilder support. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-22 16:09:54 +02:00
Joachim Nilsson	117ec58a90	Add some very useful helper macros: NELEMS() and bitops. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-08-21 09:42:43 +02:00
Joachim Nilsson	a4cbc7a10e	pidfile.c: Upgrade to OpenBSD r1.11, asprintf() fixes. Do not assume that asprintf() clears the pointer on failure, which is non-portable. Also add missing asprintf() return value checks. Signed-off-by: millert@ Signed-off-by: deraadt@ guenther@ doug@ Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-07-22 11:53:44 +02:00
Joachim Nilsson	3eb1fbb31d	lite.h: Minor coding style cleanup. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-07-22 11:52:41 +02:00
Joachim Nilsson	f5355ecf7b	lite.h: Convert from error.h to the more BSD friendly err.h OpenBSD, and possibly the other BSD's, do not have error.h so we replace it with err.h, which exists almost everywhere. This means the macros in lite.h that used error() now instead use warn(), with the same semantics as before. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-07-18 15:36:06 +02:00
Joachim Nilsson	61b1b5b457	Add support for 'make distdir' used by GNU configure and build. This patch adds support for being called with "make distdir" from a GNU configure and build based project. This was a requirement to get the Inadyn v1.99.14 release out. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-07-14 17:26:32 +02:00
Joachim Nilsson	83f83466b5	Fix indentation of description to some API's. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2015-07-12 13:13:21 +02:00