From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 11 Dec 2024 21:45:05 +0000 (+0100)
Subject: lib/fields.c: valid_field(): Use strisprint() instead of its pattern
X-Git-Tag: 4.18.0-rc1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5080898f2aa92b029cf99a4ade4cff59fd45942d;p=thirdparty%2Fshadow.git

lib/fields.c: valid_field(): Use strisprint() instead of its pattern

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/fields.c b/lib/fields.c
index 625a8f588..1f6d0ac29 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 
 #include "prototypes.h"
+#include "string/ctype/strisascii/strisprint.h"
 #include "string/strcmp/streq.h"
 #include "string/strspn/stpspn.h"
 #include "string/strspn/stprspn.h"
@@ -36,7 +37,6 @@ int
 valid_field_(const char *field, const char *illegal)
 {
 	const char *cp;
-	int err = 0;
 
 	if (NULL == field) {
 		return -1;
@@ -50,12 +50,14 @@ valid_field_(const char *field, const char *illegal)
 		unsigned char c = *cp;
 		if (iscntrl(c))
 			return -1;
-		if (!isprint (c)) {
-			err = 1;
-		}
 	}
 
-	return err;
+	if (strisprint(field))
+		return 0;
+	if (streq(field, ""))
+		return 0;
+
+	return 1;
 }
 
 /*