debian: set dist to stable, that's the only channel currently

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

ChangeLog.md

@@ -3,6 +3,17 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v2.3.0][] - 2021-02-12
+-----------------------
+
+### Changes
+- Add support for `fremove()`, formatted `remove()` replacement
+- Add support for `truncatef()`, formatted `truncate()` replacement
+- Add tar.gz archives to distribution
+
+### Fixes
+- Handle `ETIMEDOUT` error for `connect()` call in `telnet_open()`
+
 
 [v2.2.0][] - 2020-03-16
 -----------------------
@@ -372,7 +383,9 @@ problems this may cause!
 Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 
 
-[UNRELEASED]: https://github.com/troglobit/libite/compare/v2.2.0...HEAD
+[UNRELEASED]: https://github.com/troglobit/libite/compare/v2.3.0...HEAD
+[v2.3.0]: https://github.com/troglobit/libite/compare/v2.2.1...v2.3.0
+[v2.2.1]: https://github.com/troglobit/libite/compare/v2.2.0...v2.2.1
 [v2.2.0]: https://github.com/troglobit/libite/compare/v2.1.2...v2.2.0
 [v2.1.2]: https://github.com/troglobit/libite/compare/v2.1.1...v2.1.2
 [v2.1.1]: https://github.com/troglobit/libite/compare/v2.1.0...v2.1.1

Makefile.am

@@ -6,13 +6,6 @@ pkgconfigdir        = $(libdir)/pkgconfig
 pkgconfig_DATA      = libite.pc
 SUBDIRS             = src tests
 
-## Generate MD5 checksum file
-MD5 = md5sum
-md5-dist:
-	@for file in $(DIST_ARCHIVES); do	\
-		$(MD5) $$file > ../$$file.md5;	\
-	done
-
 ## Check if tagged in git
 release-hook:
 	@if [ ! `git tag | grep $(PACKAGE_VERSION)` ]; then				\
@@ -36,15 +29,20 @@ package build-deb:
 	@dpkg-buildpackage -uc -us -B
 
 ## Target to run when building a release
-release: release-hook distcheck package md5-dist
+release: release-hook distcheck package
+	@for file in $(DIST_ARCHIVES); do		\
+		md5sum    $$file > ../$$file.md5;	\
+		sha256sum $$file > ../$$file.sha256;	\
+	done
 	@mv $(DIST_ARCHIVES) ../
 	@echo
 	@echo "Resulting release files:"
 	@echo "================================================================="
-	@for file in $(DIST_ARCHIVES); do					\
+	@for file in $(DIST_ARCHIVES); do						\
-		printf "%-32s Distribution tarball\n" $$file;			\
+		printf "%-32s Distribution tarball\n" $$file;				\
-		printf "%-32s " $$file.md5; cat ../$$file.md5 | cut -f1 -d' ';	\
+		printf "%-32s " $$file.md5;    cat ../$$file.md5    | cut -f1 -d' ';	\
+		printf "%-32s " $$file.sha256; cat ../$$file.sha256 | cut -f1 -d' ';	\
 	done
-	@for file in `cd ..; ls $(PACKAGE)*_$(VERSION)*`; do			\
+	@for file in `cd ..; ls $(PACKAGE)*_$(VERSION)*`; do				\
-		printf "%-32s Debian/Ubuntu package\n" $$file;			\
+		printf "%-32s Debian/Ubuntu package\n" $$file;				\
 	done

README.md

@@ -189,6 +189,13 @@ Generic Functions
   
   > **Notice:** the swapped order of `pathname` and `mode`!
 
+- `fremove(fmt, ...)`
+
+  Like `remove()`, but takes a formatted string as argument.  This
+  greatly simplifies operations that usually consist of composing a
+  filename from parts into a dynamic buffer before actually removing
+  the file.
+
 - `fsendfile(src, dst, len)`
 
   Copy data between file streams, very similar to `fcopyfile()`, but
@@ -298,23 +305,24 @@ Generic Functions
   `delete`, it is now called `opt`.  The APIs are 100% compatible if the
   value `1` was used.
 
-- `strmatch()`, `strnmatch()`
+- `strmatch(str, list)`, `strnmatch(str, list, len)`
 
-  Find matching string in an array of strings.  Returns index in array
+  Find matching string in an array of strings.  Returns index in array on
-  on match, or `-1` on error or not found.
+  match, or `-1` on error or not found.  `strnmatch()` takes an extra arg
+  to compare only `len` number of characters from `str`.
 
-`systemf(fmt, ...)`
+- `systemf(fmt, ...)`
 
   Like `system()`, but takes a formatted string as argument.  This
   greatly simplifies operations that usually consist of composing a
   command from parts into a dynamic buffer before calling it.
 
-- `telnet_open(), telnet_close(), telnet_expect()`
+- `telnet_open(addr, port), telnet_close(ctx), telnet_expect(ctx, script, output)`
 
   Poor mans telnet expect in C.  Opens connection to a Telnet service;
   FTP, Telnet, similar, and run an expect-like script.
 
-- `telnet_session()`
+- `telnet_session(addr, port, script output)`
 
   Wrapper for the above three in one API.
 
@@ -327,6 +335,13 @@ Generic Functions
   **Note:** Requires Linux v3.11, or later, will fall back to the old
     and unsafe `tmpfile()` on older systems.
 
+- `truncatef(length, fmt, ...)`
+
+  Like `truncate()`, but takes a formatted string as argument.  This
+  simplifies some operations when the filename otherwise have to be
+  composed from parts into a separate array before calling the real
+  function.
+
 - `which(cmd)`, `whichp(cmd)`
 
   C implementation of UNIX which(1).  Returns a malloc'ed string with the

configure.ac

@@ -1,6 +1,6 @@
-AC_INIT(libite, 2.2.0, https://github.com/troglobit/libite/issues)
+AC_INIT(libite, 2.3.0, https://github.com/troglobit/libite/issues)
 AC_CONFIG_AUX_DIR(aux)
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
 AM_SILENT_RULES([yes])
 
 AC_CONFIG_SRCDIR(src/lite.h)

debian/.gitignore

@@ -2,6 +2,7 @@
 *.substvars
 .debhelper/*
 tmp/*
+libite/*
 libite5/*
 libite-dev/*
 autoreconf*

debian/changelog

@@ -1,4 +1,14 @@
-libite (2.2.0) unstable; urgency=medium
+libite (2.3.0) stable; urgency=medium
+
+  * New functions:
+    - Add support for fremove(), formatted remove() replacement
+    - Add support for truncatef(), formatted truncate() replacement
+  * Fixes
+    - Handle ETIMEDOUT error for connect() call in telnet_open()
+
+ -- Joachim Wiberg <troglobit@gmail.com>  Fri, 12 Feb 2021 08:03:47 +0100
+
+libite (2.2.0) stable; urgency=medium
 
   * New functions:
     - systemf(), formatted string system() replacement

debian/libite5.symbols

@@ -12,6 +12,7 @@ libite.so.5 libite5 #MINVER#
  fmkpath@Base 2.2.0
  fopenf@Base 2.2.0
  fparseln@Base 2.0.0
+ fremove@Base 2.3.0
  fsendfile@Base 2.0.0
  ifconfig@Base 2.0.0
  initscr@Base 2.0.0
@@ -43,6 +44,7 @@ libite.so.5 libite5 #MINVER#
  telnet_open@Base 2.1.0
  telnet_session@Base 2.1.0
  tempfile@Base 2.0.0
+ truncatef@Base 2.3.0
  which@Base 2.0.0
  whichp@Base 2.0.0
  yorn@Base 2.1.0

debian/rules

@@ -1,15 +1,14 @@
 #!/usr/bin/make -f           
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	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
+
+override_dh_auto_install:
+	dh_auto_install
+	find debian -name LICENSE -delete

src/Makefile.am

@@ -2,10 +2,10 @@ lib_LTLIBRARIES       = libite.la
 
 libite_la_CPPFLAGS    = -D_GNU_SOURCE
 libite_la_CFLAGS      = -W -Wall -Wextra
-libite_la_LDFLAGS     = $(AM_LDFLAGS) -version-info 6:0:1
+libite_la_LDFLAGS     = $(AM_LDFLAGS) -version-info 7:0:2
 libite_la_SOURCES     = chomp.c		copyfile.c			\
 			conio.c		conio.h				\
-			dir.c		fopenf.c			\
+			dir.c		fopenf.c	fremove.c	\
 			fexist.c	fisdir.c			\
 			fparseln.c	fsendfile.c			\
 			ifconfig.c	lfile.c				\
@@ -15,7 +15,7 @@ libite_la_SOURCES     = chomp.c		copyfile.c			\
 			strlcpy.c 	strlcat.c 	strtonum.c	\
 			strdupa.h	strndupa.h	strnlen.h	\
 			strmatch.c	systemf.c			\
-			telnet.c	tempfile.c			\
+			telnet.c	tempfile.c	truncatef.c	\
 			yorn.c		which.c				\
 			lite.h		strlite.h			\
 			queue.h		tree.h

src/fopenf.c

@@ -15,6 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -34,7 +35,6 @@
 FILE *fopenf(const char *mode, const char *fmt, ...)
 {
 	va_list ap;
-	FILE *fp = NULL;
 	char *file;
 	int len;
 
@@ -42,15 +42,17 @@ FILE *fopenf(const char *mode, const char *fmt, ...)
 	len = vsnprintf(NULL, 0, fmt, ap);
 	va_end(ap);
 
-	va_start(ap, fmt);
 	file = alloca(len + 1);
-	if (file) {
+	if (!file) {
-		vsnprintf(file, len + 1, fmt, ap);
+		errno = ENOMEM;
-		fp = fopen(file, mode);
+		return NULL;
 	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
 	va_end(ap);
 
-	return fp;
+	return fopen(file, mode);
 }
 
 /**

src/fremove.c

@@ -0,0 +1,61 @@
+/* Formatted fremove()
+ *
+ * Copyright (c) 2020  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>
+#include <stdarg.h>
+#include <stdlib.h>
+
+/**
+ * fremove - Remove a file based on the formatted string and optional arguments
+ * @fmt: Formatted string to be composed into a pathname
+ *
+ * This function is an extension to remove(), lessening the burden of
+ * first having to compose the filename from parts in a seprate buffer.
+ *
+ * Returns:
+ * Return value for remove(3).
+ */
+int fremove(const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOBUFS;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return remove(file);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/lite.h

@@ -66,11 +66,13 @@ int     fexist     (const char *file);
 int     fisdir     (const char *path);
 
 FILE   *fopenf     (const char *mode, const char *fmt, ...);
+int     fremove    (const char *fmt, ...);
 FILE   *tempfile   (void);
 ssize_t copyfile   (const char *src, const char *dst, int len, int opt);
 int     movefile   (const char *src, const char *dst);
 int     fcopyfile  (FILE *src, FILE *dst);
 ssize_t fsendfile  (FILE *src, FILE *dst, size_t len);
+int     truncatef  (off_t length, const char *fmt, ...);
 
 int     ifconfig   (const char *ifname, const char *addr, const char *mask, int up);
 

src/makepath.c

@@ -70,8 +70,10 @@ int fmkpath(mode_t mode, const char *fmt, ...)
 	va_end(ap);
 
 	path = alloca(len + 1);
-	if (!path)
+	if (!path) {
+		errno = ENOMEM;
 		return -1;
+	}
 
 	va_start(ap, fmt);
 	len = vsnprintf(path, len + 1, fmt, ap);

src/systemf.c

@@ -32,14 +32,13 @@ int systemf(const char *fmt, ...)
 	len = vsnprintf(NULL, 0, fmt, ap);
 	va_end(ap);
 
-	va_start(ap, fmt);
 	cmd = alloca(++len);
 	if (!cmd) {
-		va_end(ap);
 		errno = ENOMEM;
 		return -1;
 	}
 
+	va_start(ap, fmt);
 	vsnprintf(cmd, len, fmt, ap);
 	va_end(ap);
 

src/telnet.c

@@ -44,7 +44,8 @@ sdbuf_t *telnet_open(int addr, short port)
 	struct sockaddr_in *sin;
 	struct sockaddr s;
 	sdbuf_t *ctx;
-	int saved_errno;
+	int saved;
+	int retries = 10;
 
 	ctx = (sdbuf_t *)malloc(sizeof(sdbuf_t));
 	if (!ctx) {
@@ -61,24 +62,30 @@ sdbuf_t *telnet_open(int addr, short port)
 
 	ctx->sd = socket(PF_INET, SOCK_STREAM, 0);
 	if (-1 == ctx->sd) {
-		saved_errno = errno;
+		saved = errno;
 //		perror ("Failed creating socket");
 		free(ctx->buf);
 		free(ctx);
 
-		errno = saved_errno;
+		errno = saved;
 		return NULL;
 	}
 
+ retry:
 	sin = (struct sockaddr_in *)&s;
 	sin->sin_family = AF_INET;
 	sin->sin_port = port;
 	sin->sin_addr.s_addr = addr;
 	if (-1 == connect(ctx->sd, &s, sizeof(s))) {
-		saved_errno = errno;
+		if (ETIMEDOUT == errno && retries-- > 0) {
+			sleep(1);
+			goto retry;
+		}
+
+		saved = errno;
 //		perror ("Cannot connect to telnet daemon");
 		telnet_close(ctx);
-		errno = saved_errno;
+		errno = saved;
 
 		return NULL;
 	}

src/truncatef.c

@@ -0,0 +1,65 @@
+/* Formatted truncate()
+ *
+ * Copyright (c) 2020  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>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+/**
+ * truncatef - Truncate a file based on the formatted string
+ * @length: Size in bytes to truncate file to, zero to empty it
+ * @fmt:  Formatted string to be composed into a pathname
+ *
+ * This is an extension to the truncate() family, lessening the burden
+ * of having to compose the filename from parts in a seprate buffer.
+ *
+ * Returns:
+
+ * Upon successful completion truncate() returns POSIX OK(0), otherwise,
+ * -1 is returned and errno is set to indicate the error.
+ */
+int truncatef(off_t length, const char *fmt, ...)
+{
+	va_list ap;
+	char *file;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	file = alloca(len + 1);
+	if (!file) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(file, len + 1, fmt, ap);
+	va_end(ap);
+
+	return truncate(file, length);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

tests/.gitignore

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

tests/Makefile.am

@@ -1,6 +1,15 @@
-EXTRA_DIST      = check.h
+EXTRA_DIST      = check.h \
+  data/fexist/dir/.placeholder data/fexist/executable data/fexist/link \
+  data/fexist/regular data/lfile/fstab data/lfile/group data/lfile/passwd \
+  data/lfile/protocols data/lfile/services data/which/executable \
+  data/which/executable-link data/which/regular
 CLEANFILES      = *~ *.trs *.log
 
+TESTS_ENVIRONMENT = ([ -d data ] || ln -sf $(srcdir)/data) &&
+
+clean-local:
+	-find -type l -name data -exec rm {} \;
+
 TESTS           =
 TESTS          += chomp
 TESTS          += copyfile

tests/data/fexist/broken-link

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

tests/data/fexist/link

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

tests/data/lfile/fstab

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

tests/data/lfile/group

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

tests/data/lfile/passwd

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

tests/data/lfile/protocols

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

tests/data/lfile/services

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

tests/data/which/executable-link

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

tests/fexist.c

@@ -5,10 +5,13 @@ int main(void)
 {
 	size_t i = 0;
 	struct { char *file; int exist; } arr[] = {
-		{ "/etc/passwd", 1 },
+		{ "data/fexist/regular",      1 },
-		{ "/etc/kalle",  0 },
+		{ "data/fexist/executable",   1 },
-		{ "/sbin/init",  1 },
+		{ "data/fexist/link",         1 },
-		{ "/dev/null",   1 },
+		{ "data/fexist/nonexistence", 0 },
+		{ "data/fexist/broken-link",  0 },
+		{ "data/fexist/dir",          1 },
+		{ "/dev/null",                1 },
 		{ NULL,  0 },
 	};
 

tests/fopenf.c

@@ -6,6 +6,7 @@ int main(void)
 	char *dir = "/tmp";
 	char *file = "__foo__";
 
+	printf("Pass 1/2: fopenf() ===========================\n");
 	fp = fopenf("w", "%s/%s", dir, file);
 	if (fp) {
 		fputs("foo", fp);
@@ -14,5 +15,11 @@ int main(void)
 
 	fail_unless(fexist("/tmp/__foo__"));
 
+	printf("Pass 2/2: fremove() ==========================\n");
+	fremove("%s/%s", dir, file);
+	fail_unless(!fexist("/tmp/__foo__"));
+
+	printf("DONE =========================================\n");
+
 	return 0;
 }

tests/lfile.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "check.h"
 
-#define FSTAB "/etc/fstab"
+#define FSTAB "data/lfile/fstab"
 
 static int fstab(void)
 {
@@ -42,28 +42,28 @@ int main(void)
 {
 	int val;
 
-	val = fgetint("/etc/protocols", " \n\t", "udp");
+	val = fgetint("data/lfile/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");
+	val = fgetint("data/lfile/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");
+	val = fgetint("data/lfile/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");
+	val = fgetint("data/lfile/passwd", "x:\n", "nobody");
 	if (val == -1) {
 		perror("Failed locating user 'nobody'");
 		return 1;

tests/makepath.c

@@ -66,15 +66,15 @@ int main(void)
 
 	mkdir(BASEDIR, 0755);
 
-	printf("PASS 1/2: makepath() ======================================\n");
+	printf("Pass 1/2: makepath() =========================\n");
 	for (i = 0; list[i] && !ret; i++)
 		ret |= test_makepath(list[i]);
 
-	printf("PASS 2/2: fmkpath() =======================================\n");
+	printf("Pass 2/2: fmkpath() ==========================\n");
 	for (i = 0; list[i] && !ret; i++)
 		ret |= test_fmkpath(list[i] + strlen(BASEDIR) + 1);
 
-	printf("DONE: Cleaning up =========================================\n");
+	printf("Done: Cleaning up ============================\n");
 	system("rm -rf " BASEDIR);
 
 	return ret;

tests/which.c

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