lib/, src/, lib/string/strspn/: Compact files

alejandro-colomar · alejandro-colomar · commit 68cbbe3302a5 · 2026-01-03T01:36:30.000+01:00
Put together str*() and corresponding stp*() APIs in the same file.

Signed-off-by: Alejandro Colomar &lt;alx@kernel.org&gt;
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -236,18 +236,14 @@ libshadow_la_SOURCES = \
 	string/strerrno.h \
 	string/strftime.c \
 	string/strftime.h \
-	string/strspn/stpcspn.c \
-	string/strspn/stpcspn.h \
-	string/strspn/stpspn.c \
-	string/strspn/stpspn.h \
-	string/strspn/stprcspn.c \
-	string/strspn/stprcspn.h \
-	string/strspn/stprspn.c \
-	string/strspn/stprspn.h \
+	string/strspn/strcspn.c \
+	string/strspn/strcspn.h \
 	string/strspn/strrcspn.c \
 	string/strspn/strrcspn.h \
 	string/strspn/strrspn.c \
 	string/strspn/strrspn.h \
+	string/strspn/strspn.c \
+	string/strspn/strspn.h \
 	string/strtok/stpsep.c \
 	string/strtok/stpsep.h \
 	string/strtok/astrsep2ls.c \
diff --git a/lib/basename.c b/lib/basename.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 
 #include "prototypes.h"
-#include "string/strspn/stprcspn.h"
+#include "string/strspn/strrcspn.h"
 
 
 /*@observer@*/const char *
diff --git a/lib/fields.c b/lib/fields.c
@@ -20,8 +20,8 @@
 #include "string/ctype/strisascii.h"
 #include "string/ctype/strchrisascii.h"
 #include "string/strcmp/streq.h"
-#include "string/strspn/stpspn.h"
-#include "string/strspn/stprspn.h"
+#include "string/strspn/strrspn.h"
+#include "string/strspn/strspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/lib/getdef.c b/lib/getdef.c
@@ -32,8 +32,8 @@
 #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/strspn/strrspn.h"
+#include "string/strspn/strspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/lib/limits.c b/lib/limits.c
@@ -34,7 +34,7 @@
 #include "string/memset/memzero.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strspn/stpspn.h"
+#include "string/strspn/strspn.h"
 #include "typetraits.h"
 
 
diff --git a/lib/loginprompt.c b/lib/loginprompt.c
@@ -22,7 +22,7 @@
 #include "prototypes.h"
 #include "string/memset/memzero.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strspn/stpspn.h"
+#include "string/strspn/strspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/lib/nss.c b/lib/nss.c
@@ -18,7 +18,7 @@
 #include "string/strcmp/strcaseprefix.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strspn/stpspn.h"
+#include "string/strspn/strspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/lib/setupenv.c b/lib/setupenv.c
@@ -31,7 +31,7 @@
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strdup/strdup.h"
-#include "string/strspn/stpspn.h"
+#include "string/strspn/strspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/lib/string/ctype/strchrisascii.h b/lib/string/ctype/strchrisascii.h
@@ -10,7 +10,7 @@
 
 #include "string/ctype/isascii.h"
 #include "string/strcmp/streq.h"
-#include "string/strspn/stpcspn.h"
+#include "string/strspn/strcspn.h"
 
 
 // strchriscntrl_c - string character is [:cntrl:] C-locale
diff --git a/lib/string/ctype/strisascii.h b/lib/string/ctype/strisascii.h
@@ -12,7 +12,7 @@
 
 #include "string/ctype/isascii.h"
 #include "string/strcmp/streq.h"
-#include "string/strspn/stpspn.h"
+#include "string/strspn/strspn.h"
 
 
 inline bool strisdigit_c(const char *s); // strisdigit - string is [:digit:] C-locale
diff --git a/lib/string/strspn/stprcspn.c b/lib/string/strspn/stprcspn.c
diff --git a/lib/string/strspn/stprcspn.h b/lib/string/strspn/stprcspn.h
diff --git a/lib/string/strspn/stprspn.c b/lib/string/strspn/stprspn.c
diff --git a/lib/string/strspn/stprspn.h b/lib/string/strspn/stprspn.h
diff --git a/lib/string/strspn/strcspn.c b/lib/string/strspn/strcspn.c
@@ -4,4 +4,4 @@
 
 #include "config.h"
 
-#include "string/strspn/stpcspn.h"
+#include "string/strspn/strcspn.h"
diff --git a/lib/string/strspn/strcspn.h b/lib/string/strspn/strcspn.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STPCSPN_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STPCSPN_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STRCSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STRCSPN_H_
 
 
 #include "config.h"
diff --git a/lib/string/strspn/strrcspn.h b/lib/string/strspn/strrcspn.h
@@ -15,12 +15,21 @@
 #include "string/strchr/strnul.h"
 
 
+// stprcspn - string offset-pointer rear complement substring prefix length
+#define stprcspn(s, reject)                                                   \
+({                                                                            \
+	__auto_type  s_ = (s);                                                \
+	                                                                      \
+	s_ + strrcspn(s_, reject);                                            \
+})
+
+
 ATTR_STRING(1)
 ATTR_STRING(2)
 inline size_t strrcspn(const char *s, const char *reject);
 
 
-// string rear complement substring prefix length
+// strrcspn - string rear complement substring prefix length
 inline size_t
 strrcspn(const char *s, const char *reject)
 {
diff --git a/lib/string/strspn/strrspn.h b/lib/string/strspn/strrspn.h
@@ -15,12 +15,23 @@
 #include "string/strchr/strnul.h"
 
 
+// stprspn - string offset-pointer rear substring prefix length
+// Available in Oracle Solaris as strrspn(3GEN).
+// <https://docs.oracle.com/cd/E36784_01/html/E36877/strrspn-3gen.html>
+#define stprspn(s, accept)                                                    \
+({                                                                            \
+	__auto_type  s_ = (s);                                                \
+	                                                                      \
+	s_ + strrspn_(s_, accept);                                            \
+})
+
+
 ATTR_STRING(1)
 ATTR_STRING(2)
 inline size_t strrspn_(const char *s, const char *accept);
 
 
-// string rear substring prefix length
+// strrspn_ - string rear substring prefix length
 inline size_t
 strrspn_(const char *s, const char *accept)
 {
diff --git a/lib/string/strspn/strspn.c b/lib/string/strspn/strspn.c
@@ -4,4 +4,4 @@
 
 #include "config.h"
 
-#include "string/strspn/stpspn.h"
+#include "string/strspn/strspn.h"
diff --git a/lib/string/strspn/strspn.h b/lib/string/strspn/strspn.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STRSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STRSPN_H_
 
 
 #include "config.h"
@@ -13,9 +13,7 @@
 #include "attr.h"
 
 
-// string returns-pointer substring prefix length
-// Similar to strspn(3), but return a pointer instead of an offset.
-// Similar to strchrnul(3), but search for any bytes not in 'accept'.
+// stpspn - string offset-pointer substring prefix length
 #define stpspn(s, accept)                                                     \
 ({                                                                            \
 	__auto_type  s_ = s;                                                  \
diff --git a/src/login_nopam.c b/src/login_nopam.c
@@ -63,7 +63,7 @@
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strspn/stprspn.h"
+#include "string/strspn/strrspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/src/suauth.c b/src/suauth.c
@@ -21,8 +21,8 @@
 #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/strspn/strrspn.h"
+#include "string/strspn/strspn.h"
 #include "string/strtok/stpsep.h"
 
 
diff --git a/src/usermod.c b/src/usermod.c
@@ -69,7 +69,7 @@
 #include "string/strcmp/strprefix.h"
 #include "string/strdup/strdup.h"
 #include "string/strerrno.h"
-#include "string/strspn/stprspn.h"
+#include "string/strspn/strrspn.h"
 #include "time/day_to_str.h"
 #include "typetraits.h"
 
