lib/, src/: Use strcspn(3) instead of its pattern

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

Author: alejandro-colomar

lib/getdef.c

@@ -33,7 +33,6 @@
 #include "string/sprintf/xaprintf.h"
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
-#include "string/strcmp/strprefix.h"
 #include "string/strspn/stpspn.h"
 #include "string/strspn/stprspn.h"
 #include "string/strtok/stpsep.h"
@@ -566,7 +565,7 @@ static void def_load (void)
 		 * Break the line into two fields.
 		 */
 		name = stpspn(buf, " \t");	/* first nonwhite */
-		if (streq(name, "") || strprefix(name, "#"))
+		if (!strcspn(name, "#"))
 			continue;	/* comment or empty */
 
 		s = stpsep(name, " \t");  /* next field */

lib/limits.c

@@ -369,9 +369,9 @@ static int setup_user_limits (const char *uname)
 	 * FIXME: A better (smarter) checking should be done
 	 */
 	while (fgets (buf, 1024, fil) != NULL) {
-		if (strprefix(buf, "#") || strprefix(buf, "\n")) {
+		if (!strcspn(buf, "#\n"))
 			continue;
-		}
+
 		MEMZERO(tempbuf);
 		/* a valid line should have a username, then spaces,
 		 * then limits

lib/nss.c

@@ -17,7 +17,6 @@
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/strcaseprefix.h"
 #include "string/strcmp/streq.h"
-#include "string/strcmp/strprefix.h"
 #include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 
@@ -81,7 +80,7 @@ nss_init(const char *nsswitch_path) {
 	}
 	p = NULL;
 	while (getline(&line, &len, nssfp) != -1) {
-		if (strprefix(line, "#"))
+		if (!strcspn(line, "#"))
 			continue;
 		if (strlen(line) < 8)
 			continue;

lib/setupenv.c

@@ -15,11 +15,11 @@
 
 #ident "$Id$"
 
-#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
-#include <ctype.h>
 
 #include "prototypes.h"
 #include "defines.h"
@@ -28,11 +28,12 @@
 #include "shadowlog.h"
 #include "string/sprintf/xaprintf.h"
 #include "string/strcmp/streq.h"
-#include "string/strcmp/strprefix.h"
 #include "string/strdup/xstrdup.h"
 #include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 
+#include <assert.h>
+
 
 #ifndef USE_PAM
 static void
@@ -62,9 +63,9 @@ static void read_env_file (const char *filename)
 		cp = buf;
 		/* ignore whitespace and comments */
 		cp = stpspn(cp, " \t");
-		if (streq(cp, "") || strprefix(cp, "#")) {
+		if (!strcspn(cp, "#"))
 			continue;
-		}
+
 		/*
 		 * ignore lines which don't follow the name=value format
 		 * (for example, the "export NAME" shell commands)

src/login_nopam.c

@@ -111,9 +111,9 @@ login_access(const char *user, const char *from)
 					 TABLE, lineno));
 				continue;
 			}
-			if (strprefix(line, "#")) {
-				continue;	/* comment line */
-			}
+			if (!strcspn(line, "#"))
+				continue;	/* comment or empty */
+
 			stpcpy(stprspn(line, " \t"), "");
 			if (streq(line, "")) {	/* skip blank lines */
 				continue;

src/suauth.c

@@ -20,7 +20,6 @@
 #include "defines.h"
 #include "prototypes.h"
 #include "string/strcmp/streq.h"
-#include "string/strcmp/strprefix.h"
 #include "string/strspn/stpspn.h"
 #include "string/strspn/stprspn.h"
 #include "string/strtok/stpsep.h"
@@ -88,7 +87,7 @@ check_su_auth(const char *actual_id, const char *wanted_id, bool su_to_root)
 		stpcpy(stprspn(temp, " \t"), "");
 
 		p = stpspn(temp, " \t");
-		if (strprefix(p, "#") || streq(p, ""))
+		if (!strcspn(p, "#"))
 			continue;
 
 		to_users = strsep(&p, ":");

src/useradd.c

@@ -1371,16 +1371,13 @@ static void process_flags (int argc, char **argv, struct option_flags *flags)
 				break;
 			case 's':
 				if (   ( !VALID (optarg) )
-				    || (   !streq(optarg, "")
-				        && ('/'  != optarg[0])
-				        && ('*'  != optarg[0]) )) {
+				    || strcspn(optarg, "/*")) {
 					fprintf (stderr,
 					         _("%s: invalid shell '%s'\n"),
 					         Prog, optarg);
 					exit (E_BAD_ARG);
 				}
-				if (!streq(optarg, "")
-				     && '*'  != optarg[0]
+				if (strcspn(optarg, "*")
 				     && !streq(optarg, "/sbin/nologin")
 				     && !streq(optarg, "/usr/sbin/nologin")
 				     && (   stat(optarg, &st) != 0

src/usermod.c

@@ -1083,7 +1083,7 @@ process_flags(int argc, char **argv, struct option_flags *flags)
 				}
 				dflg = true;
 				user_newhome = optarg;
-				if ((user_newhome[0] != '/') && !streq(user_newhome, "")) {
+				if (strcspn(user_newhome, "/")) {
 					fprintf (stderr,
 					         _("%s: homedir must be an absolute path\n"),
 					         Prog);
@@ -1176,16 +1176,13 @@ process_flags(int argc, char **argv, struct option_flags *flags)
 				break;
 			case 's':
 				if (   ( !VALID (optarg) )
-				    || (   !streq(optarg, "")
-				        && ('/'  != optarg[0])
-				        && ('*'  != optarg[0]) )) {
+				    || strcspn(optarg, "/*")) {
 					fprintf (stderr,
 					         _("%s: invalid shell '%s'\n"),
 					         Prog, optarg);
 					exit (E_BAD_ARG);
 				}
-				if (!streq(optarg, "")
-				     && '*'  != optarg[0]
+				if (strcspn(optarg, "*")
 				     && !streq(optarg, "/sbin/nologin")
 				     && !streq(optarg, "/usr/sbin/nologin")
 				     && (   stat(optarg, &st) != 0