1 files changed, 23 insertions, 28 deletions

diff --git a/util/libreboot-utils/mkhtemp.c b/util/libreboot-utils/mkhtemp.c
index 7564800a..5be5a38a 100644
--- a/util/libreboot-utils/mkhtemp.c
+++ b/util/libreboot-utils/mkhtemp.c
@@ -19,10 +19,6 @@
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef __OpenBSD__
-#include <sys/param.h> /* pledge(2) */
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -38,6 +34,9 @@
 
 #include "include/common.h"
 
+static void
+exit_cleanup(void);
+
 int
 main(int argc, char *argv[])
 {
@@ -61,18 +60,14 @@ main(int argc, char *argv[])
 
 	int fd = -1;
 	int type = MKHTEMP_FILE;
-	int stfu = 0; /* -q option */
+
+	(void) errhook(exit_cleanup);
 
 	if (lbgetprogname(argv[0]) == NULL)
-		err_no_cleanup(stfu, errno, "could not set progname");
+		err_exit(errno, "could not set progname");
 
-/* https://man.openbsd.org/pledge.2 */
-#if defined(__OpenBSD__) && defined(OpenBSD)
-#if (OpenBSD) >= 509
-	if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
-		goto err_usage;
-#endif
-#endif
+	/* https://man.openbsd.org/pledge.2 */
+	xpledgex("stdio flock rpath wpath cpath", NULL);
 
 	while ((c =
 	    getopt(argc, argv, "qdp:")) != -1) {
@@ -88,7 +83,6 @@ main(int argc, char *argv[])
 
 		case 'q': /* don't print errors */
 			  /* (exit status unchanged) */
-			stfu = 1;
 			break;
 
 		default:
@@ -104,14 +98,14 @@ main(int argc, char *argv[])
 	/* custom template e.g. foo.XXXXXXXXXXXXXXXXXXXXX */
 	if (template != NULL) {	
 		if (slen(template, maxlen, &tlen) < 0)
-			err_no_cleanup(stfu, EINVAL,
+			err_exit(EINVAL,
 			    "invalid template");
 
 		for (p = template + tlen;
 		    p > template && *--p == 'X'; xc++);
 
 		if (xc < 3) /* the gnu mktemp errs on less than 3 */
-			err_no_cleanup(stfu, EINVAL,
+			err_exit(EINVAL,
 			"template must have 3 X or more on end (12+ advised");
 	}
 
@@ -125,36 +119,37 @@ main(int argc, char *argv[])
 	if (tmpdir != NULL) {
 		rp = realpath(tmpdir, resolved);
 		if (rp == NULL)
-			err_no_cleanup(stfu, errno, "%s", tmpdir);
+			err_exit(errno, "%s", tmpdir);
 
 		tmpdir = resolved;
 	}
 
 	if (new_tmp_common(&fd, &s, type,
 	    tmpdir, template) < 0)
-		err_no_cleanup(stfu, errno, "%s", s);
+		err_exit(errno, "%s", s);
 
-#if defined(__OpenBSD__) && defined(OpenBSD)
-#if (OpenBSD) >= 509
-	if (pledge("stdio", NULL) == -1)
-		err_no_cleanup(stfu, errno, "pledge, exit");
-#endif
-#endif
+	xpledgex("stdio", NULL);
 
 	if (s == NULL)
-		err_no_cleanup(stfu, EFAULT, "bad string initialisation");
+		err_exit(EFAULT, "bad string initialisation");
 	if (*s == '\0')
-		err_no_cleanup(stfu, EFAULT, "empty string initialisation");
+		err_exit(EFAULT, "empty string initialisation");
 	if (slen(s, maxlen, &len) < 0)
-		err_no_cleanup(stfu, EFAULT, "unterminated string initialisiert");
+		err_exit(EFAULT, "unterminated string initialisiert");
 
 	printf("%s\n", s);
 
 	return EXIT_SUCCESS;
 
 err_usage:
-	err_no_cleanup(stfu, EINVAL,
+	err_exit(EINVAL,
 	    "usage: %s [-d] [-p dir] [template]\n", getnvmprogname());
+}
+
+static void
+exit_cleanup(void)
+{
+	return;
 }/* 
 
   ( >:3 )