From: Alejandro Colomar Date: Thu, 27 Jun 2024 09:48:16 +0000 (+0200) Subject: lib/string/strcpy/, lib/, src/, tests/: Move all copying APIs to a subdirectory X-Git-Tag: 4.17.0-rc1~205 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40ab8060664d6aa91ad5857f5431c045e94f6057;p=thirdparty%2Fshadow.git lib/string/strcpy/, lib/, src/, tests/: Move all copying APIs to a subdirectory Signed-off-by: Alejandro Colomar --- diff --git a/lib/Makefile.am b/lib/Makefile.am index f6691d4c5..aaee71672 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -150,14 +150,16 @@ libshadow_la_SOURCES = \ string/sprintf/stpeprintf.h \ string/sprintf/xasprintf.c \ string/sprintf/xasprintf.h \ - string/stpecpy.c \ - string/stpecpy.h \ + string/strcpy/stpecpy.c \ + string/strcpy/stpecpy.h \ + string/strcpy/strncpy.c \ + string/strcpy/strncpy.h \ + string/strcpy/strtcpy.c \ + string/strcpy/strtcpy.h \ + string/strcpy/zustr2stp.c \ + string/strcpy/zustr2stp.h \ string/strftime.c \ string/strftime.h \ - string/strncpy.h \ - string/strtcpy.c \ - string/strtcpy.h \ - string/zustr2stp.h \ strtoday.c \ sub.c \ subordinateio.h \ diff --git a/lib/console.c b/lib/console.c index 92065d9b0..20e388ba5 100644 --- a/lib/console.c +++ b/lib/console.c @@ -13,7 +13,7 @@ #include #include "getdef.h" #include "prototypes.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" #ident "$Id$" diff --git a/lib/failure.c b/lib/failure.c index e42e71073..55a10a717 100644 --- a/lib/failure.c +++ b/lib/failure.c @@ -21,7 +21,7 @@ #include "memzero.h" #include "prototypes.h" #include "string/strftime.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" #define YEAR (365L*DAY) diff --git a/lib/log.c b/lib/log.c index 9f54d4547..fd78c6823 100644 --- a/lib/log.c +++ b/lib/log.c @@ -19,8 +19,8 @@ #include #include "memzero.h" #include "prototypes.h" -#include "string/strncpy.h" -#include "string/strtcpy.h" +#include "string/strcpy/strncpy.h" +#include "string/strcpy/strtcpy.h" /* diff --git a/lib/string/stpecpy.c b/lib/string/stpecpy.c deleted file mode 100644 index 97593884a..000000000 --- a/lib/string/stpecpy.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -#include - -#if !defined(HAVE_STPECPY) - -#ident "$Id$" - -#include "string/stpecpy.h" - - -extern inline char *stpecpy(char *dst, char *end, const char *restrict src); - - -#endif // !HAVE_STPECPY diff --git a/lib/string/strcpy/stpecpy.c b/lib/string/strcpy/stpecpy.c new file mode 100644 index 000000000..3268663b3 --- /dev/null +++ b/lib/string/strcpy/stpecpy.c @@ -0,0 +1,12 @@ +// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "string/strcpy/stpecpy.h" + + +#if !defined(HAVE_STPECPY) +extern inline char *stpecpy(char *dst, char *end, const char *restrict src); +#endif diff --git a/lib/string/stpecpy.h b/lib/string/strcpy/stpecpy.h similarity index 87% rename from lib/string/stpecpy.h rename to lib/string/strcpy/stpecpy.h index 2324baa56..e9debe4ec 100644 --- a/lib/string/stpecpy.h +++ b/lib/string/strcpy/stpecpy.h @@ -1,18 +1,13 @@ -/* - * SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar - * - * SPDX-License-Identifier: BSD-3-Clause - */ +// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause -#ifndef SHADOW_INCLUDE_LIB_STPECPY_H_ -#define SHADOW_INCLUDE_LIB_STPECPY_H_ +#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STPECPY_H_ +#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STPECPY_H_ #include -#if !defined(HAVE_STPECPY) - #include #include #include @@ -20,8 +15,10 @@ #include "attr.h" +#if !defined(HAVE_STPECPY) ATTR_STRING(3) inline char *stpecpy(char *dst, char *end, const char *restrict src); +#endif /* @@ -66,6 +63,7 @@ inline char *stpecpy(char *dst, char *end, const char *restrict src); */ +#if !defined(HAVE_STPECPY) inline char * stpecpy(char *dst, char *end, const char *restrict src) { @@ -84,7 +82,7 @@ stpecpy(char *dst, char *end, const char *restrict src) return stpcpy(mempcpy(dst, src, dlen), "") + trunc; } +#endif -#endif // !HAVE_STPECPY #endif // include guard diff --git a/lib/string/strcpy/strncpy.c b/lib/string/strcpy/strncpy.c new file mode 100644 index 000000000..5544feda2 --- /dev/null +++ b/lib/string/strcpy/strncpy.c @@ -0,0 +1,7 @@ +// SPDX-FileCopyrightText: 2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "string/strcpy/strncpy.h" diff --git a/lib/string/strcpy/strncpy.h b/lib/string/strcpy/strncpy.h new file mode 100644 index 000000000..fcb8720e2 --- /dev/null +++ b/lib/string/strcpy/strncpy.h @@ -0,0 +1,19 @@ +// SPDX-FileCopyrightText: 2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCPY_H_ +#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCPY_H_ + + +#include + +#include + +#include "sizeof.h" + + +#define STRNCPY(dst, src) strncpy(dst, src, NITEMS(dst)) + + +#endif // include guard diff --git a/lib/string/strtcpy.c b/lib/string/strcpy/strtcpy.c similarity index 52% rename from lib/string/strtcpy.c rename to lib/string/strcpy/strtcpy.c index 74de4fc4b..28e3d056b 100644 --- a/lib/string/strtcpy.c +++ b/lib/string/strcpy/strtcpy.c @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2022-2023, Alejandro Colomar - * SPDX-License-Identifier: BSD-3-Clause - */ +// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause #include @@ -9,9 +7,7 @@ #include #include -#ident "$Id$" - -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" extern inline ssize_t strtcpy(char *restrict dst, const char *restrict src, diff --git a/lib/string/strtcpy.h b/lib/string/strcpy/strtcpy.h similarity index 85% rename from lib/string/strtcpy.h rename to lib/string/strcpy/strtcpy.h index 4ff6e1110..4d35e1b81 100644 --- a/lib/string/strtcpy.h +++ b/lib/string/strcpy/strtcpy.h @@ -1,11 +1,9 @@ -/* - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * SPDX-License-Identifier: BSD-3-Clause - */ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause -#ifndef SHADOW_INCLUDE_LIB_STRTCPY_H_ -#define SHADOW_INCLUDE_LIB_STRTCPY_H_ +#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRTCPY_H_ +#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRTCPY_H_ #include @@ -16,7 +14,6 @@ #include #include "attr.h" -#include "defines.h" #include "sizeof.h" diff --git a/lib/string/zustr2stp.c b/lib/string/strcpy/zustr2stp.c similarity index 78% rename from lib/string/zustr2stp.c rename to lib/string/strcpy/zustr2stp.c index c98b60601..9f4c789a0 100644 --- a/lib/string/zustr2stp.c +++ b/lib/string/strcpy/zustr2stp.c @@ -4,4 +4,4 @@ #include -#include "string/zustr2stp.h" +#include "string/strcpy/zustr2stp.h" diff --git a/lib/string/zustr2stp.h b/lib/string/strcpy/zustr2stp.h similarity index 93% rename from lib/string/zustr2stp.h rename to lib/string/strcpy/zustr2stp.h index 152102b7a..3064ce981 100644 --- a/lib/string/zustr2stp.h +++ b/lib/string/strcpy/zustr2stp.h @@ -2,8 +2,8 @@ // SPDX-License-Identifier: BSD-3-Clause -#ifndef SHADOW_INCLUDE_LIB_STRING_ZUSTR2STP_H_ -#define SHADOW_INCLUDE_LIB_STRING_ZUSTR2STP_H_ +#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_ZUSTR2STP_H_ +#define SHADOW_INCLUDE_LIB_STRING_STRCPY_ZUSTR2STP_H_ #include diff --git a/lib/string/strncpy.h b/lib/string/strncpy.h deleted file mode 100644 index fc6fcc963..000000000 --- a/lib/string/strncpy.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * SPDX-License-Identifier: BSD-3-Clause - */ - - -#ifndef SHADOW_INCLUDE_LIB_STRNCPY_H_ -#define SHADOW_INCLUDE_LIB_STRNCPY_H_ - - -#include - -#include - -#include "sizeof.h" - - -#define STRNCPY(dst, src) strncpy(dst, src, NITEMS(dst)) - - -#endif // include guard diff --git a/lib/time/day_to_str.h b/lib/time/day_to_str.h index 96cec6e1f..374240f55 100644 --- a/lib/time/day_to_str.h +++ b/lib/time/day_to_str.h @@ -13,7 +13,7 @@ #include "defines.h" #include "sizeof.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" #define DAY_TO_STR(str, day) day_to_str(NITEMS(str), str, day) diff --git a/lib/utmp.c b/lib/utmp.c index 08e9b6250..d01a31166 100644 --- a/lib/utmp.c +++ b/lib/utmp.c @@ -24,9 +24,9 @@ #include "alloc.h" #include "sizeof.h" -#include "string/strncpy.h" -#include "string/strtcpy.h" -#include "string/zustr2stp.h" +#include "string/strcpy/strncpy.h" +#include "string/strcpy/strtcpy.h" +#include "string/strcpy/zustr2stp.h" #ident "$Id$" diff --git a/src/chage.c b/src/chage.c index 57228972a..b8af89cfa 100644 --- a/src/chage.c +++ b/src/chage.c @@ -35,8 +35,8 @@ #include "shadowio.h" #include "shadowlog.h" #include "string/sprintf/snprintf.h" +#include "string/strcpy/strtcpy.h" #include "string/strftime.h" -#include "string/strtcpy.h" #include "time/day_to_str.h" /*@-exitarg@*/ #include "exitcodes.h" diff --git a/src/chfn.c b/src/chfn.c index 663710648..3c182e63e 100644 --- a/src/chfn.c +++ b/src/chfn.c @@ -33,7 +33,7 @@ #include "exitcodes.h" #include "shadowlog.h" #include "string/sprintf/snprintf.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" /* diff --git a/src/chsh.c b/src/chsh.c index c4918c1b1..c211c7a0f 100644 --- a/src/chsh.c +++ b/src/chsh.c @@ -31,7 +31,7 @@ /*@-exitarg@*/ #include "exitcodes.h" #include "shadowlog.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" #ifndef SHELLS_FILE #define SHELLS_FILE "/etc/shells" @@ -43,6 +43,7 @@ #define ETCDIR "/etc" #endif + /* * Global variables */ diff --git a/src/gpasswd.c b/src/gpasswd.c index 9983b314a..0f00118b0 100644 --- a/src/gpasswd.c +++ b/src/gpasswd.c @@ -36,7 +36,7 @@ #include "exitcodes.h" #include "shadowlog.h" #include "string/sprintf/snprintf.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" /* diff --git a/src/groupmod.c b/src/groupmod.c index 5c13d066f..e39b76b89 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -40,7 +40,7 @@ #endif #include "shadowlog.h" #include "string/sprintf/stpeprintf.h" -#include "string/stpecpy.h" +#include "string/strcpy/stpecpy.h" /* diff --git a/src/login.c b/src/login.c index 0342e8e8a..cdfa13294 100644 --- a/src/login.c +++ b/src/login.c @@ -39,8 +39,8 @@ #include "exitcodes.h" #include "shadowlog.h" #include "string/sprintf/snprintf.h" +#include "string/strcpy/strtcpy.h" #include "string/strftime.h" -#include "string/strtcpy.h" #ifdef USE_PAM diff --git a/src/logoutd.c b/src/logoutd.c index c8705101d..19bcb7457 100644 --- a/src/logoutd.c +++ b/src/logoutd.c @@ -20,7 +20,9 @@ #include "prototypes.h" #include "shadowlog.h" #include "sizeof.h" -#include "string/zustr2stp.h" +#include "string/strcpy/zustr2stp.h" + + /* * Global variables */ diff --git a/src/passwd.c b/src/passwd.c index 2999a3c88..e3291d08d 100644 --- a/src/passwd.c +++ b/src/passwd.c @@ -33,7 +33,7 @@ #include "pwio.h" #include "shadowio.h" #include "shadowlog.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" #include "time/day_to_str.h" diff --git a/src/su.c b/src/su.c index 42a72247c..428d9149d 100644 --- a/src/su.c +++ b/src/su.c @@ -60,7 +60,7 @@ #include "exitcodes.h" #include "shadowlog.h" #include "string/sprintf/snprintf.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" /* diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 17538776a..b73d70368 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -104,7 +104,7 @@ test_strncpy_LDADD = \ $(NULL) test_strtcpy_SOURCES = \ - ../../lib/string/strtcpy.c \ + ../../lib/string/strcpy/strtcpy.c \ test_strtcpy.c \ $(NULL) test_strtcpy_CFLAGS = \ diff --git a/tests/unit/test_strncpy.c b/tests/unit/test_strncpy.c index 968765bb1..dedd4e2b4 100644 --- a/tests/unit/test_strncpy.c +++ b/tests/unit/test_strncpy.c @@ -15,7 +15,7 @@ #include #include "sizeof.h" -#include "string/strncpy.h" +#include "string/strcpy/strncpy.h" static void test_STRNCPY_trunc(void **state); diff --git a/tests/unit/test_strtcpy.c b/tests/unit/test_strtcpy.c index 12351a537..c27d7c9db 100644 --- a/tests/unit/test_strtcpy.c +++ b/tests/unit/test_strtcpy.c @@ -15,7 +15,7 @@ #include #include "sizeof.h" -#include "string/strtcpy.h" +#include "string/strcpy/strtcpy.h" static void test_STRTCPY_trunc(void **state); diff --git a/tests/unit/test_zustr2stp.c b/tests/unit/test_zustr2stp.c index 198d2eb65..3072ce408 100644 --- a/tests/unit/test_zustr2stp.c +++ b/tests/unit/test_zustr2stp.c @@ -13,7 +13,7 @@ #include // Required by #include -#include "string/zustr2stp.h" +#include "string/strcpy/zustr2stp.h" static void test_ZUSTR2STP(void **state);