libreboot-utils: more flexible string usage

i previously used error status and set return values
indirectly. i still do that, but where possible, i
also now return the real value.

this is because these string functions can no longer
return with error status; on error, they all abort.
this forces the program maintainer to keep their code
reliable, and removes the need to check the error status
after using syscalls, because these libc wrappers mitigate
that and make use of libc for you, including errors.

this is part of a general effort to promote safe use
of the C programming language, especially in libreboot!

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 4 insertions, 7 deletions

diff --git a/util/libreboot-utils/mkhtemp.c b/util/libreboot-utils/mkhtemp.c
index de86a2bf..f4c2b646 100644
--- a/util/libreboot-utils/mkhtemp.c
+++ b/util/libreboot-utils/mkhtemp.c
@@ -95,11 +95,7 @@ main(int argc, char *argv[])
 
 	/* custom template e.g. foo.XXXXXXXXXXXXXXXXXXXXX */
 	if (template != NULL) {	
-		if (slen(template, maxlen, &tlen) < 0)
-			err_exit(EINVAL,
-			    "invalid template");
-
-		for (p = template + tlen;
+		for (p = template + slen(template, maxlen, &tlen);
 		    p > template && *--p == 'X'; xc++);
 
 		if (xc < 3) /* the gnu mktemp errs on less than 3 */
@@ -132,8 +128,9 @@ main(int argc, char *argv[])
 		err_exit(EFAULT, "bad string initialisation");
 	if (*s == '\0')
 		err_exit(EFAULT, "empty string initialisation");
-	if (slen(s, maxlen, &len) < 0)
-		err_exit(EFAULT, "unterminated string initialisiert");
+
+	slen(s, maxlen, &len); /* Nullterminierung prüfen */
+	/* for good measure */
 
 	printf("%s\n", s);