From 872de49dcfbd681e1bd3901265e33bc1430a6102 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sat, 16 Nov 2024 15:03:28 +0100 Subject: [PATCH] lib/string/strspn/, lib/, src/: Move *spn() APIs to separate subdir This provides a better organization. Signed-off-by: Alejandro Colomar --- lib/Makefile.am | 16 ++++++++-------- lib/fields.c | 4 ++-- lib/getdate.y | 2 +- lib/getdef.c | 4 ++-- lib/limits.c | 2 +- lib/loginprompt.c | 2 +- lib/nss.c | 2 +- lib/setupenv.c | 2 +- lib/string/{strchr => strspn}/stprcspn.c | 2 +- lib/string/{strchr => strspn}/stprcspn.h | 6 +++--- lib/string/{strchr => strspn}/stpspn.c | 2 +- lib/string/{strchr => strspn}/stpspn.h | 4 ++-- lib/string/{strchr => strspn}/strrcspn.c | 2 +- lib/string/{strchr => strspn}/strrcspn.h | 4 ++-- lib/string/{strchr => strspn}/strrspn.c | 2 +- lib/string/{strchr => strspn}/strrspn.h | 4 ++-- lib/strtoday.c | 2 +- src/login_nopam.c | 2 +- src/suauth.c | 4 ++-- 19 files changed, 34 insertions(+), 34 deletions(-) rename lib/string/{strchr => strspn}/stprcspn.c (78%) rename lib/string/{strchr => strspn}/stprcspn.h (80%) rename lib/string/{strchr => strspn}/stpspn.c (79%) rename lib/string/{strchr => strspn}/stpspn.h (87%) rename lib/string/{strchr => strspn}/strrcspn.c (85%) rename lib/string/{strchr => strspn}/strrcspn.h (83%) rename lib/string/{strchr => strspn}/strrspn.c (85%) rename lib/string/{strchr => strspn}/strrspn.h (85%) diff --git a/lib/Makefile.am b/lib/Makefile.am index 31d09dced..4bf598295 100644 --- 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 ada6726e7..37e9af5f4 100644 --- a/lib/fields.c +++ b/lib/fields.c @@ -16,9 +16,9 @@ #include #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 a6f9bc674..20b1f5f1f 100644 --- 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 f5cf391f8..5f4708611 100644 --- 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 9fb1a1ffb..dec33f5c4 100644 --- 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 7d3e23dc1..91a2b0246 100644 --- 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 f1cf1351b..d76cef870 100644 --- 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 63f7fb95d..b7dcb3fa1 100644 --- 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 f9dda5c4e..80b4a51a9 100644 --- a/lib/string/strchr/stprcspn.c +++ b/lib/string/strspn/stprcspn.c @@ -4,4 +4,4 @@ #include -#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 4d50566ac..cdd84617c 100644 --- 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 #include -#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 b94ffe15c..510aaef99 100644 --- a/lib/string/strchr/stpspn.c +++ b/lib/string/strspn/stpspn.c @@ -4,4 +4,4 @@ #include -#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 97edfdf91..d213cd9ff 100644 --- 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 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 17316500d..99e9bf71a 100644 --- a/lib/string/strchr/strrcspn.c +++ b/lib/string/strspn/strrcspn.c @@ -4,7 +4,7 @@ #include -#include "string/strchr/strrcspn.h" +#include "string/strspn/strrcspn.h" #include 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 e42a60acd..c91453c4d 100644 --- 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 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 7ba254799..e7cfca002 100644 --- a/lib/string/strchr/strrspn.c +++ b/lib/string/strspn/strrspn.c @@ -4,7 +4,7 @@ #include -#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 c05dc56dd..b75818b02 100644 --- 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 diff --git a/lib/strtoday.c b/lib/strtoday.c index 01f2e9b7e..b9edd193d 100644 --- 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 dfd6f1353..bc77525d9 100644 --- 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 aab7e9867..9b539ceb1 100644 --- 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" -- 2.47.2