lib/: Merge "lib/string/ctype/*" files even further

Most of these are just one-liners, so they fit in less files, and that
makes them even easier to compare all at once.

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 69bbd14db076ac6efd83f91231b455227ea2d1aa..599cb0bbdd4bd827db48e93c5e3512da30ed7060 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -193,12 +193,8 @@ libshadow_la_SOURCES = \
        sssd.h \
        string/ctype/isascii.c \
        string/ctype/isascii.h \
-       string/ctype/strchrisascii.c \
-       string/ctype/strchrisascii.h \
-       string/ctype/strisascii.c \
-       string/ctype/strisascii.h \
-       string/ctype/strtoascii.c \
-       string/ctype/strtoascii.h \
+       string/ctype/toascii.c \
+       string/ctype/toascii.h \
        string/memset/memzero.c \
        string/memset/memzero.h \
        string/sprintf/aprintf.c \

diff --git a/lib/chkname.c b/lib/chkname.c
index 85735d9c53d09686bddbaeaeb7ef33ab0983a3dd..1ef33ad3ebcbe8d080211a359b044b9828fd56d6 100644 (file)
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -33,8 +33,7 @@
 
 #include "defines.h"
 #include "chkname.h"
-#include "string/ctype/strchrisascii.h"
-#include "string/ctype/strisascii.h"
+#include "string/ctype/isascii.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strcaseeq.h"
 #include "sysconf.h"

diff --git a/lib/fields.c b/lib/fields.c
index 6f0d77abc10199236b26c8af6cb5e44da09abe5b..568746fc8f8ef035dbc0a030629d34e84edc5afb 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -19,8 +19,7 @@
 
 #include "io/fgets/fgets.h"
 #include "prototypes.h"
-#include "string/ctype/strisascii.h"
-#include "string/ctype/strchrisascii.h"
+#include "string/ctype/isascii.h"
 #include "string/strcmp/streq.h"
 #include "string/strspn/stpspn.h"
 #include "string/strspn/stprspn.h"

diff --git a/lib/obscure.c b/lib/obscure.c
index 3f0a4ca668c375060d1fd82c100afd702067c109..342bb812d64a65fedb01fcd99c5305e81fea0289 100644 (file)
--- a/lib/obscure.c
+++ b/lib/obscure.c
@@ -19,7 +19,7 @@
 #include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"
-#include "string/ctype/strtoascii.h"
+#include "string/ctype/toascii.h"
 #include "string/memset/memzero.h"
 #include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"

diff --git a/lib/string/ctype/isascii.h b/lib/string/ctype/isascii.h
index 8a1b47fcff92b10c62228e397c6dfa8151dfc755..6500717c6a8384c94973fbc89b36fd3b9cbf21c8 100644 (file)
--- a/lib/string/ctype/isascii.h
+++ b/lib/string/ctype/isascii.h
@@ -11,6 +11,7 @@
 #include <string.h>
 
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
 
 
 #define CTYPE_CNTRL_C                                                 \
@@ -46,4 +47,13 @@
 #define isxdigit_c(c)     (!streq(strchrnul(CTYPE_XDIGIT_C, c), ""))
 
 
+// strisascii_c - string is [:ascii:] C-locale
+#define strisdigit_c(s)   streq(stpspn(s, CTYPE_DIGIT_C), "")
+#define strisprint_c(s)   streq(stpspn(s, CTYPE_PRINT_C), "")
+
+
+// strchriscntrl_c - string character is [:cntrl:] C-locale
+#define strchriscntrl_c(s)  (!!strpbrk(s, CTYPE_CNTRL_C))
+
+
 #endif  // include guard

diff --git a/lib/string/ctype/strchrisascii.c b/lib/string/ctype/strchrisascii.c
deleted file mode 100644 (file)
index 9054306..0000000
--- a/lib/string/ctype/strchrisascii.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include "config.h"
-
-#include "string/ctype/strchrisascii.h"

diff --git a/lib/string/ctype/strchrisascii.h b/lib/string/ctype/strchrisascii.h
deleted file mode 100644 (file)
index 8fc775a..0000000
--- a/lib/string/ctype/strchrisascii.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_STRCHRISASCII_H_
-#define SHADOW_INCLUDE_LIB_STRING_CTYPE_STRCHRISASCII_H_
-
-
-#include "config.h"
-
-#include <string.h>
-
-#include "string/ctype/isascii.h"
-
-
-// strchriscntrl_c - string character is [:cntrl:] C-locale
-#define strchriscntrl_c(s)  (!!strpbrk(s, CTYPE_CNTRL_C))
-
-
-#endif  // include guard

diff --git a/lib/string/ctype/strisascii.c b/lib/string/ctype/strisascii.c
deleted file mode 100644 (file)
index 24e8a9c..0000000
--- a/lib/string/ctype/strisascii.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include "config.h"
-
-#include "string/ctype/strisascii.h"

diff --git a/lib/string/ctype/strisascii.h b/lib/string/ctype/strisascii.h
deleted file mode 100644 (file)
index eb4d831..0000000
--- a/lib/string/ctype/strisascii.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_STRISASCII_H_
-#define SHADOW_INCLUDE_LIB_STRING_CTYPE_STRISASCII_H_
-
-
-#include "config.h"
-
-#include "string/ctype/isascii.h"
-#include "string/strcmp/streq.h"
-#include "string/strspn/stpspn.h"
-
-
-// strisascii_c - string is [:ascii:] C-locale
-#define strisdigit_c(s)   streq(stpspn(s, CTYPE_DIGIT_C), "")
-#define strisprint_c(s)   streq(stpspn(s, CTYPE_PRINT_C), "")
-
-
-#endif  // include guard

diff --git a/lib/string/ctype/strtoascii.c b/lib/string/ctype/toascii.c
similarity index 82%
rename from lib/string/ctype/strtoascii.c
rename to lib/string/ctype/toascii.c
index 1e89acaaf5c913e6192e068450d2b4d024166afb..5f8cc0c7b24aa608ef7f18931498b48e4784558e 100644 (file)
--- a/lib/string/ctype/strtoascii.c
+++ b/lib/string/ctype/toascii.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "string/ctype/strtoascii.h"
+#include "string/ctype/toascii.h"
 
 
 extern inline char *strtolower(char *str);

diff --git a/lib/string/ctype/strtoascii.h b/lib/string/ctype/toascii.h
similarity index 80%
rename from lib/string/ctype/strtoascii.h
rename to lib/string/ctype/toascii.h
index c0c3be7177ea80e3731ddbea6cce388b4f8cc5fa..440a242223ee416e6bfd9129e79d2f1c2b01ae02 100644 (file)
--- a/lib/string/ctype/strtoascii.h
+++ b/lib/string/ctype/toascii.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_STRTOASCII_H_
-#define SHADOW_INCLUDE_LIB_STRING_CTYPE_STRTOASCII_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_TOASCII_H_
+#define SHADOW_INCLUDE_LIB_STRING_CTYPE_TOASCII_H_
 
 
 #include "config.h"

diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index dacfe2015bf7f28235e29f1082517e8a145f5ad1..65bcfb7077882253de3263fa88485e70890955a9 100644 (file)
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -24,7 +24,7 @@
 #include "atoi/a2i.h"
 #include "atoi/getnum.h"
 #include "shadow/passwd/getpw.h"
-#include "string/ctype/strisascii.h"
+#include "string/ctype/isascii.h"
 #include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strtok/strsep2arr.h"