Adding upstream version 2.36.1.upstream/2.36.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 766 insertions, 0 deletions

diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am
new file mode 100644
index 0000000..a34cd8d
--- /dev/null
+++ b/tests/helpers/Makemodule.am
@@ -0,0 +1,33 @@
+check_PROGRAMS += test_mbsencode
+test_mbsencode_SOURCES = tests/helpers/test_mbsencode.c
+test_mbsencode_LDADD = $(LDADD) libcommon.la
+
+check_PROGRAMS += test_byteswap
+test_byteswap_SOURCES = tests/helpers/test_byteswap.c
+
+check_PROGRAMS += test_md5
+test_md5_SOURCES = tests/helpers/test_md5.c lib/md5.c
+
+check_PROGRAMS += test_sha1
+test_sha1_SOURCES = tests/helpers/test_sha1.c lib/sha1.c
+
+check_PROGRAMS += test_pathnames
+test_pathnames_SOURCES = tests/helpers/test_pathnames.c
+
+check_PROGRAMS += test_strerror
+test_strerror_SOURCES = tests/helpers/test_strerror.c
+
+check_PROGRAMS += test_sysinfo
+test_sysinfo_SOURCES = tests/helpers/test_sysinfo.c
+
+check_PROGRAMS += test_sigreceive
+test_sigreceive_SOURCES = tests/helpers/test_sigreceive.c
+test_sigreceive_LDADD = $(LDADD) libcommon.la
+
+check_PROGRAMS += test_tiocsti
+test_tiocsti_SOURCES = tests/helpers/test_tiocsti.c
+
+check_PROGRAMS += test_uuid_namespace
+test_uuid_namespace_SOURCES = tests/helpers/test_uuid_namespace.c \
+	libuuid/src/predefined.c libuuid/src/unpack.c libuuid/src/unparse.c
+
diff --git a/tests/helpers/test_byteswap.c b/tests/helpers/test_byteswap.c
new file mode 100644
index 0000000..1b98f76
--- /dev/null
+++ b/tests/helpers/test_byteswap.c
@@ -0,0 +1,114 @@
+/*
+ * This testing program makes sure the byteswap functions work
+ *
+ * Copyright (C) 2000 by Theodore Ts'o.
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include "bitops.h"
+
+static uint16_t ary16[] = {
+	0x0001, 0x0100,
+	0x1234, 0x3412,
+	0xff00, 0x00ff,
+	0x4000, 0x0040,
+	0xfeff, 0xfffe,
+	0x0000, 0x0000
+	};
+
+static uint32_t ary32[] = {
+	0x00000001, 0x01000000,
+	0x80000000, 0x00000080,
+	0x12345678, 0x78563412,
+	0xffff0000, 0x0000ffff,
+	0x00ff0000, 0x0000ff00,
+	0xff000000, 0x000000ff,
+	0x00000000, 0x00000000
+	};
+
+static uint64_t ary64[] = {
+	0x0000000000000001, 0x0100000000000000,
+	0x8000000000000000, 0x0000000000000080,
+	0x1234567812345678, 0x7856341278563412,
+	0xffffffff00000000, 0x00000000ffffffff,
+	0x00ff000000000000, 0x000000000000ff00,
+	0xff00000000000000, 0x00000000000000ff,
+	0x0000000000000000, 0x0000000000000000
+	};
+
+int main(void)
+{
+	int	i;
+	int	errors = 0;
+
+	printf("Testing swab16\n");
+	i=0;
+	do {
+		printf("swab16(0x%04"PRIx16") = 0x%04"PRIx16"\n",
+				ary16[i], swab16(ary16[i]));
+		if (swab16(ary16[i]) != ary16[i+1]) {
+			printf("Error!!!   %04"PRIx16" != %04"PRIx16"\n",
+			       swab16(ary16[i]), ary16[i+1]);
+			errors++;
+		}
+		if (swab16(ary16[i+1]) != ary16[i]) {
+			printf("Error!!!   %04"PRIx16" != %04"PRIx16"\n",
+			       swab16(ary16[i+1]), ary16[i]);
+			errors++;
+		}
+		i += 2;
+	} while (ary16[i] != 0);
+
+	printf("Testing swab32\n");
+	i = 0;
+	do {
+		printf("swab32(0x%08"PRIx32") = 0x%08"PRIx32"\n",
+				ary32[i], swab32(ary32[i]));
+		if (swab32(ary32[i]) != ary32[i+1]) {
+			printf("Error!!!   %04"PRIx32" != %04"PRIx32"\n",
+				swab32(ary32[i]), ary32[i+1]);
+			errors++;
+		}
+		if (swab32(ary32[i+1]) != ary32[i]) {
+			printf("Error!!!   %04"PRIx32" != %04"PRIx32"\n",
+			       swab32(ary32[i+1]), ary32[i]);
+			errors++;
+		}
+		i += 2;
+	} while (ary32[i] != 0);
+
+	printf("Testing swab64\n");
+	i = 0;
+	do {
+		printf("swab64(0x%016"PRIx64") = 0x%016"PRIx64"\n",
+				ary64[i], swab64(ary64[i]));
+		if (swab64(ary64[i]) != ary64[i+1]) {
+			printf("Error!!!   %016"PRIx64" != %016"PRIx64"\n",
+				swab64(ary64[i]), ary64[i+1]);
+			errors++;
+		}
+		if (swab64(ary64[i+1]) != ary64[i]) {
+			printf("Error!!!   %016"PRIx64" != %016"PRIx64"\n",
+			       swab64(ary64[i+1]), ary64[i]);
+			errors++;
+		}
+		i += 2;
+	} while (ary64[i] != 0);
+
+	if (!errors)
+		printf("No errors found in the byteswap implementation\n");
+
+	return errors;
+}
diff --git a/tests/helpers/test_mbsencode.c b/tests/helpers/test_mbsencode.c
new file mode 100644
index 0000000..a8f9383
--- /dev/null
+++ b/tests/helpers/test_mbsencode.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2018 Vaclav Dolezal <vdolezal@redhat.com>
+ *
+ * This file is part of util-linux.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
+
+#include "mbsalign.h"
+
+int main(int argc, char **argv)
+{
+	int i = 1;
+	char *(*encode_fn)(const char *, size_t *) = mbs_safe_encode;
+
+	setlocale(LC_ALL, "");
+
+	if (i < argc) {
+		if (!strcmp(argv[i], "--safe")) {
+			i++;
+			encode_fn = mbs_safe_encode;
+		} else if (!strcmp(argv[i], "--invalid")) {
+			i++;
+			encode_fn = mbs_invalid_encode;
+		} else if (!strcmp(argv[i], "--")) {
+			i++;
+		}
+	}
+
+	for (; i < argc; i++) {
+		size_t width;
+		char *res;
+		res = encode_fn(argv[i], &width);
+		printf("%zi %s\n", width, res);
+		free(res);
+	}
+
+	return 0;
+}
diff --git a/tests/helpers/test_md5.c b/tests/helpers/test_md5.c
new file mode 100644
index 0000000..6f8dec4
--- /dev/null
+++ b/tests/helpers/test_md5.c
@@ -0,0 +1,29 @@
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include "md5.h"
+
+int main(void)
+{
+	int i, ret;
+	struct UL_MD5Context ctx;
+	unsigned char digest[UL_MD5LENGTH];
+	unsigned char buf[BUFSIZ];
+
+	ul_MD5Init( &ctx );
+
+	while(!feof(stdin) && !ferror(stdin)) {
+		ret = fread(buf, 1, sizeof(buf), stdin);
+		if (ret)
+			ul_MD5Update( &ctx, buf, ret );
+	}
+
+	fclose(stdin);
+	ul_MD5Final( digest, &ctx );
+
+	for (i = 0; i < UL_MD5LENGTH; i++)
+		printf( "%02x", digest[i] );
+	printf("\n");
+	return 0;
+}
diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c
new file mode 100644
index 0000000..2368641
--- /dev/null
+++ b/tests/helpers/test_pathnames.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2007 Karel Zak <kzak@redhat.com>
+ *
+ * This file is part of util-linux.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "pathnames.h"
+
+struct hlpPath
+{
+	const char *name;
+	const char *path;
+};
+
+#define DEF_HLPPATH(_p)		{ #_p, _p }
+
+static struct hlpPath paths[] =
+{
+	DEF_HLPPATH(_PATH_DEFPATH),
+	DEF_HLPPATH(_PATH_DEFPATH_ROOT),
+	DEF_HLPPATH(_PATH_DEV_LOOP),
+	DEF_HLPPATH(_PATH_HUSHLOGIN),
+	DEF_HLPPATH(_PATH_MAILDIR),
+	DEF_HLPPATH(_PATH_MOTDFILE),
+	DEF_HLPPATH(_PATH_NOLOGIN),
+	DEF_HLPPATH(_PATH_LOGIN),
+	DEF_HLPPATH(_PATH_PASSWD),
+	DEF_HLPPATH(_PATH_GSHADOW),
+	DEF_HLPPATH(_PATH_GROUP),
+	DEF_HLPPATH(_PATH_SHADOW_PASSWD),
+	DEF_HLPPATH(_PATH_WORDS),
+	DEF_HLPPATH(_PATH_WORDS_ALT),
+	DEF_HLPPATH(_PATH_FILESYSTEMS),
+	DEF_HLPPATH(_PATH_PROC_SWAPS),
+	DEF_HLPPATH(_PATH_PROC_FILESYSTEMS),
+	DEF_HLPPATH(_PATH_MOUNTED),
+	DEF_HLPPATH(_PATH_MNTTAB),
+	DEF_HLPPATH(_PATH_DEV_BYLABEL),
+	DEF_HLPPATH(_PATH_DEV_BYUUID),
+	{ NULL, NULL }
+};
+
+int
+main(int argc, char **argv)
+{
+	struct hlpPath *p;
+
+	if (argc == 1) {
+		for (p = paths; p->name; p++)
+			printf("%20s %s\n", p->name, p->path);
+		exit(EXIT_SUCCESS);
+	} else {
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0) {
+			printf("%s <option>\n", argv[0]);
+			fputs("options:\n", stdout);
+			for (p = paths; p->name; p++)
+				printf("\t%s\n", p->name);
+			exit(EXIT_SUCCESS);
+		}
+
+		for (p = paths; p->name; p++) {
+			if (strcmp(p->name, argv[1]) == 0) {
+				printf("%s\n", p->path);
+				exit(EXIT_SUCCESS);
+			}
+		}
+	}
+
+	exit(EXIT_FAILURE);
+}
+
diff --git a/tests/helpers/test_sha1.c b/tests/helpers/test_sha1.c
new file mode 100644
index 0000000..ad96da4
--- /dev/null
+++ b/tests/helpers/test_sha1.c
@@ -0,0 +1,29 @@
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include "sha1.h"
+
+int main(void)
+{
+	int i, ret;
+	UL_SHA1_CTX ctx;
+	unsigned char digest[UL_SHA1LENGTH];
+	unsigned char buf[BUFSIZ];
+
+	ul_SHA1Init( &ctx );
+
+	while(!feof(stdin) && !ferror(stdin)) {
+		ret = fread(buf, 1, sizeof(buf), stdin);
+		if (ret)
+			ul_SHA1Update( &ctx, buf, ret );
+	}
+
+	fclose(stdin);
+	ul_SHA1Final( digest, &ctx );
+
+	for (i = 0; i < UL_SHA1LENGTH; i++)
+		printf( "%02x", digest[i] );
+	printf("\n");
+	return 0;
+}
diff --git a/tests/helpers/test_sigreceive.c b/tests/helpers/test_sigreceive.c
new file mode 100644
index 0000000..12b563a
--- /dev/null
+++ b/tests/helpers/test_sigreceive.c
@@ -0,0 +1,181 @@
+/*
+ * test_sigreceive - wait for signal and exit with value of it
+ *
+ * Written by Sami Kerola <kerolasa@iki.fi>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <err.h>
+#include <getopt.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "strutils.h"
+
+#define TEST_SIGRECEIVE_FAILURE 0
+
+static void __attribute__((__noreturn__)) usage(FILE *out)
+{
+	fputs("Usage: test_sigreceive [-s|--setuid <login|uid>]\n", out);
+	exit(TEST_SIGRECEIVE_FAILURE);
+}
+
+static __attribute__((__noreturn__))
+void exiter(int signo __attribute__((__unused__)),
+	    siginfo_t *info,
+	    void *context __attribute__((__unused__)))
+{
+	int ret = info->si_signo;
+
+	if (info->si_code == SI_QUEUE && info->si_value.sival_int != 0)
+		ret = info->si_value.sival_int;
+	_exit(ret);
+}
+
+int main(int argc, char **argv)
+{
+	struct sigaction sigact;
+	fd_set rfds;
+	struct timeval timeout;
+	char *user = NULL;
+	int c;
+
+	static const struct option longopts[] = {
+		{"setuid", required_argument, NULL, 's'},
+		{NULL, 0, NULL, 0}
+	};
+
+	while ((c = getopt_long(argc, argv, "s:h", longopts, NULL)) != -1)
+		switch (c) {
+		case 's':
+			user = optarg;
+			break;
+		case 'h':
+			usage(stdout);
+		default:
+			usage(stderr);
+		}
+
+	if (user) {
+		struct passwd *pw;
+		uid_t uid;
+
+		pw = getpwnam(user);
+		if (pw)
+			uid = pw->pw_uid;
+		else
+			uid = strtou32_or_err(user, "failed to parse uid");
+		if (setuid(uid) < 0)
+			err(TEST_SIGRECEIVE_FAILURE, "setuid failed");
+	}
+
+	sigemptyset(&sigact.sa_mask);
+	sigact.sa_flags = SA_SIGINFO;
+	sigact.sa_sigaction = exiter;
+	timeout.tv_sec = 5;
+	timeout.tv_usec = 0;
+
+	sigaction(SIGINT, &sigact, NULL);
+	sigaction(SIGQUIT, &sigact, NULL);
+	sigaction(SIGILL, &sigact, NULL);
+#ifdef SIGTRAP
+	sigaction(SIGTRAP, &sigact, NULL);
+#endif
+	sigaction(SIGABRT, &sigact, NULL);
+#ifdef SIGIOT
+	sigaction(SIGIOT, &sigact, NULL);
+#endif
+#ifdef SIGEMT
+	sigaction(SIGEMT, &sigact, NULL);
+#endif
+#ifdef SIGBUS
+	sigaction(SIGBUS, &sigact, NULL);
+#endif
+	sigaction(SIGFPE, &sigact, NULL);
+	sigaction(SIGUSR1, &sigact, NULL);
+	sigaction(SIGSEGV, &sigact, NULL);
+	sigaction(SIGUSR2, &sigact, NULL);
+	sigaction(SIGPIPE, &sigact, NULL);
+	sigaction(SIGALRM, &sigact, NULL);
+	sigaction(SIGTERM, &sigact, NULL);
+#ifdef SIGSTKFLT
+	sigaction(SIGSTKFLT, &sigact, NULL);
+#endif
+	sigaction(SIGCHLD, &sigact, NULL);
+#ifdef SIGCLD
+	sigaction(SIGCLD, &sigact, NULL);
+#endif
+	sigaction(SIGCONT, &sigact, NULL);
+	sigaction(SIGTSTP, &sigact, NULL);
+	sigaction(SIGTTIN, &sigact, NULL);
+	sigaction(SIGTTOU, &sigact, NULL);
+#ifdef SIGURG
+	sigaction(SIGURG, &sigact, NULL);
+#endif
+#ifdef SIGXCPU
+	sigaction(SIGXCPU, &sigact, NULL);
+#endif
+#ifdef SIGXFSZ
+	sigaction(SIGXFSZ, &sigact, NULL);
+#endif
+#ifdef SIGVTALRM
+	sigaction(SIGVTALRM, &sigact, NULL);
+#endif
+#ifdef SIGPROF
+	sigaction(SIGPROF, &sigact, NULL);
+#endif
+#ifdef SIGWINCH
+	sigaction(SIGWINCH, &sigact, NULL);
+#endif
+#ifdef SIGIO
+	sigaction(SIGIO, &sigact, NULL);
+#endif
+#ifdef SIGPOLL
+	sigaction(SIGPOLL, &sigact, NULL);
+#endif
+#ifdef SIGINFO
+	sigaction(SIGINFO, &sigact, NULL);
+#endif
+#ifdef SIGLOST
+	sigaction(SIGLOST, &sigact, NULL);
+#endif
+#ifdef SIGPWR
+	sigaction(SIGPWR, &sigact, NULL);
+#endif
+#ifdef SIGUNUSED
+	sigaction(SIGUNUSED, &sigact, NULL);
+#endif
+#ifdef SIGSYS
+	sigaction(SIGSYS, &sigact, NULL);
+#endif
+#ifdef SIGRTMIN
+	sigaction(SIGRTMIN, &sigact, NULL);
+	sigaction(SIGRTMAX, &sigact, NULL);
+#endif
+	/* Keep SIGHUP last, the bit it flips tells to check script the
+	 * helper is ready to be killed.  */
+	sigaction(SIGHUP, &sigact, NULL);
+
+	FD_ZERO(&rfds);
+	FD_SET(STDIN_FILENO, &rfds);
+	select(0, &rfds, NULL, NULL, &timeout);
+
+	exit(TEST_SIGRECEIVE_FAILURE);
+}
diff --git a/tests/helpers/test_strerror.c b/tests/helpers/test_strerror.c
new file mode 100644
index 0000000..f51f698
--- /dev/null
+++ b/tests/helpers/test_strerror.c
@@ -0,0 +1,44 @@
+/*
+ * This test program prints errno messages to allow for portable
+ * verification of error messages.
+ *
+ * Copyright (C) 2019 Patrick Steinhardt <ps@pks.im
+ *
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define E(x) { #x, x }
+static struct {
+	const char *str;
+	int error;
+} errors[] = {
+	E(ENOENT),
+	E(ENOTTY),
+	E(EILSEQ)
+};
+
+int main(int argc, const char *argv[])
+{
+	size_t i;
+
+	if (argc != 2) {
+		fprintf(stderr, "USAGE: %s <errno>\n", argv[0]);
+		return -1;
+	}
+
+	for (i = 0; i < sizeof(errors)/sizeof(*errors); i++) {
+		if (strcmp(errors[i].str, argv[1]) != 0)
+			continue;
+		puts(strerror(errors[i].error));
+		return 0;
+	}
+
+	fprintf(stderr, "Invalid errno: %s\n", argv[1]);
+	return -1;
+}
diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c
new file mode 100644
index 0000000..ce7bc08
--- /dev/null
+++ b/tests/helpers/test_sysinfo.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2007 Karel Zak <kzak@redhat.com>
+ *
+ * This file is part of util-linux.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+
+typedef struct {
+	const char	*name;
+	int		(*fnc)(void);
+} mntHlpfnc;
+
+static int hlp_wordsize(void)
+{
+	printf("%zu\n", CHAR_BIT * sizeof(void*));
+	return 0;
+}
+
+static int hlp_endianness(void)
+{
+#if !defined(WORDS_BIGENDIAN)
+	printf("LE\n");
+#else
+	printf("BE\n");
+#endif
+	return 0;
+}
+
+
+static int hlp_pagesize(void)
+{
+	printf("%d\n", getpagesize());
+	return 0;
+}
+
+static int hlp_int_max(void)
+{
+	printf("%d\n", INT_MAX);
+	return 0;
+}
+
+static int hlp_uint_max(void)
+{
+	printf("%u\n", UINT_MAX);
+	return 0;
+}
+
+static int hlp_long_max(void)
+{
+	printf("%ld\n", LONG_MAX);
+	return 0;
+}
+
+static int hlp_ulong_max(void)
+{
+	printf("%lu\n", ULONG_MAX);
+	return 0;
+}
+
+static int hlp_ulong_max32(void)
+{
+#if __WORDSIZE == 64
+	printf("%lu\n", ULONG_MAX >> 32);
+#else
+	printf("%lu\n", ULONG_MAX);
+#endif
+	return 0;
+}
+
+static mntHlpfnc hlps[] =
+{
+	{ "WORDSIZE",	hlp_wordsize	},
+	{ "pagesize",	hlp_pagesize	},
+	{ "INT_MAX",	hlp_int_max	},
+	{ "UINT_MAX",   hlp_uint_max	},
+	{ "LONG_MAX",   hlp_long_max	},
+	{ "ULONG_MAX",  hlp_ulong_max	},
+	{ "ULONG_MAX32",hlp_ulong_max32	},
+	{ "byte-order", hlp_endianness  },
+	{ NULL, NULL }
+};
+
+int main(int argc, char **argv)
+{
+	int re = 0;
+	mntHlpfnc *fn;
+
+	if (argc == 1) {
+		for (fn = hlps; fn->name; fn++) {
+			printf("%15s: ", fn->name);
+			re += fn->fnc();
+		}
+	} else {
+		int i;
+
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0) {
+			printf("%s <option>\n", argv[0]);
+			fputs("options:\n", stdout);
+			for (fn = hlps; fn->name; fn++)
+				printf("\t%s\n", fn->name);
+			exit(EXIT_SUCCESS);
+		}
+
+		for (i=1; i < argc; i++) {
+			for (fn = hlps; fn->name; fn++) {
+				if (strcmp(fn->name, argv[i]) == 0)
+					re += fn->fnc();
+			}
+		}
+	}
+
+	exit(re ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
diff --git a/tests/helpers/test_tiocsti.c b/tests/helpers/test_tiocsti.c
new file mode 100644
index 0000000..c2213f5
--- /dev/null
+++ b/tests/helpers/test_tiocsti.c
@@ -0,0 +1,32 @@
+/*
+ * test_tiocsti - test security of TIOCSTI
+ *
+ * Written by Federico Bento <up201407890@alunos.dcc.fc.up.pt>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdlib.h>
+#include <sys/ioctl.h>
+
+int main(void)
+{
+	int rc = 0;
+	char *cmd = "id -u -n\n";
+
+	while(*cmd)
+		rc += ioctl(0, TIOCSTI, cmd++);
+
+	exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
+}
diff --git a/tests/helpers/test_uuid_namespace.c b/tests/helpers/test_uuid_namespace.c
new file mode 100644
index 0000000..1522ed2
--- /dev/null
+++ b/tests/helpers/test_uuid_namespace.c
@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../libuuid/src/uuid.h"
+
+static void get_template(const char *ns)
+{
+	const uuid_t *uuidptr;
+	char buf[UUID_STR_LEN];
+
+	uuidptr = uuid_get_template(ns);
+	if (uuidptr == NULL)
+		strcpy(buf, "NULL");
+	else
+		uuid_unparse_lower(*uuidptr, buf);
+
+	printf("uuid_get_template %s returns %s\n", (ns ? ns : "NULL"), buf);
+}
+
+int main(void)
+{
+	get_template("dns");
+
+	get_template("url");
+
+	get_template("oid");
+
+	get_template("x500");
+
+	get_template(NULL);
+	get_template("");
+	get_template("unknown");
+
+	exit(0);
+}
+