From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 2 Jan 2026 20:46:31 +0000 (+0100)
Subject: lib/: stris*(): Rename C-locale APIs with a _c suffix
X-Git-Tag: 4.20.0-rc1~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f4904ab4ccf10764e7c0f74b17191eb79d73b0d;p=thirdparty%2Fshadow.git

lib/: stris*(): Rename C-locale APIs with a _c suffix

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

diff --git a/lib/chkname.c b/lib/chkname.c
index ad5d70db0..85735d9c5 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -51,8 +51,8 @@ is_valid_name(const char *name)
 	 || streq(name, "..")
 	 || strspn(name, "-")
 	 || strpbrk(name, " \"#',/:;")
-	 || strchriscntrl(name)
-	 || strisdigit(name))
+	 || strchriscntrl_c(name)
+	 || strisdigit_c(name))
 	{
 		errno = EINVAL;
 		return false;
diff --git a/lib/fields.c b/lib/fields.c
index 77eb8c2d4..af9bed077 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -43,9 +43,9 @@ valid_field_(const char *field, const char *illegal)
 
 	if (strpbrk(field, illegal))
 		return -1;
-	if (strchriscntrl(field))
+	if (strchriscntrl_c(field))
 		return -1;
-	if (strisprint(field))
+	if (strisprint_c(field))
 		return 0;
 	if (streq(field, ""))
 		return 0;
diff --git a/lib/string/ctype/strchrisascii.c b/lib/string/ctype/strchrisascii.c
index b9b7e919a..5e25b23fa 100644
--- a/lib/string/ctype/strchrisascii.c
+++ b/lib/string/ctype/strchrisascii.c
@@ -9,4 +9,4 @@
 #include <stdbool.h>
 
 
-extern inline bool strchriscntrl(const char *s);
+extern inline bool strchriscntrl_c(const char *s);
diff --git a/lib/string/ctype/strchrisascii.h b/lib/string/ctype/strchrisascii.h
index a2be4e321..04da16e9d 100644
--- a/lib/string/ctype/strchrisascii.h
+++ b/lib/string/ctype/strchrisascii.h
@@ -14,12 +14,12 @@
 #include "string/strcmp/streq.h"
 
 
-inline bool strchriscntrl(const char *s);
+inline bool strchriscntrl_c(const char *s);
 
 
-// strchriscntrl - string character is [:cntrl:]
+// strchriscntrl_c - string character is [:cntrl:] C-locale
 inline bool
-strchriscntrl(const char *s)
+strchriscntrl_c(const char *s)
 {
 	for (; !streq(s, ""); s++) {
 		unsigned char  c = *s;
diff --git a/lib/string/ctype/strisascii.c b/lib/string/ctype/strisascii.c
index 564dac250..c87c8f1b2 100644
--- a/lib/string/ctype/strisascii.c
+++ b/lib/string/ctype/strisascii.c
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -9,5 +9,5 @@
 #include <stdbool.h>
 
 
-extern inline bool strisdigit(const char *s);
-extern inline bool strisprint(const char *s);
+extern inline bool strisdigit_c(const char *s);
+extern inline bool strisprint_c(const char *s);
diff --git a/lib/string/ctype/strisascii.h b/lib/string/ctype/strisascii.h
index 2f58f43ea..8e6b59b0b 100644
--- a/lib/string/ctype/strisascii.h
+++ b/lib/string/ctype/strisascii.h
@@ -15,17 +15,17 @@
 #include "string/strspn/stpspn.h"
 
 
-inline bool strisdigit(const char *s); // strisdigit - string is [:digit:]
-inline bool strisprint(const char *s); // strisprint - string is [:print:]
+inline bool strisdigit_c(const char *s); // strisdigit - string is [:digit:] C-locale
+inline bool strisprint_c(const char *s); // strisprint - string is [:print:] C-locale
 
 
 inline bool
-strisdigit(const char *s)
+strisdigit_c(const char *s)
 {
 	return !streq(s, "") && streq(stpspn(s, CTYPE_DIGIT_C), "");
 }
 inline bool
-strisprint(const char *s)
+strisprint_c(const char *s)
 {
 	return !streq(s, "") && streq(stpspn(s, CTYPE_PRINT_C), "");
 }
diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index 7f6db7e42..dacfe2015 100644
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -907,7 +907,7 @@ static int append_uids(uid_t **uids, const char *owner, int n)
 	int    i;
 	uid_t  owner_uid;
 
-	if (strisdigit(owner)) {
+	if (strisdigit_c(owner)) {
 		i = sscanf(owner, "%d", &owner_uid);
 		if (i != 1) {
 			// should not happen