Update ChangeLog and bump version for release v1.3.0

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

.travis.yml

@@ -0,0 +1,11 @@
+# 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
+
+script:
+  - make
+  - make test

ChangeLog

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

ChangeLog.md

@@ -0,0 +1,84 @@
+Change Log
+==========
+
+All notable changes to the project are documented in this file.
+
+
+[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.2.0...HEAD
+[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

LICENSE

@@ -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

Makefile

@@ -1,6 +1,6 @@
-# libite -- Light-weight utility functions and C-library extensions
+# libite (LITE) -- Collection of frog DNA
 # 
-# 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
@@ -19,67 +19,51 @@
 # 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)
+.PHONY: install test
 
 #VERSION    = $(shell git tag -l | tail -1)
-VERSION    ?= 1.0.0
+VERSION     = 1.3.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
+LDFLAGS     = $(EXTRA_LDFLAGS)
 
-# 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
+DISTFILES   = README ChangeLog LICENSE
+HEADERS     = lite.h queue.h conio.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
+OBJS       += ifconfig.o lfile.o makepath.o pidfile.o pidfilefn.o progress.o
+OBJS       += rsync.o strlcpy.o strlcat.o strtonum.o tempfile.o tree.o
 DEPS       := $(OBJS:.o=.d)
 JUNK        = *~ *.bak *.map .*.d *.d DEADJOE semantic.cache *.gdb *.elf core core.*
 
-VER         = 1
+VER         = 2
 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)
+test: clean
+	$(MAKE) -f chomp.mk
+	$(MAKE) -f copyfile.mk
+	$(MAKE) -f dir.mk
+	$(MAKE) -f fexist.mk
+	$(MAKE) -f fisdir.mk
+	$(MAKE) -f fsendfile.mk
+	$(MAKE) -f lfile.mk
+	$(MAKE) -f makepath.mk
+	$(MAKE) -f pidfilefn.mk
+	$(MAKE) -f progress.mk
+	$(MAKE) -f rsync.mk
+	$(MAKE) -f tempfile.mk
+	$(MAKE) -f tree.mk
 
 $(OBJS): Makefile
 
@@ -89,7 +73,7 @@ $(SOLIB): Makefile $(OBJS)
 
 $(STATICLIB): Makefile $(OBJS)
 	$(Q)$(PRINT) "  ARCHIVE $@\n"
-	$(Q)$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(Q)$(AR) $(ARFLAGS) $@ $(OBJS) 2>/dev/null
 
 install-exec: all
 	$(PRINT) "  INSTALL $(DESTDIR)$(libdir)/$(SOLIB)\n"
@@ -106,13 +90,15 @@ install-dev:
 	$(PRINT) "  INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n"
 	$(Q)install -d $(DESTDIR)$(libdir)
 	$(Q)$(INSTALL) $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
+
+install-data:
 	$(Q)install -d $(DESTDIR)$(datadir)
-	$(Q)for file in $(DISTFILES); do					\
+	$(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
+install: install-exec install-dev install-data
 
 uninstall:
 	-$(Q)$(RM) -r $(DESTDIR)$(datadir)
@@ -130,11 +116,9 @@ strip: $(TARGET)
 check: clean
 	$(Q)scan-build $(MAKE) all
 
-clean:
-	-$(Q)$(RM) $(OBJS) $(DEPS) $(TARGET) $(SOLIB) $(STATICLIB)
-
-distclean:
-	-$(Q)$(RM) $(JUNK) unittest *.o *.a *.so* *.unittest
+# When called from GNU configure and build system
+distdir:
+	@git archive --format=tar HEAD | (cd $(distdir); tar xf -)
 
 dist:
 	$(Q)echo "Building .xz tarball of $(PKG) in parent dir..."

README.md

@@ -1,5 +1,6 @@
 -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
@@ -31,11 +32,11 @@ Helper Macros
 
 - `blkdev(dev)`
 
-Create block device
+  Create block device
 
 - `chardev(dev)`
 
-Create character device
+  Create character device
 
 - `erase(path)`
 
@@ -49,17 +50,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 +137,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 +176,24 @@ 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 file name has the form
+  `/var/run/basename.pid`.
 
-  Use this function to create a pid file for your daemon when it is
+  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 +204,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,7 +220,16 @@ 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
@@ -168,6 +241,9 @@ The following are the popular OpenBSD string functions.
 
   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.  See previous section for details.
+
 - `strlcpy(dst, src, len)`
 
   http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/strlcpy.3
@@ -200,7 +276,8 @@ TODO
 [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:

chomp.c

@@ -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"

chomp.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = chomp.test clean
+
+include rules.mk

conio.h

@@ -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:
+ */

copyfile.c

@@ -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"

copyfile.mk

@@ -0,0 +1,4 @@
+OBJS        = fisdir.o fexist.o fmode.o
+TARGET      = $(OBJS) copyfile.test clean
+
+include rules.mk

dir.c

@@ -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"

dir.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = dir.test clean
+
+include rules.mk

fexist.c

@@ -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"

fexist.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = fexist.test clean
+
+include rules.mk

fisdir.c

@@ -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"

fisdir.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = fisdir.test clean
+
+include rules.mk

fsendfile.c

@@ -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"

fsendfile.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = fsendfile.test clean
+
+include rules.mk

lfile.c

@@ -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:
+ */

lfile.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = lfile.test clean
+
+include rules.mk

lite.h

@@ -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,9 +98,34 @@ 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
@@ -118,23 +154,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 +181,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:

makepath.c

@@ -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"

makepath.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = makepath.test clean
+
+include rules.mk

pidfile.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: pidfile.c,v 1.10 2014/06/30 00:26:22 deraadt Exp $	*/
+/*	$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 $	*/
 
 /*-
@@ -37,7 +37,8 @@
 #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);
@@ -47,7 +48,7 @@ extern char *__progname;
 int
 pidfile(const char *basename)
 {
-	int save_errno, result;
+	int save_errno;
 	pid_t pid;
 	FILE *f;
 
@@ -60,8 +61,7 @@ pidfile(const char *basename)
 	}
 
 	/* _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) {
@@ -84,6 +84,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 (pidfile_pid == pid)
+		return (0);
+
 	pidfile_pid = pid;
 	if (atexit(pidfile_cleanup) < 0) {
 		save_errno = errno;
@@ -105,3 +112,4 @@ pidfile_cleanup(void)
 	if (pidfile_path != NULL && pidfile_pid == getpid())
 		(void) unlink(pidfile_path);
 }
+#endif

pidfilefn.c

@@ -119,38 +119,54 @@ 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 "lite.h"
+
+extern char *__progname;
+static char PIDFILE[42];
 
 static void sigterm_handler(int signo)
 {
-	fprintf(stderr, "Exiting ...\n");
+	printf("Exiting ...\n");
 }
 
 static void sigalrm_handler(int signo)
 {
-	fprintf(stderr, "Testing pidfile() ...\n");
+	printf("Testing pidfile() ...\n");
 	pidfile(NULL);
+
+	if (!fexist(PIDFILE))
+		err(1, "pidfile() failed creating %s", PIDFILE);
 }
 
 int main(void)
 {
+	char cmd[80];
+
+	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");
+	printf("Testing pidfile_poll() ...\n");
 	if (!pidfile_poll(PIDFILE))
-		fprintf(stderr, "Timed out!\n");
+		printf("Timed out!\n");
 	else
-		fprintf(stderr, "We got signal!\n");
+		printf("We got signal!\n");
 
-	system("ls -ld " PIDFILE);
+	printf("Reading pid file, should be %d ...\n", getpid());
+        printf("=> %d\n", pidfile_read(PIDFILE));
 
-	fprintf(stderr, "Reading pid file, should be %d ...\n", getpid());
-        fprintf(stderr, "=> %d\n", pidfile_read(PIDFILE));
-
-        fprintf(stderr, "Signalling ourselves ...\n");
+	/* Occular verification that calling pidfile() again updates mtime */
+	snprintf(cmd, sizeof(cmd), "ls -l --full-time %s", PIDFILE);
+	system(cmd);
+	printf("Before ^^ pidfile() vv after ...\n");
+	pidfile(NULL);
+	system(cmd);
+	
+        printf("Signalling ourselves ...\n");
 
 	return pidfile_signal(PIDFILE, SIGTERM);
 }
@@ -158,7 +174,7 @@ int main(void)
 
 /**
  * Local Variables:
- *  compile-command: "gcc -g -o unittest -DUTEST_PIDFN pidfile.c chomp.c pidfilefn.c && ./unittest"
+ *  compile-command: "make V=1 -f pidfilefn.mk"
  *  version-control: t
  *  indent-tabs-mode: t
  *  c-file-style: "linux"

pidfilefn.mk

@@ -0,0 +1,5 @@
+OBJS        = pidfile.o chomp.o fexist.o
+ASROOT      = 1
+TARGET      = clean $(OBJS) pidfilefn.test
+
+include rules.mk

progress.c

@@ -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:
+ */

progress.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = progress.test clean
+
+include rules.mk

queue.h

@@ -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_ */

rsync.c

@@ -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"

rsync.mk

@@ -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

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

strlcat.c

@@ -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:
- */
-
-

strlcpy.c

@@ -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:
- */

strtonum.c

@@ -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;

tempfile.c

@@ -17,6 +17,7 @@
 
 #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() */
@@ -41,6 +42,7 @@
  */
 FILE *tempfile(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
 	int fd;
 	mode_t oldmask;
 
@@ -51,6 +53,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 +69,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"

tempfile.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = tempfile.test clean
+
+include rules.mk

tree.c

@@ -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:
+ */

tree.mk

@@ -0,0 +1,4 @@
+OBJS        = 
+TARGET      = clean $(OBJS) tree.test
+
+include rules.mk