Bump version for v2.1.0 release

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

ChangeLog.md

@@ -3,6 +3,53 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v2.1.0][] - 2019-08-26
+-----------------------
+
+### Changes
+- Add support for `strmatch()` and `strnmatch()`
+- Add support for `yorn()`, safe yes-or-no prompt
+- Add support for telnet expect/session APIs
+- Add modified `printhdr()` which takes ANSI attribute
+
+### Fixes
+- Fix `pidfile_signal()`: always return result of `kill()`, or the
+  result of `remove()` if we successfully sent `SIGKILL`
+- Fix `strtonum()`: POSIX `strtoll()` returns `EINVAL`, check that
+- Fix #13, support C++ `extern "C" {}` for header files
+
+
+[v2.0.2][] - 2018-05-10
+-----------------------
+
+### Fixes
+- Fix issue #12, missing includes in `strlite.h` for standalone use
+- FTBFS `strtonum.c` on older systems w/o `LLONG_MAX` and `LLONG_MIN`
+
+
+[v2.0.1][] - 2017-12-22
+-----------------------
+
+### Changes
+- Add missing `initscr()` declaration, regression in [v2.0.0][]
+- Add `#ifdef` guards around `min()` and `max()` macros
+- Add `const` to `char *` args in multiple API:s:
+  - `fexist()`
+  - `fgetint()`
+  - `fisslashdir()`
+  - `copyfile()`
+  - `movefile()`
+  - `ifconfig()`
+  - `lfopen()`
+  - `lfgetkey()`
+  - `lfgetint()`
+
+### Fixes
+- Fix #9, uncommon location of `which` command in unit test
+- Fix #10, supply unit test with a default `$PATH`
+- Fix #11, `touch()` command cannot handle relative paths when updating
+  the mtime of an existing file
+
 
 [v2.0.0][] - 2017-11-22
 -----------------------
@@ -292,7 +339,10 @@ problems this may cause!
 Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 
 
-[UNRELEASED]: https://github.com/troglobit/libite/compare/v2.0.0...HEAD
+[UNRELEASED]: https://github.com/troglobit/libite/compare/v2.1.0...HEAD
+[v2.1.0]: https://github.com/troglobit/libite/compare/v2.0.2...v2.1.0
+[v2.0.2]: https://github.com/troglobit/libite/compare/v2.0.1...v2.0.2
+[v2.0.1]: https://github.com/troglobit/libite/compare/v2.0.0...v2.0.1
 [v2.0.0]: https://github.com/troglobit/libite/compare/v1.9.3...v2.0.0
 [v1.9.3]: https://github.com/troglobit/libite/compare/v1.9.2...v1.9.3
 [v1.9.2]: https://github.com/troglobit/libite/compare/v1.9.1...v1.9.2
@@ -320,9 +370,3 @@ Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 [Inadyn]: https://github.com/troglobit/inadyn/
 [Mg]:     https://github.com/troglobit/mg
 [README]: https://github.com/troglobit/libite/blob/v1.0.0/README.md
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->

Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS     = -I m4
 
-doc_DATA            = README.md LICENSE
+doc_DATA            = README.md LICENSE ChangeLog.md
 EXTRA_DIST          = README.md LICENSE ChangeLog.md
 pkgconfigdir        = $(libdir)/pkgconfig
 pkgconfig_DATA      = libite.pc

README.md

@@ -20,24 +20,19 @@ Table of Contents
 Introduction
 ------------
 
-Libite is a lightweight library of *frog DNA*.  It can be used to fill
+Libite is a lightweight library of *frog DNA* that can be used to fill
 the gaps in any dinosaur project.  It holds useful functions and macros
 developed by both [Finit][1] and the [OpenBSD][2] project.  Most notably
 the string functions: [strlcpy(3)][3], [strlcat(3)][3] and the highly
 useful *BSD [sys/queue.h][4] and [sys/tree.h][7] API's.
 
-Libite is the frog DNA missing in GNU libc.  However, -lite does not aim
-to become another [GLIB][5]!  One noticeable gap in GLIBC is the missing
-`_SAFE` macros in the BSD `sys/queue.h` API — highly recommended
-when traversing lists to delete/free nodes.
+Libite holds many of the missing pieces in GNU libc, although -lite does
+not aim to become another [GLIB][5].  One noticeable gap in GLIBC is the
+`_SAFE` macros available in the BSD `sys/queue.h` API — highly
+recommended when traversing lists to delete/free nodes.
 
-The code is open sourced under a mix of the [MIT/X11 license][MIT], the
-[ISC license][ISC] used by OpenBSD, and [BSD licenses][BSD], all of them
-are extremely liberal and can be used freely in proprietary software if
-needed.
-
-For an introduction to why Libite happened, and how you can use it, see
-[this blog post][6].
+The code is open sourced under a mix of permissive Open Source licenses:
+[MIT/X11 license][MIT], [ISC license][ISC], and [BSD licenses][BSD].
 
 
 Using -lite
@@ -289,6 +284,20 @@ Generic Functions
   `delete`, it is now called `opt`.  The APIs are 100% compatible if the
   value `1` was used.
 
+- `strmatch()`, `strnmatch()`
+
+  Find matching string in an array of strings.  Returns index in array
+  on match, or `-1` on error or not found.
+
+- `telnet_open(), telnet_close(), telnet_expect()`
+
+  Poor mans telnet expect in C.  Opens connection to a Telnet service;
+  FTP, Telnet, similar, and run an expect-like script.
+
+- `telnet_session()`
+
+  Wrapper for the above three in one API.
+
 - `tempfile()`
 
   Secure replacement for `tmpfile()`.  Creates an invisible temporary
@@ -308,6 +317,11 @@ Generic Functions
   **Note:** `which("/bin/ps aux")` will return `/bin/ps`, or `TRUE`,
   provided of course `/bin/ps` exists.
 
+- `yorn(fmt, ...)`
+
+  Pose a question to user, appended with `(y/N)?`, returns `TRUE` for
+  yes (both `y` and `Y` are handled) and `FALSE` for everything else.
+
 
 GNU Functions
 -------------
@@ -383,40 +397,25 @@ Build & Install
 
 This library was initially built for and developed on GNU/Linux systems
 as a light weight utility library, these days NetBSD should also work.
-Libite (LITE) employs the de facto standard GNU configure and build
-system:
 
     ./configure
     make -j5
     sudo make install-strip
     sudo ldconfig
 
-**Note:** When checking code from GitHub, use <kbd>./autogen.sh</kbd> to
-generate a `configure` script.  It is a generated file and otherwise only
-included in released tarballs.
+**Note:** When checking out code from GIT, use <kbd>./autogen.sh</kbd>
+to generate a `configure` script.  It is a generated file and otherwise
+only included in released tarballs.
 
 
-TODO
-----
-
-- Improve documentation, possibly use kdoc or gdoc2 to generate docs from API.
-- Continuously, update OpenBSD functions/macros.
-
 [1]: https://github.com/troglobit/finit
 [2]: http://www.openbsd.org/
 [3]: http://www.openbsd.org/cgi-bin/man.cgi?query=strlcpy
 [4]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/LIST_EMPTY.3
 [5]: https://developer.gnome.org/glib/
-[6]: http://troglobit.com/blog/2015/07/02/howto-using-lite-with-a-git-based-application/
 [7]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/SPLAY_FOREACH.3
 [MIT]: https://en.wikipedia.org/wiki/MIT_License
 [ISC]: https://en.wikipedia.org/wiki/ISC_license
 [BSD]: https://en.wikipedia.org/wiki/BSD_licenses
 [Travis]: https://travis-ci.org/troglobit/libite
 [Travis Status]: https://travis-ci.org/troglobit/libite.png?branch=master
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->

TODO.md

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

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(libite, 2.0.0, https://github.com/troglobit/libite/issues)
+AC_INIT(libite, 2.1.0, https://github.com/troglobit/libite/issues)
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 

debian/changelog

@@ -1,3 +1,27 @@
+libite (2.1.0) unstable; urgency=medium
+
+  * New functions; strmatch(), strnmatch(), yorn(), telnet expect APIs
+  * Fixes to pidfile_signal(), strtonum() and C++ linking
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Mon, 26 Aug 2019 20:21:46 +0200
+
+libite (2.0.2) unstable; urgency=medium
+
+  * Fix issues with using `strlite.h` standalone
+  * Fix build issue with `strtonum.c` older GLIBC
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Thu, 10 May 2018 19:12:57 +0200
+
+libite (2.0.1-1) unstable; urgency=medium
+
+  * New upstream release, v2.0.1, fixes to:
+    - touch(), cannot handle relative paths when updating mtime
+    - unit test for which()
+    - add missing initscr() declaration in conio.h
+    - ifdef guards around min()/max() macros
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Fri, 22 Dec 2017 12:11:41 +0100
+
 libite (2.0.0-1) unstable; urgency=low
 
   * New upstream release, v2.0.0, fixes to:

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

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

debian/copyright

@@ -61,9 +61,13 @@ Copyright: 2009 William Ahern
 License: MIT
 
 Files: strlcat.c strlcpy.c
-Copyright: 998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+Copyright: 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
 License: MIT
 
+Files: strmatch.c
+Copyright: 2009-2018 Joachim Nilsson <troglobit@gmail.com>
+License: ISC
+
 Files: strnlen.c
 Copyright: 2016 Joachim Nilsson <troglobit@gmail.com>
 License: ISC
@@ -72,6 +76,10 @@ Files: strtonum.c
 Copyright: 2004 Ted Unangst and Todd Miller
 License: ISC
 
+Files: telnet.c
+Copyright: 2010, 2013, 2019 Joachim Nilsson <troglobit@gmail.com>
+License: ISC
+
 Files: tempfile.c
 Copyright: 2015-2016 Joachim Nilsson <troglobit@gmail.com>
 License: ISC
@@ -80,5 +88,9 @@ Files: tree.c
 Copyright: 2015 Joachim Nilsson <troglobit@gmail.com>
 License: ISC
 
+Files: yorn.c
+Copyright: 2009 Joachim Nilsson <troglobit@gmail.com>
+License: ISC
+
 Files: tests/*.c
 License: public-domain

debian/rules

@@ -1,4 +1,5 @@
 #!/usr/bin/make -f           
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -6,3 +7,9 @@
 %:
 	dh $@ --with autoreconf
 
+override_dh_auto_install:
+	dh_auto_install
+	-rm -f debian/libite/usr/share/doc/libite/LICENSE
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog.md

debian/source/options

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

src/Makefile.am

@@ -2,7 +2,7 @@ lib_LTLIBRARIES       = libite.la
 
 libite_la_CPPFLAGS    = -D_GNU_SOURCE
 libite_la_CFLAGS      = -W -Wall -Wextra
-libite_la_LDFLAGS     = $(AM_LDFLAGS) -version-info 5:0:0
+libite_la_LDFLAGS     = $(AM_LDFLAGS) -version-info 5:1:0
 libite_la_SOURCES     = chomp.c		copyfile.c			\
 			conio.c		conio.h				\
 			dir.c						\
@@ -14,11 +14,13 @@ libite_la_SOURCES     = chomp.c		copyfile.c			\
 			reallocarray.c	rsync.c				\
 			strlcpy.c 	strlcat.c 	strtonum.c	\
 			strdupa.h	strndupa.h	strnlen.h	\
-			tempfile.c	which.c				\
+			strmatch.c	telnet.c	tempfile.c	\
+			yorn.c		which.c				\
 			lite.h		strlite.h			\
 			queue.h		tree.h
 
 
 ## Distribute these header files in the <lite/...> name space
 pkgincludedir       = $(includedir)/lite
-pkginclude_HEADERS  = lite.h queue.h conio.h tree.h strlite.h strdupa.h strndupa.h strnlen.h
+pkginclude_HEADERS  = lite.h queue.h conio.h tree.h strlite.h strdupa.h	\
+		      strndupa.h strnlen.h

src/conio.h

@@ -15,6 +15,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef CONIO_H_
 #define CONIO_H_
 
@@ -75,17 +80,36 @@
 #define textcolor(color)      __set_gm(RESETATTR, color, 30)
 #define textbackground(color) __set_gm(RESETATTR, color, 40)
 
-/* Print table heading @line to @fp, with optional leading newline */
+void initscr(int *row, int *col);
+
+/* Print table heading @line to @fp, with optional leading newline
+ * Example:
+ * _________________ <-- Empty line with UNDERSCORE to frame first heading
+ * First heading     <-- In normal/RESETATTR
+ * SUBHEADING        <-- In REVERSE and with capital letters like 'top'
+ */
+static inline void printhdr(FILE *fp, const char *line, int nl, int attr)
+{
+	if (attr < 0 || attr > 8)
+		attr = REVERSE;
+
+	fprintf(fp ?: stdout,
+		"%s\033[%dm%s%*s\033[0m\n",
+		nl ? "\n" : "", attr, line,
+		SCREEN_WIDTH - (int)strlen(line), "");
+}
+
 static inline void printheader(FILE *fp, const char *line, int nl)
 {
-	fprintf(fp ?: stdout,
-		"%s\033[7m%s%*s\033[0m\n",
-		nl ? "\n" : "",
-		line, SCREEN_WIDTH - (int)strlen(line), "");
+	printhdr(fp, line, nl, REVERSE);
 }
 
 #endif /* CONIO_H_ */
 
+#ifdef __cplusplus
+}
+#endif
+
 /**
  * Local Variables:
  *  indent-tabs-mode: t

src/copyfile.c

@@ -27,7 +27,7 @@
 #include "lite.h"
 
 /* Tests if dst is a directory, if so, reallocates dst and appends src filename returning 1 */
-static int adjust_target(char *src, char **dst)
+static int adjust_target(const char *src, char **dst)
 {
 	int isdir = 0;
 
@@ -36,7 +36,7 @@ static int adjust_target(char *src, char **dst)
 		char *tmp, *ptr = strrchr(src, '/');
 
 		if (!ptr)
-			ptr = src;
+			ptr = (char *)src;
 		else
 			ptr++;
 
@@ -115,9 +115,9 @@ static void set_mtime(int in, int out)
  * may also indicate that @src was empty.  If @src is a directory @errno
  * will be set to %EISDIR since copyfile() is not recursive.
  */
-ssize_t copyfile(char *src, char *dst, int len, int opt)
+ssize_t copyfile(const char *src, const char *dst, int len, int opt)
 {
-	char *buffer;
+	char *buffer, *dest = (char *)dst;
 	int sym = (opt & LITE_FOPT_COPYFILE_SYM) != 0;
 	int keep_mtim = (opt & LITE_FOPT_KEEP_MTIME) != 0;
 	int in, out, isdir = 0, saved_errno = 0;
@@ -137,7 +137,7 @@ ssize_t copyfile(char *src, char *dst, int len, int opt)
 	}
 
 	/* Check if target is a directory, then append src filename. */
-	isdir = adjust_target(src, &dst);
+	isdir = adjust_target(src, &dest);
 
 	/* Check if the source file is a symlink ... */
 	if (stat(src, &st)) {
@@ -154,7 +154,7 @@ ssize_t copyfile(char *src, char *dst, int len, int opt)
 				size = -1;
 			} else {
 				buffer[size] = 0;
-				size = !symlink(buffer, dst);
+				size = !symlink(buffer, dest);
 			}
 		}
 
@@ -175,7 +175,7 @@ ssize_t copyfile(char *src, char *dst, int len, int opt)
 		goto exit;
 	}
 
-	out = open(dst, O_WRONLY | O_CREAT | O_TRUNC, st.st_mode);
+	out = open(dest, O_WRONLY | O_CREAT | O_TRUNC, st.st_mode);
 	if (out < 0) {
 		close(in);
 		saved_errno = errno;
@@ -194,7 +194,7 @@ ssize_t copyfile(char *src, char *dst, int len, int opt)
 exit:
 	free(buffer);
 	if (isdir)
-		free(dst);
+		free(dest);
 	errno = saved_errno;
 
 	return size;
@@ -216,17 +216,18 @@ exit:
  * Returns:
  * POSIX OK(0), or non-zero with errno set.
  */
-int movefile(char *src, char *dst)
+int movefile(const char *src, const char *dst)
 {
+	char *dest = (char *)dst;
 	int isdir, result = 0;
 
 	/* Check if target is a directory, then append the src base filename. */
-	isdir = adjust_target(src, &dst);
+	isdir = adjust_target(src, &dest);
 
-	if (rename(src, dst)) {
+	if (rename(src, dest)) {
 		if (errno == EXDEV) {
 			errno = 0;
-			copyfile(src, dst, 0, 1);
+			copyfile(src, dest, 0, 1);
 			if (errno)
 				result = 1;
 			else
@@ -237,7 +238,7 @@ int movefile(char *src, char *dst)
 	}
 
 	if (isdir)
-		free(dst);
+		free(dest);
 
 	return result;
 }

src/fexist.c

@@ -31,7 +31,7 @@
  * Returns:
  * %TRUE(1) if the file exists, otherwise %FALSE(0).
  */
-int fexist(char *file)
+int fexist(const char *file)
 {
 	if (!file) {
 		errno = EINVAL;

src/fisdir.c

@@ -25,17 +25,17 @@
 #include <unistd.h>
 
 /**
- * fexist - Check if a file exists and is a directory.
- * @file: File to look for, with full path.
+ * fisdir - Check if a path exists and is a directory.
+ * @path: Path to file or directory
  *
  * Returns:
- * %TRUE(1) if the file exists and is a directory, otherwise %FALSE(0).
+ * %TRUE(1) if @path exists and is a directory, otherwise %FALSE(0).
  */
-int fisdir(const char *file)
+int fisdir(const char *path)
 {
 	struct stat sb;
 
-	if (!stat(file, &sb) && S_ISDIR(sb.st_mode))
+	if (!stat(path, &sb) && S_ISDIR(sb.st_mode))
 		return 1;
 
 	return 0;

src/fsendfile.c

@@ -51,8 +51,8 @@ ssize_t fsendfile(FILE *src, FILE *dst, size_t len)
                 errno = EINVAL;
                 return -1;
         }
-                
-	buf = (char *)malloc(BUFSIZ);
+
+	buf = malloc(BUFSIZ);
 	if (!buf)
 		return -1;
 

src/ifconfig.c

@@ -43,7 +43,7 @@ extern size_t strlcpy(char *dst, const char *src, size_t siz);
  * Returns:
  * POSIX OK(0) on success, or non-zero on error.
  */
-int ifconfig(char *ifname, char *addr, char *mask, int up)
+int ifconfig(const char *ifname, const char *addr, const char *mask, int up)
 {
 	int sd, ret = -1;
 	struct ifreq ifr;

src/lfile.c

@@ -24,7 +24,8 @@
 typedef struct lfile {
 	FILE *fp;
 	char buf[256];
-	char *sep, *save;
+	char *save;
+	const char *sep;
 } lfile_t;
 
 /**
@@ -35,7 +36,7 @@ typedef struct lfile {
  * Returns:
  * Pointer to a &lftile_t parser context, or %NULL on error.
  */
-lfile_t *lfopen(char *file, char *sep)
+lfile_t *lfopen(const char *file, const char *sep)
 {
 	lfile_t *lf;
 
@@ -92,23 +93,20 @@ char *lftok(lfile_t *lf)
 	}
 
 	token = strtok_r(NULL, lf->sep, &lf->save);
-	if (!token) {
-		while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
-			if (lf->buf[0] == '#')
-				continue;
+	if (token)
+		return token;
 
-			token = strtok_r(lf->buf, lf->sep, &lf->save);
-			if (!token)
-				continue;
-			
+	while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
+		if (lf->buf[0] == '#')
+			continue;
+
+		token = strtok_r(lf->buf, lf->sep, &lf->save);
+		if (token)
 			return token;
-		}
-
-		errno = ENOENT;
-		return NULL;
 	}
 
-	return token;
+	errno = ENOENT;
+	return NULL;
 }
 
 /**
@@ -125,7 +123,7 @@ char *lftok(lfile_t *lf)
  * Returns:
  * The value to @key, or %NULL if not found.
  */
-char *lfgetkey(lfile_t *lf, char *key)
+char *lfgetkey(lfile_t *lf, const char *key)
 {
 	char *token;
 
@@ -151,7 +149,7 @@ char *lfgetkey(lfile_t *lf, char *key)
  * Returns:
  * The positive integer value for @key, or -1 if not found.
  */
-int lfgetint(lfile_t *lf, char *key)
+int lfgetint(lfile_t *lf, const char *key)
 {
 	char *token = lfgetkey(lf, key);
 
@@ -173,7 +171,7 @@ int lfgetint(lfile_t *lf, char *key)
  * Returns:
  * The positive integer value for @key, or -1 if not found.
  */
-int fgetint(char *file, char *sep, char *key)
+int fgetint(const char *file, const char *sep, const char *key)
 {
 	int val = -1;
 	lfile_t *lf;

src/lite.h

@@ -22,10 +22,16 @@
  * THE SOFTWARE.
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef LITE_H_
 #define LITE_H_
 
 #include <errno.h>
+#include <fcntl.h>     /* Definition of AT_* constants for utimensat() */
 #include <stdio.h>
 #include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
 #include <sys/stat.h>
@@ -51,27 +57,28 @@
 #define LITE_FOPT_KEEP_MTIME    0x02
 
 typedef struct lfile lfile_t;
+typedef struct sdbuf sdbuf_t;
 
 char   *chomp      (char *str);
 char   *fparseln   (FILE *, size_t *, size_t *, const char[3], int);
 
-int     fexist     (char *file);
-int     fisdir     (const char *file);
+int     fexist     (const char *file);
+int     fisdir     (const char *path);
 
 FILE   *tempfile   (void);
-ssize_t copyfile   (char *src, char *dst, int len, int opt);
-int     movefile   (char *src, char *dst);
+ssize_t copyfile   (const char *src, const char *dst, int len, int opt);
+int     movefile   (const char *src, const char *dst);
 int     fcopyfile  (FILE *src, FILE *dst);
 ssize_t fsendfile  (FILE *src, FILE *dst, size_t len);
 
-int     ifconfig   (char *ifname, char *addr, char *mask, int up);
+int     ifconfig   (const char *ifname, const char *addr, const char *mask, int up);
 
-lfile_t*lfopen     (char *file, char *sep);
+lfile_t*lfopen     (const char *file, const 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);
+char   *lfgetkey   (lfile_t *lf, const char *key);
+int     lfgetint   (lfile_t *lf, const char *key);
+int     fgetint    (const char *file, const char *sep, const char *key);
 
 int     mkpath     (const char *dir, mode_t mode);
 int     makepath   (const char *dir);
@@ -89,6 +96,13 @@ void   *reallocarray(void *optr, size_t nmemb, size_t size);
 void    progress       (int percent, int max_width);
 void    progress_simple(int percent);
 
+sdbuf_t*telnet_open    (int addr, short port);
+int     telnet_close   (sdbuf_t *ctx);
+int     telnet_expect  (sdbuf_t *ctx, char *script[], FILE *output);
+int     telnet_session (int addr, short port, char *script[], FILE *output);
+
+int     yorn       (const char *fmt, ...);
+
 char   *which      (const char *cmd);
 int     whichp     (const char *cmd);
 
@@ -99,7 +113,7 @@ static inline int touch(const char *path)
 {
 	if (mknod((path), S_IFREG|0644, 0)) {
 		if (errno == EEXIST)
-			return utimensat(0, path, NULL, 0);
+			return utimensat(AT_FDCWD, path, NULL, 0);
 		return -1;
 	}
 	return 0;
@@ -164,7 +178,7 @@ static inline int erase(const char *path)
 #endif
 
 /* Does directory end with a slash? */
-static inline int fisslashdir(char *dir)
+static inline int fisslashdir(const char *dir)
 {
    if (!dir)
 	   return 0;
@@ -182,6 +196,10 @@ static inline int fisslashdir(char *dir)
 
 #endif /* LITE_H_ */
 
+#ifdef __cplusplus
+}
+#endif
+
 /**
  * Local Variables:
  *  indent-tabs-mode: t

src/pidfilefn.c

@@ -111,10 +111,10 @@ int pidfile_signal(const char *pidfile, int signal)
 		return 1;
 
 	ret = kill(pid, signal);
-	if ((ret == -1) || (signal == SIGTERM) || (signal == SIGKILL))
-		(void)remove(pidfile);
+	if (!ret && signal == SIGKILL)
+		ret = remove(pidfile);
 
-	return 0;
+	return ret;
 }
 
 /**

src/queue.h

@@ -32,6 +32,11 @@
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef	_SYS_QUEUE_H_
 #define	_SYS_QUEUE_H_
 
@@ -531,3 +536,7 @@ struct {								\
 } while (0)
 
 #endif	/* !_SYS_QUEUE_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/strdupa.h

@@ -23,6 +23,12 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  * ==========================================================================
  */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef LITE_STRDUPA_H
 #define LITE_STRDUPA_H
 
@@ -50,3 +56,7 @@
 #endif /* !HAVE_STRDUPA */
 
 #endif /* LITE_STRDUPA_H */
+
+#ifdef __cplusplus
+}
+#endif

src/strlite.h

@@ -21,14 +21,42 @@
  * THE SOFTWARE.
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef LITE_STRING_H_
 #define LITE_STRING_H_
 
+#include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
 #include <string.h>
+#include <sys/param.h> /* MAX(), isset(), setbit(), TRUE, FALSE, et consortes. :-) */
+
 #include "strdupa.h"
 #include "strndupa.h"
 #include "strnlen.h"
 
+#ifndef min
+#define min(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a < _b ? _a : _b;		\
+	})
+#endif
+#ifndef max
+#define max(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a > _b ? _a : _b;		\
+	})
+#endif
+
+int     strnmatch  (const char *str, const char **list, size_t num);
+int     strmatch   (const char *str, const char **list);
+
 #ifndef strlcpy
 size_t  strlcpy    (char *dst, const char *src, size_t siz);
 #endif
@@ -82,19 +110,8 @@ static inline int string_case_compare(const char *a, const char *b)
    return strlen (a) == strlen (b) && !strcasecmp (a, b);
 }
 
-#define min(a,b)				\
-	({					\
-		__typeof__ (a) _a = (a);	\
-		__typeof__ (b) _b = (b);	\
-		_a < _b ? _a : _b;		\
-	})
-
-#define max(a,b)				\
-	({					\
-		__typeof__ (a) _a = (a);	\
-		__typeof__ (b) _b = (b);	\
-		_a > _b ? _a : _b;		\
-	})
-
-
 #endif /* LITE_STRING_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/strmatch.c

@@ -0,0 +1,89 @@
+/* Simple string matcher function, finds partial matches.
+ *
+ * Copyright (c) 2009-2018  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 <string.h>
+
+
+/**
+ * strnmatch - Finds matching strings from a finite list
+ * @str: String to look for
+ * @list: List of strings to search.
+ * @num: Number of entries in @list.
+ *
+ * This function searches the @list of strings for @str.  If a (partial) match
+ * is found it returns the index in the @list.
+ *
+ * Very similar in function to strmatch(), but works for sets of strings that
+ * are not %NULL terminated.
+ *
+ * Returns:
+ * -1 on error, otherwise the index to the matching string.
+ */
+int strnmatch(const char *str, const char **list, size_t num)
+{
+	size_t i;
+
+	if (!str || !list) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	for (i = 0; i < num; i++) {
+		if (!strncasecmp (str, list[i], strlen (str)))
+			return i;
+	}
+
+	errno = ENOENT;
+	return -1;
+}
+
+/**
+ * strmatch - Finds matching strings from a list
+ * @str: String to look for
+ * @list: %NULL terminated list of strings to search.
+ *
+ * This function searches the @list of strings for @str.  If a (partial) match
+ * is found it returns the index in the @list.
+ *
+ * Please note, the @list MUST be terminated by a %NULL element.  If that is
+ * not possible for you, we recommend using strnmatch() instead.
+ *
+ * Returns:
+ * -1 on error, otherwise the index to the matching string.
+ */
+int strmatch(const char *str, const char **list)
+{
+	size_t i;
+
+	if (!list) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	for (i = 0; list[i]; i++)
+		;
+
+	return strnmatch(str, list, i);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/strndupa.h

@@ -23,6 +23,12 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  * ==========================================================================
  */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef LITE_STRNDUPA_H_
 #define LITE_STRNDUPA_H_
 
@@ -51,3 +57,7 @@
 #endif /* !HAVE_STRNDUPA */
 
 #endif /* GNU_STRING_STRNDUPA_H */
+
+#ifdef __cplusplus
+}
+#endif

src/strnlen.h

@@ -15,6 +15,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef LITE_STRNLEN_H_
 #define LITE_STRNLEN_H_
 
@@ -41,3 +46,7 @@ static inline size_t xstrnlen(const char *str, size_t lim)
 #endif
 
 #endif /* LITE_STRNLEN_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/strtonum.c

@@ -26,6 +26,15 @@
 #define	TOOSMALL	2
 #define	TOOLARGE	3
 
+#ifndef LLONG_MAX
+# define LLONG_MAX	0x7fffffffffffffffLL
+#endif
+
+#ifndef LLONG_MIN
+# define LLONG_MIN	(-0x7fffffffffffffffLL - 1)
+#endif
+
+
 long long
 strtonum(const char *numstr, long long minval, long long maxval,
     const char **errstrp)
@@ -49,7 +58,7 @@ strtonum(const char *numstr, long long minval, long long maxval,
 		error = INVALID;
 	} else {
 		ll = strtoll(numstr, &ep, 10);
-		if (numstr == ep || *ep != '\0')
+		if (errno == EINVAL || numstr == ep || *ep != '\0')
 			error = INVALID;
 		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
 			error = TOOSMALL;

src/telnet.c

@@ -0,0 +1,291 @@
+/* Poor mans telnet expect in C.
+ *
+ * Copyright (c) 2010, 2013, 2019  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 <poll.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+
+#include "lite.h"
+
+#define  EXPECT_DEBUG        0
+#define  EXPECT_POLL_TIMEOUT 3000	/* 3 sec timeout waiting for server. */
+
+#if EXPECT_DEBUG
+# define TELL(fmt, args...) fprintf (stderr, fmt "\n", ##args)
+#else
+# define TELL(fmt, args...)
+#endif
+
+struct sdbuf {
+	int sd;
+	char *buf;
+} sdbuf;
+
+/* Open telnet connection to @addr:@port and connect. */
+sdbuf_t *telnet_open(int addr, short port)
+{
+	struct sockaddr_in *sin;
+	struct sockaddr s;
+	sdbuf_t *ctx;
+	int saved_errno;
+
+	ctx = (sdbuf_t *)malloc(sizeof(sdbuf_t));
+	if (!ctx) {
+//		perror("Failed allocating expect ctxect");
+		return NULL;
+	}
+
+	ctx->buf = (char *)malloc(BUFSIZ);
+	if (!ctx->buf) {
+//		perror("Failed allocating expect buffer");
+		free(ctx);
+		return NULL;
+	}
+
+	ctx->sd = socket(PF_INET, SOCK_STREAM, 0);
+	if (-1 == ctx->sd) {
+		saved_errno = errno;
+//		perror ("Failed creating socket");
+		free(ctx->buf);
+		free(ctx);
+
+		errno = saved_errno;
+		return NULL;
+	}
+
+	sin = (struct sockaddr_in *)&s;
+	sin->sin_family = AF_INET;
+	sin->sin_port = port;
+	sin->sin_addr.s_addr = addr;
+	if (-1 == connect(ctx->sd, &s, sizeof(s))) {
+		saved_errno = errno;
+//		perror ("Cannot connect to telnet daemon");
+		telnet_close(ctx);
+		errno = saved_errno;
+
+		return NULL;
+	}
+
+	return ctx;
+}
+
+int telnet_close(sdbuf_t *ctx)
+{
+	free(ctx->buf);
+	close(ctx->sd);
+	free(ctx);
+
+	return 0;
+}
+
+static int wait_substr(sdbuf_t *ctx, char *str)
+{
+	struct pollfd pfd = { ctx->sd, POLLIN, 0 };
+	ssize_t len, tot = 0;
+	int err;
+
+	while (1) {
+		err = poll(&pfd, 1, EXPECT_POLL_TIMEOUT);
+		if (err <= 0) {
+			if (0 == err)
+				errno = ETIMEDOUT;
+
+			if (EINTR == errno)
+				continue;
+
+//			perror("No prompt");
+			return 1;
+		}
+
+		len = read(ctx->sd, &ctx->buf[tot], BUFSIZ);
+		if (len <= 0) {
+			errno = ENOMSG;
+			return 1;
+		}
+
+		tot += len;
+		ctx->buf[tot] = 0;
+		TELL("Got line: '%s' is it '%s'?", ctx->buf, str);
+
+		if (strstr(ctx->buf, str))
+			return 0;
+	}
+}
+
+/**
+ * telnet_expect - Poor man's telnet expect
+ * @ctx:    Telnet session context from telnet_open()
+ * @script: %NULL terminated list of expect and response strings
+ * @output: Optional output from session
+ *
+ * Issues @script sequence on telnet session specified in @ctx, with
+ * optional @output from session.
+ *
+ * The @script consists of strings of expect and response pairs.  For
+ * example, expect "ogin: " followed by response "root\n", expect
+ * "assword: "with response "secret\n", concluded by %NULL.
+ *
+ * Returns:
+ * POSIX OK(0) or non-zero on error.
+ */
+int telnet_expect(sdbuf_t *ctx, char *script[], FILE *output)
+{
+	struct pollfd fd = { ctx->sd, POLLIN, 0 };
+	ssize_t len;
+	int i, first = 1, cont = 1, result = 0;
+
+	for (i = 0; script[i]; i++) {
+		/* when expecting the empty string, just wipe any available input */
+		if (!strlen(script[i])) {
+			result = poll(&fd, 1, 0);
+			if (result > 0)
+				lseek(ctx->sd, 0, SEEK_END);
+		} else {
+			if (wait_substr(ctx, script[i])) {
+				result = ENOMSG;
+				return 1;
+			}
+		}
+
+		i++;
+
+		if (strlen(script[i])) {
+			TELL("Sending line: '%s'", script[i]);
+			if (-1 == write(ctx->sd, script[i], strlen(script[i]))) {
+				errno = ENOSPC;
+				return 1;
+			}
+		}
+	}
+
+	while (cont) {
+		char *ptr = ctx->buf;
+		char *tmp;
+
+		result = poll(&fd, 1, EXPECT_POLL_TIMEOUT);
+		if (result <= 0) {
+			if (0 == result)
+				errno = ETIMEDOUT;
+
+			if (EINTR == errno)
+				continue;
+
+//			perror ("No result");
+			result = errno;
+			break;
+		}
+
+		/*
+		 * On VERY long outputs we need to send some love back to the
+		 * server, otherwise it terminates the connection. --Jocke
+		 */
+		if (-1 == write(ctx->sd, "\n", 1))
+			goto retry;
+
+		len = read(ctx->sd, ctx->buf, BUFSIZ);
+		if (len == -1) {
+		retry:
+			if (EINTR == errno)
+				continue;
+
+			result = errno;
+			break;
+		}
+		ctx->buf[len] = 0;
+
+		TELL("Read line: '%s'", ctx->buf);
+
+		/* Skip first line -- only an echo of the last command */
+		if (first) {
+			first = 0;
+			ptr = strchr(ctx->buf, '\n');
+			if (ptr)
+				ptr++;
+			else
+				ptr = ctx->buf;
+		}
+
+		TELL("Comparing '%s' with '%s'", ptr, script[i - 2]);
+
+		/* Skip last line -- only the returning prompt. */
+		tmp = strstr(ptr, script[i - 2]);
+		if (tmp) {
+			TELL("OK, last line.  Good bye!");
+			result = 0;
+			cont = 0;
+			*tmp = 0;
+
+			tmp = strrchr(ptr, '\n');
+			if (tmp)
+				*++tmp = 0;
+		}
+
+		if (output && *ptr) {
+			if (EOF == fputs(ptr, output)) {
+				/* Only happens when /tmp is full :( */
+				result = ENOSPC;
+				/* We must complete read-out of descriptor */
+				output = NULL;
+			}
+		}
+	}
+
+	return result;
+}
+
+/**
+ * telnet_session - Very simple expect-like implementation for telnet.
+ * @addr:   Must be in network byte order, use htonl().
+ * @port:   IP port to connect to, use htons().
+ * @script: Expect like script of paired 'expect', 'response' strings.
+ * @output: A &FILE pointer to a tmpfile() for output from the last command.
+ *
+ * This is a very simple expect-like implementation for querying and
+ * operating daemons remotely over telnet.
+ *
+ * The @script is a query-response type of list of strings leading up to
+ * a final command, which output is then written to the given @output file.
+ *
+ * Returns:
+ * POSIX OK(0), or non-zero with errno set on error.
+ */
+int telnet_session(int addr, short port, char *script[], FILE *output)
+{
+	sdbuf_t *sdbuf;
+	int result = 0;
+
+	sdbuf = telnet_open(addr, port);
+	if (!sdbuf)
+		return errno;
+
+	if (telnet_expect(sdbuf, script, output))
+		result = errno;
+
+	telnet_close(sdbuf);
+
+	return errno = result;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/tree.h

@@ -24,6 +24,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifndef	_SYS_TREE_H_
 #define	_SYS_TREE_H_
 
@@ -746,3 +751,7 @@ name##_RB_MINMAX(struct name *head, int val)				\
 	     (x) = (y))
 
 #endif	/* _SYS_TREE_H_ */
+
+#ifdef __cplusplus
+}
+#endif

src/yorn.c

@@ -0,0 +1,92 @@
+/* Safe yes-or-no with prompt
+ *
+ * Copyright (c) 2009  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 <stdio.h>
+#include <stdio_ext.h>		/* __fpurge() */
+#include <stdarg.h>
+#include <termios.h>
+#include <unistd.h>
+
+static char rawgetch(void)
+{
+	struct termios savemodes, modmodes;
+	char val;
+
+	if (!isatty(STDIN_FILENO))
+		return getchar();
+
+	/* Backup terminal settings. */
+	if (tcgetattr(STDIN_FILENO, &savemodes) < 0) {
+		return -1;
+	}
+
+	/* "stty cbreak -echo" */
+	modmodes = savemodes;
+	modmodes.c_lflag &= ~ICANON;
+	modmodes.c_lflag &= ~ECHO;
+	modmodes.c_cc[VMIN] = 1;
+	modmodes.c_cc[VTIME] = 0;
+
+	/* Set terminal in raw mode. */
+	if (tcsetattr(STDIN_FILENO, TCSANOW, &modmodes) < 0) {
+		tcsetattr(STDIN_FILENO, TCSANOW, &savemodes);
+		return -1;
+	}
+
+	val = getchar();
+
+	/* Restore terminal to previous state. */
+	tcsetattr(STDIN_FILENO, TCSANOW, &savemodes);
+
+	return val;
+}
+
+/**
+ * yorn - Pose a a Yes or No question and return answer
+ * @fmt: Standard printf() style argument(s).
+ *
+ * This function prints the given question on screen, waits for user
+ * input in the form of yes or no.
+ *
+ * Returns:
+ * True(1) or False(0).  True if the answer is yes.
+ */
+int yorn(const char *fmt, ...)
+{
+	va_list ap;
+	char yorn;
+
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+
+	__fpurge(stdin);
+	yorn = rawgetch();
+	printf("%c\n", yorn);
+	fflush(stdout);
+	if (yorn != 'y' && yorn != 'Y')
+		return 0;
+
+	return 1;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

tests/.gitignore

@@ -11,7 +11,10 @@ makepath
 pidfile
 progress
 rsync
+str
+strmatch
 tempfile
 touch
 tree
 which
+yorn

tests/Makefile.am

@@ -11,11 +11,14 @@ TESTS          += fsendfile
 TESTS          += lfile
 TESTS          += makepath
 TESTS          += pidfile
-TESTS          += touch
 TESTS          += progress
 TESTS          += rsync
+TESTS          += str
+TESTS          += strmatch
+TESTS          += touch
 TESTS          += tempfile
 TESTS          += which
+TESTS          += yorn
 
 check_PROGRAMS  = $(TESTS)
 

tests/str.c

@@ -0,0 +1,27 @@
+#include "../src/strlite.h"
+
+int main(void)
+{
+	char buf[10];
+	int val;
+
+	val = atonum("42");
+	if (val != 42)
+		return 1;
+
+	if (!string_match("eth1", "eth1234"))
+		return 1;
+
+	if (string_compare("eth1", "eth1234"))
+		return 1;
+
+	if (!string_case_compare("somestring", "SoMeSTRING"))
+		return 1;
+
+	strlcpy(buf, "tooloongstring", sizeof(buf));
+	if (buf[9] == 'r')
+		return 1;
+
+	return 0;
+}
+

tests/strmatch.c

@@ -0,0 +1,44 @@
+#include "check.h"
+#define SYSLOG_NAMES
+#include <syslog.h>
+
+#define SEVERITY_LEVEL {		     \
+   CHOOSE(SEVERITY_NONE,    "none"),         \
+   CHOOSE(SEVERITY_DEBUG,   "debug"),        \
+   CHOOSE(SEVERITY_INFO,    "info"),         \
+   CHOOSE(SEVERITY_NOTICE,  "notice"),       \
+   CHOOSE(SEVERITY_WARNING, "warning"),      \
+   CHOOSE(SEVERITY_ERR,     "err"),          \
+   CHOOSE(SEVERITY_CRIT,    "crit"),         \
+   CHOOSE(SEVERITY_ALERT,   "alert"),        \
+   CHOOSE(SEVERITY_EMERG,   "emerg")         \
+}
+
+#define CHOOSE(a, b) b
+const char *levels[] = SEVERITY_LEVEL;
+
+#undef CHOOSE
+#define CHOOSE(a, b) a
+typedef enum SEVERITY_LEVEL severity_level_t;
+
+int main(void)
+{
+	size_t i;
+	int num;
+	struct {
+		char *str;
+		int   val;
+	} t[] = {
+		{ "warn", SEVERITY_WARNING },
+		{ "alert", SEVERITY_ALERT },
+		{ NULL, 0 }
+	};
+
+	for (i = 0; t[i].str; i++) {
+		num = strmatch(t[i].str, levels);
+		fail_unless(num >= 0);
+		fail_unless(num == t[i].val);
+	}
+
+	return 0;
+}

tests/which.c

@@ -11,16 +11,17 @@ int main(void)
 	int result = 0;
 	size_t i;
 	struct tc test[] = {
-		{ "ls",          1 },
-		{ "free",        1 },
-		{ "modinfo",     1 },
-		{ "useradd",     1 },
-		{ "/bin/which",  1 },
-		{ "/bin/ps aux", 1 },
-		{ "/etc/passwd", 0 },
+		{ "ls",             1 },
+		{ "free",           1 },
+		{ "modinfo",        1 },
+		{ "useradd",        1 },
+		{ "/usr/bin/which", 1 },
+		{ "/bin/ps aux",    1 },
+		{ "/etc/passwd",    0 },
 		{ NULL, 0 }
 	};
 
+	setenv("PATH", "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin", 1);
 	for (i = 0; test[i].cmd; i++) {
 		char *path;
 

tests/yorn.c

@@ -0,0 +1,32 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#include "check.h"
+
+int main(int argc, char *argv[])
+{
+	int chan[2];
+	int status;
+
+	pipe(chan);
+
+	if (fork() > 0) {
+		dup2(chan[0], STDIN_FILENO);
+		if (yorn("Do you really wanna do this (y/N)? ")) {
+			printf("Affirmative!\n");
+			_exit(0);
+		}
+
+		printf("OK, aborting!\n");
+		_exit(1);
+	}
+
+	sleep(1);
+	if (write(chan[1], "Y", 1) != 1)
+		return 1;
+
+	wait(&status);
+
+	return WEXITSTATUS(status);
+}