lib/string/strspn/, lib/, src/: Move *spn() APIs to separate subdir

This provides a better organization.

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 31d09dced2aaf1830640546892f54dd839f2fa29..4bf5982959140a8f04120287a4619159f5cfa75b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -198,16 +198,8 @@ libshadow_la_SOURCES = \
        string/strchr/strchrcnt.h \
        string/strchr/strchrscnt.c \
        string/strchr/strchrscnt.h \
-       string/strchr/stpspn.c \
-       string/strchr/stpspn.h \
-       string/strchr/stprcspn.c \
-       string/strchr/stprcspn.h \
        string/strchr/strnul.c \
        string/strchr/strnul.h \
-       string/strchr/strrcspn.c \
-       string/strchr/strrcspn.h \
-       string/strchr/strrspn.c \
-       string/strchr/strrspn.h \
        string/strcmp/strcaseeq.c \
        string/strcmp/strcaseeq.h \
        string/strcmp/streq.c \
@@ -228,6 +220,14 @@ libshadow_la_SOURCES = \
        string/strdup/xstrndup.h \
        string/strftime.c \
        string/strftime.h \
+       string/strspn/stpspn.c \
+       string/strspn/stpspn.h \
+       string/strspn/stprcspn.c \
+       string/strspn/stprcspn.h \
+       string/strspn/strrcspn.c \
+       string/strspn/strrcspn.h \
+       string/strspn/strrspn.c \
+       string/strspn/strrspn.h \
        string/strtok/stpsep.c \
        string/strtok/stpsep.h \
        strtoday.c \

diff --git a/lib/fields.c b/lib/fields.c
index ada6726e7f63139436c48a8bec940fc57be0ace8..37e9af5f4d7d3d09b3c1e6fc4e643a5697a5f6f7 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -16,9 +16,9 @@
 #include <stdio.h>
 
 #include "prototypes.h"
-#include "string/strchr/stpspn.h"
-#include "string/strchr/strrspn.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
+#include "string/strspn/strrspn.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/lib/getdate.y b/lib/getdate.y
index a6f9bc674921d57acbb7e39191bf1e4726992435..20b1f5f1f1b97a1ba1f5b41c68fe9da2e99be32d 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -31,8 +31,8 @@
 
 #include "attr.h"
 #include "getdate.h"
-#include "string/strchr/stpspn.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
 
 
 /* Some old versions of bison generate parsers that use bcopy.

diff --git a/lib/getdef.c b/lib/getdef.c
index f5cf391f8d6f32de1e3eccda64e2227410fa78a7..5f470861177daab0e5f1c0c15139ef699b98ccf6 100644 (file)
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -30,10 +30,10 @@
 #include "prototypes.h"
 #include "shadowlog_internal.h"
 #include "string/sprintf/xasprintf.h"
-#include "string/strchr/stpspn.h"
-#include "string/strchr/strrspn.h"
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
+#include "string/strspn/strrspn.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/lib/limits.c b/lib/limits.c
index 9fb1a1ffb33029290893df443a3dd0f28fa40472..dec33f5c4f385bf4056816aed45f1236c98f3a81 100644 (file)
--- a/lib/limits.c
+++ b/lib/limits.c
@@ -36,8 +36,8 @@
 #include "atoi/str2i/str2s.h"
 #include "atoi/str2i/str2u.h"
 #include "string/memset/memzero.h"
-#include "string/strchr/stpspn.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
 #include "typetraits.h"
 
 

diff --git a/lib/loginprompt.c b/lib/loginprompt.c
index 7d3e23dc1b195e8d6470f90bdba3fb12b052965b..91a2b02469c39dd31cbdb77f2001fca9f67ea8d3 100644 (file)
--- a/lib/loginprompt.c
+++ b/lib/loginprompt.c
@@ -20,8 +20,8 @@
 #include "getdef.h"
 #include "prototypes.h"
 #include "string/memset/memzero.h"
-#include "string/strchr/stpspn.h"
 #include "string/strcpy/strtcpy.h"
+#include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/lib/nss.c b/lib/nss.c
index f1cf1351b627c3968b19ac316fb21e55d6f3491c..d76cef8707cdb6130d6a411729fb76acfacc961e 100644 (file)
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -15,8 +15,8 @@
 #include "shadowlog_internal.h"
 #include "shadowlog.h"
 #include "string/sprintf/snprintf.h"
-#include "string/strchr/stpspn.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/lib/setupenv.c b/lib/setupenv.c
index 63f7fb95d1fd71e7f6e71ce06c3f614af84b7888..b7dcb3fa182c3191a62745ad12179574a598fc5a 100644 (file)
--- a/lib/setupenv.c
+++ b/lib/setupenv.c
@@ -27,9 +27,9 @@
 #include "getdef.h"
 #include "shadowlog.h"
 #include "string/sprintf/xasprintf.h"
-#include "string/strchr/stpspn.h"
 #include "string/strcmp/streq.h"
 #include "string/strdup/xstrdup.h"
+#include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/lib/string/strchr/stprcspn.c b/lib/string/strspn/stprcspn.c
similarity index 78%
rename from lib/string/strchr/stprcspn.c
rename to lib/string/strspn/stprcspn.c
index f9dda5c4e1890f1cc01bef8e69f4798d4ef5bacd..80b4a51a92a3d2980cf87a71ac8aa6cb017ce08e 100644 (file)
--- a/lib/string/strchr/stprcspn.c
+++ b/lib/string/strspn/stprcspn.c
@@ -4,4 +4,4 @@
 
 #include <config.h>
 
-#include "string/strchr/stprcspn.h"
+#include "string/strspn/stprcspn.h"

diff --git a/lib/string/strchr/stprcspn.h b/lib/string/strspn/stprcspn.h
similarity index 80%
rename from lib/string/strchr/stprcspn.h
rename to lib/string/strspn/stprcspn.h
index 4d50566acdd35635d825df6203afbaf445068f34..cdd84617cc369c3a4f8a883d3f9c40b3dde6524a 100644 (file)
--- a/lib/string/strchr/stprcspn.h
+++ b/lib/string/strspn/stprcspn.h
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STPRCSPN_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STPRCSPN_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STPRCSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STPRCSPN_H_
 
 
 #include <config.h>
 
 #include <string.h>
 
-#include "string/strchr/strrcspn.h"
+#include "string/strspn/strrcspn.h"
 
 
 #define stprcspn(s, reject)                                                   \

diff --git a/lib/string/strchr/stpspn.c b/lib/string/strspn/stpspn.c
similarity index 79%
rename from lib/string/strchr/stpspn.c
rename to lib/string/strspn/stpspn.c
index b94ffe15c937abce0e50d7bba42f0cd5f6a3faee..510aaef99da56ec2012533e1effc1e40cf85e323 100644 (file)
--- a/lib/string/strchr/stpspn.c
+++ b/lib/string/strspn/stpspn.c
@@ -4,4 +4,4 @@
 
 #include <config.h>
 
-#include "string/strchr/stpspn.h"
+#include "string/strspn/stpspn.h"

diff --git a/lib/string/strchr/stpspn.h b/lib/string/strspn/stpspn.h
similarity index 87%
rename from lib/string/strchr/stpspn.h
rename to lib/string/strspn/stpspn.h
index 97edfdf9137095a67b3048dc80a063762859d008..d213cd9ff939184b999bdc2d46ce854dc8c8b6ef 100644 (file)
--- a/lib/string/strchr/stpspn.h
+++ b/lib/string/strspn/stpspn.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STPSPN_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STPSPN_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
 
 
 #include <config.h>

diff --git a/lib/string/strchr/strrcspn.c b/lib/string/strspn/strrcspn.c
similarity index 85%
rename from lib/string/strchr/strrcspn.c
rename to lib/string/strspn/strrcspn.c
index 17316500dded12271c195119194b3231a7240655..99e9bf71a928fdd1291ea512714f703f233a9f9a 100644 (file)
--- a/lib/string/strchr/strrcspn.c
+++ b/lib/string/strspn/strrcspn.c
@@ -4,7 +4,7 @@
 
 #include <config.h>
 
-#include "string/strchr/strrcspn.h"
+#include "string/strspn/strrcspn.h"
 
 #include <stddef.h>
 

diff --git a/lib/string/strchr/strrcspn.h b/lib/string/strspn/strrcspn.h
similarity index 83%
rename from lib/string/strchr/strrcspn.h
rename to lib/string/strspn/strrcspn.h
index e42a60acddcb44c84f6db3b08998270fc9a4bedd..c91453c4db05a51933f8372ac814e71389a33ae7 100644 (file)
--- a/lib/string/strchr/strrcspn.h
+++ b/lib/string/strspn/strrcspn.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRCSPN_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRCSPN_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STRRCSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STRRCSPN_H_
 
 
 #include <config.h>

diff --git a/lib/string/strchr/strrspn.c b/lib/string/strspn/strrspn.c
similarity index 85%
rename from lib/string/strchr/strrspn.c
rename to lib/string/strspn/strrspn.c
index 7ba25479998740ba30ddf0168e36248665941f33..e7cfca002d58fd001a82059ccbb1a7e477d2164a 100644 (file)
--- a/lib/string/strchr/strrspn.c
+++ b/lib/string/strspn/strrspn.c
@@ -4,7 +4,7 @@
 
 #include <config.h>
 
-#include "string/strchr/strrspn.h"
+#include "string/strspn/strrspn.h"
 
 
 extern inline char *strrspn(char *restrict s, const char *restrict accept);

diff --git a/lib/string/strchr/strrspn.h b/lib/string/strspn/strrspn.h
similarity index 85%
rename from lib/string/strchr/strrspn.h
rename to lib/string/strspn/strrspn.h
index c05dc56ddf2b2e37ba0dd57ccd6cab48b68acad6..b75818b02499c4dc38eb250711d18a8a4a1045d7 100644 (file)
--- a/lib/string/strchr/strrspn.h
+++ b/lib/string/strspn/strrspn.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRSPN_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRSPN_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STRRSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STRRSPN_H_
 
 
 #include <config.h>

diff --git a/lib/strtoday.c b/lib/strtoday.c
index 01f2e9b7edf54363db2a18ba9a3708dffdaf3af9..b9edd193dc72dca925f1abaa4a85c3a3beb25da1 100644 (file)
--- a/lib/strtoday.c
+++ b/lib/strtoday.c
@@ -14,8 +14,8 @@
 #include "atoi/str2i/str2s.h"
 #include "getdate.h"
 #include "prototypes.h"
-#include "string/strchr/stpspn.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
 
 
 /*

diff --git a/src/login_nopam.c b/src/login_nopam.c
index dfd6f1353004d8273f9b8869b84710a0b8170d29..bc77525d9f4616c8bb0108856302f7447fdbbae3 100644 (file)
--- a/src/login_nopam.c
+++ b/src/login_nopam.c
@@ -59,9 +59,9 @@
 
 #include "prototypes.h"
 #include "sizeof.h"
-#include "string/strchr/strrspn.h"
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/strrspn.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/src/suauth.c b/src/suauth.c
index aab7e986715fc51d1e3b3c519a89fbe3f7b6b20a..9b539ceb1beb6d95cd53ee78acb2e6905ff73475 100644 (file)
--- a/src/suauth.c
+++ b/src/suauth.c
@@ -19,9 +19,9 @@
 
 #include "defines.h"
 #include "prototypes.h"
-#include "string/strchr/stpspn.h"
-#include "string/strchr/strrspn.h"
 #include "string/strcmp/streq.h"
+#include "string/strspn/stpspn.h"
+#include "string/strspn/strrspn.h"
 #include "string/strtok/stpsep.h"