Add dependency on libc-mem

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

37 files changed, 55 insertions, 58 deletions

diff --git a/.gitignore b/.gitignore
index 04d0d85..97c467c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 /.checkpatch-camelcase*
 
 # 'make check' binaries
-/share/tests/libc-stp/**/test
+/share/tests/libc-str-cpy-stp/**/test
diff --git a/include/c/stp/_compiler.h b/include/c/str/cpy/stp/_compiler.h
index 85c20a0..7b76f5f 100644
--- a/include/c/stp/_compiler.h
+++ b/include/c/str/cpy/stp/_compiler.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP__COMPILER_H_
-#define INCLUDE_C_STP__COMPILER_H_
+#ifndef INCLUDE_C_STR_CPY_STP__COMPILER_H_
+#define INCLUDE_C_STR_CPY_STP__COMPILER_H_
 
 
 #if (__STDC_VERSION__ < 202000L)
diff --git a/include/c/stp/stp/ustr2stp.h b/include/c/str/cpy/stp/stp/ustr2stp.h
index 9933193..9c8b21f 100644
--- a/include/c/stp/stp/ustr2stp.h
+++ b/include/c/str/cpy/stp/stp/ustr2stp.h
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP_STP_USTR2STP_H_
-#define INCLUDE_C_STP_STP_USTR2STP_H_
+#ifndef INCLUDE_C_STR_CPY_STP_STP_USTR2STP_H_
+#define INCLUDE_C_STR_CPY_STP_STP_USTR2STP_H_
 
 
 #include <stddef.h>
 
-#include <c/stp/_compiler.h>  // IWYU pragma: keep
-#include <c/stp/ustp/ustpcpy.h>
+#include <c/str/cpy/stp/_compiler.h>  // IWYU pragma: keep
+#include <c/str/cpy/stp/ustp/ustpcpy.h>
 
 
 #pragma clang assume_nonnull begin
diff --git a/include/c/stp/stp/zustr2stp.h b/include/c/str/cpy/stp/stp/zustr2stp.h
index 53c2305..f055dd6 100644
--- a/include/c/stp/stp/zustr2stp.h
+++ b/include/c/str/cpy/stp/stp/zustr2stp.h
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP_STP_ZUSTR2STP_H_
-#define INCLUDE_C_STP_STP_ZUSTR2STP_H_
+#ifndef INCLUDE_C_STR_CPY_STP_STP_ZUSTR2STP_H_
+#define INCLUDE_C_STR_CPY_STP_STP_ZUSTR2STP_H_
 
 
 #include <stddef.h>
 
-#include <c/stp/_compiler.h>  // IWYU pragma: keep
-#include <c/stp/ustp/zustr2ustp.h>
+#include <c/str/cpy/stp/_compiler.h>  // IWYU pragma: keep
+#include <c/str/cpy/stp/ustp/zustr2ustp.h>
 
 
 #pragma clang assume_nonnull begin
diff --git a/include/c/stp/stpe/stpecpy.h b/include/c/str/cpy/stp/stpe/stpecpy.h
index eb84587..94750a7 100644
--- a/include/c/stp/stpe/stpecpy.h
+++ b/include/c/str/cpy/stp/stpe/stpecpy.h
@@ -2,15 +2,16 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP_STPE_STPECPY_H_
-#define INCLUDE_C_STP_STPE_STPECPY_H_
+#ifndef INCLUDE_C_STR_CPY_STP_STPE_STPECPY_H_
+#define INCLUDE_C_STR_CPY_STP_STPE_STPECPY_H_
 
 
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
 
-#include <c/stp/_compiler.h>
+#include <c/mem/cpy/mempcpy.h>
+#include <c/str/cpy/stp/_compiler.h>
 
 
 #pragma clang assume_nonnull begin
@@ -36,7 +37,7 @@ c_stpecpy(char *c_nullable dst, char *end, const char *restrict src)
 	dlen = slen - trunc;
 	dst[dlen] = '\0';
 
-	return mempcpy(dst, src, dlen) + trunc;
+	return c_mempcpy(dst, src, dlen) + trunc;
 }
 #pragma clang assume_nonnull end
 
diff --git a/include/c/stp/stpe/stpeprintf.h b/include/c/str/cpy/stp/stpe/stpeprintf.h
index 32dc0fe..1a74dd8 100644
--- a/include/c/stp/stpe/stpeprintf.h
+++ b/include/c/str/cpy/stp/stpe/stpeprintf.h
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP_STPE_STPEPRINTF_H_
-#define INCLUDE_C_STP_STPE_STPEPRINTF_H_
+#ifndef INCLUDE_C_STR_CPY_STP_STPE_STPEPRINTF_H_
+#define INCLUDE_C_STR_CPY_STP_STPE_STPEPRINTF_H_
 
 
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <c/stp/_compiler.h>
+#include <c/str/cpy/stp/_compiler.h>
 
 
 #pragma clang assume_nonnull begin
diff --git a/include/c/stp/ustp/ustpcpy.h b/include/c/str/cpy/stp/ustp/ustpcpy.h
index 0045f0e..610b36e 100644
--- a/include/c/stp/ustp/ustpcpy.h
+++ b/include/c/str/cpy/stp/ustp/ustpcpy.h
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP_USTP_USTPCPY_H_
-#define INCLUDE_C_STP_USTP_USTPCPY_H_
+#ifndef INCLUDE_C_STR_CPY_STP_USTP_USTPCPY_H_
+#define INCLUDE_C_STR_CPY_STP_USTP_USTPCPY_H_
 
 
 #include <stddef.h>
-#include <string.h>
 
-#include <c/stp/_compiler.h>  // IWYU pragma: keep
+#include <c/mem/cpy/mempcpy.h>
+#include <c/str/cpy/stp/_compiler.h>  // IWYU pragma: keep
 
 
 #pragma clang assume_nonnull begin
@@ -20,11 +20,7 @@ inline char *c_ustpcpy(char *restrict dst, const char *restrict src,
 inline char *
 c_ustpcpy(char *restrict dst, const char *restrict src, size_t len)
 {
-#if defined(_GNU_SOURCE)
-	return mempcpy(dst, src, len);
-#else
-	return memcpy(dst, src, len) + len;
-#endif
+	return c_mempcpy(dst, src, len);
 }
 #pragma clang assume_nonnull end
 
diff --git a/include/c/stp/ustp/zustr2ustp.h b/include/c/str/cpy/stp/ustp/zustr2ustp.h
index e8428cf..28aefd8 100644
--- a/include/c/stp/ustp/zustr2ustp.h
+++ b/include/c/str/cpy/stp/ustp/zustr2ustp.h
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#ifndef INCLUDE_C_STP_USTP_ZUSTR2USTP_H_
-#define INCLUDE_C_STP_USTP_ZUSTR2USTP_H_
+#ifndef INCLUDE_C_STR_CPY_STP_USTP_ZUSTR2USTP_H_
+#define INCLUDE_C_STR_CPY_STP_USTP_ZUSTR2USTP_H_
 
 
 #include <stddef.h>
 #include <string.h>
 
-#include <c/stp/_compiler.h>  // IWYU pragma: keep
-#include <c/stp/ustp/ustpcpy.h>
+#include <c/str/cpy/stp/_compiler.h>  // IWYU pragma: keep
+#include <c/str/cpy/stp/ustp/ustpcpy.h>
 
 
 #pragma clang assume_nonnull begin
diff --git a/lib/build-lib.mk b/lib/build-lib.mk
index 3d23c70..4ce3d98 100644
--- a/lib/build-lib.mk
+++ b/lib/build-lib.mk
@@ -27,7 +27,7 @@ DEFAULT_LDFLAGS += $(shell $(PKGCONF_CMD) --libs-only-other $(pc_reqs) $(HIDE_ER
 EXTRA_LDFLAGS   :=
 LDFLAGS         := $(DEFAULT_LDFLAGS) $(EXTRA_LDFLAGS)
 
-DEFAULT_LDLIBS := $(filter-out -lc-stp,$(shell $(PKGCONF_CMD) --libs-only-l $(pc_reqs) $(HIDE_ERR)))
+DEFAULT_LDLIBS := $(filter-out -lc-str-cpy-stp,$(shell $(PKGCONF_CMD) --libs-only-l $(pc_reqs) $(HIDE_ERR)))
 DEFAULT_LDLIBS += $(shell $(SED) -n '/^Libs.private: /s///p' $(LIB_pc_u))
 EXTRA_LDLIBS   :=
 LDLIBS         := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS)
diff --git a/lib/version.mk b/lib/version.mk
index b961bfa..47a5519 100644
--- a/lib/version.mk
+++ b/lib/version.mk
@@ -10,7 +10,7 @@ include $(srcdir)/lib/cmd.mk
 include $(srcdir)/lib/verbose.mk
 
 
-libname       := libc-stp
+libname       := libc-str-cpy-stp
 DISTVERSION   := $(patsubst v%,%,$(shell $(GIT) describe $(HIDE_ERR) || $(ECHO) unreleased))
 DISTNAME      := $(libname)-$(DISTVERSION)
 MAJOR_VERSION := $(shell $(ECHO) $(DISTVERSION) | $(CUT) -f1 -d. )
diff --git a/share/pkgconfig/libc-stp-uninstalled.pc b/share/pkgconfig/libc-str-cpy-stp-uninstalled.pc
index c5dbd80..29c036c 100644
--- a/share/pkgconfig/libc-stp-uninstalled.pc
+++ b/share/pkgconfig/libc-str-cpy-stp-uninstalled.pc
@@ -1,8 +1,8 @@
-Name: libc-stp
+Name: libc-str-cpy-stp
 Description: stp string library
 URL: http://www.alejandro-colomar.es/src/alx/alx/libc-stp.git
 Version: <version>
-Requires:
+Requires: libc-mem
 Requires.private:
 
 prefix=/usr/local
@@ -11,5 +11,5 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 
 Cflags: -isystem${includedir}
-Libs: -L${libdir} -lc-stp -lc
+Libs: -L${libdir} -lc-str-cpy-stp -lc
 Libs.private:
diff --git a/share/tests/libc-stp/Makefile b/share/tests/libc-str-cpy-stp/Makefile
index 00d7e53..466770e 100755
--- a/share/tests/libc-stp/Makefile
+++ b/share/tests/libc-str-cpy-stp/Makefile
@@ -18,7 +18,7 @@ PKGCONF := pkgconf
 SORT    := sort
 
 
-libname := libc-stp
+libname := libc-str-cpy-stp
 
 
 PKGCONFFLAGS :=
diff --git a/share/tests/libc-stp/stpe/001/test.c b/share/tests/libc-str-cpy-stp/stpe/001/test.c
index f040c32..02b4896 100644
--- a/share/tests/libc-stp/stpe/001/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/001/test.c
@@ -1,4 +1,4 @@
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/001/test.sh b/share/tests/libc-str-cpy-stp/stpe/001/test.sh
index 8f0870d..8f0870d 100755
--- a/share/tests/libc-stp/stpe/001/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/001/test.sh
diff --git a/share/tests/libc-stp/stpe/002/test.c b/share/tests/libc-str-cpy-stp/stpe/002/test.c
index d9d7a3d..3aa8fe1 100644
--- a/share/tests/libc-stp/stpe/002/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/002/test.c
@@ -1,4 +1,4 @@
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/002/test.sh b/share/tests/libc-str-cpy-stp/stpe/002/test.sh
index e5eadd2..e5eadd2 100755
--- a/share/tests/libc-stp/stpe/002/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/002/test.sh
diff --git a/share/tests/libc-stp/stpe/003/test.c b/share/tests/libc-str-cpy-stp/stpe/003/test.c
index 9df9f7b..5f216ff 100644
--- a/share/tests/libc-stp/stpe/003/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/003/test.c
@@ -1,4 +1,4 @@
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/003/test.sh b/share/tests/libc-str-cpy-stp/stpe/003/test.sh
index ee952ea..ee952ea 100755
--- a/share/tests/libc-stp/stpe/003/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/003/test.sh
diff --git a/share/tests/libc-stp/stpe/004/test.c b/share/tests/libc-str-cpy-stp/stpe/004/test.c
index 48cbb53..c3645ad 100644
--- a/share/tests/libc-stp/stpe/004/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/004/test.c
@@ -1,4 +1,4 @@
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/004/test.sh b/share/tests/libc-str-cpy-stp/stpe/004/test.sh
index 7eccc45..7eccc45 100755
--- a/share/tests/libc-stp/stpe/004/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/004/test.sh
diff --git a/share/tests/libc-stp/stpe/005/test.c b/share/tests/libc-str-cpy-stp/stpe/005/test.c
index e1fa59b..9c4a585 100644
--- a/share/tests/libc-stp/stpe/005/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/005/test.c
@@ -1,4 +1,4 @@
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/005/test.sh b/share/tests/libc-str-cpy-stp/stpe/005/test.sh
index 1cadf3a..1cadf3a 100755
--- a/share/tests/libc-stp/stpe/005/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/005/test.sh
diff --git a/share/tests/libc-stp/stpe/006/test.c b/share/tests/libc-str-cpy-stp/stpe/006/test.c
index 875915c..58f390f 100644
--- a/share/tests/libc-stp/stpe/006/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/006/test.c
@@ -1,4 +1,4 @@
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/006/test.sh b/share/tests/libc-str-cpy-stp/stpe/006/test.sh
index 7eccc45..7eccc45 100755
--- a/share/tests/libc-stp/stpe/006/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/006/test.sh
diff --git a/share/tests/libc-stp/stpe/007/test.c b/share/tests/libc-str-cpy-stp/stpe/007/test.c
index c27d1a5..baf7df6 100644
--- a/share/tests/libc-stp/stpe/007/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/007/test.c
@@ -1,5 +1,5 @@
-#include <c/stp/stpe/stpecpy.h>
-#include <c/stp/stpe/stpeprintf.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpeprintf.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/007/test.sh b/share/tests/libc-str-cpy-stp/stpe/007/test.sh
index e532969..e532969 100755
--- a/share/tests/libc-stp/stpe/007/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/007/test.sh
diff --git a/share/tests/libc-stp/stpe/008/test.c b/share/tests/libc-str-cpy-stp/stpe/008/test.c
index 9ed7eff..5f8c2cf 100644
--- a/share/tests/libc-stp/stpe/008/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/008/test.c
@@ -1,5 +1,5 @@
-#include <c/stp/stpe/stpecpy.h>
-#include <c/stp/stpe/stpeprintf.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpeprintf.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/008/test.sh b/share/tests/libc-str-cpy-stp/stpe/008/test.sh
index 52043f7..52043f7 100755
--- a/share/tests/libc-stp/stpe/008/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/008/test.sh
diff --git a/share/tests/libc-stp/stpe/009/test.c b/share/tests/libc-str-cpy-stp/stpe/009/test.c
index 45b1ae3..bb181f8 100644
--- a/share/tests/libc-stp/stpe/009/test.c
+++ b/share/tests/libc-str-cpy-stp/stpe/009/test.c
@@ -1,5 +1,5 @@
-#include <c/stp/stpe/stpecpy.h>
-#include <c/stp/stpe/stpeprintf.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpeprintf.h>
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/share/tests/libc-stp/stpe/009/test.sh b/share/tests/libc-str-cpy-stp/stpe/009/test.sh
index 555d657..555d657 100755
--- a/share/tests/libc-stp/stpe/009/test.sh
+++ b/share/tests/libc-str-cpy-stp/stpe/009/test.sh
diff --git a/src/c/stp/_compiler.c b/src/c/str/cpy/stp/_compiler.c
index 5798531..5ede2f4 100644
--- a/src/c/stp/_compiler.c
+++ b/src/c/str/cpy/stp/_compiler.c
@@ -2,4 +2,4 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/_compiler.h>
+#include <c/str/cpy/stp/_compiler.h>
diff --git a/src/c/stp/stp/ustr2stp.c b/src/c/str/cpy/stp/stp/ustr2stp.c
index 695b401..8b4e683 100644
--- a/src/c/stp/stp/ustr2stp.c
+++ b/src/c/str/cpy/stp/stp/ustr2stp.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/stp/ustr2stp.h>
+#include <c/str/cpy/stp/stp/ustr2stp.h>
 
 #include <stddef.h>
 
diff --git a/src/c/stp/stp/zustr2stp.c b/src/c/str/cpy/stp/stp/zustr2stp.c
index bb804b0..45ea57f 100644
--- a/src/c/stp/stp/zustr2stp.c
+++ b/src/c/str/cpy/stp/stp/zustr2stp.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/stp/zustr2stp.h>
+#include <c/str/cpy/stp/stp/zustr2stp.h>
 
 #include <stddef.h>
 
diff --git a/src/c/stp/stpe/stpecpy.c b/src/c/str/cpy/stp/stpe/stpecpy.c
index a0a21cd..5dc3154 100644
--- a/src/c/stp/stpe/stpecpy.c
+++ b/src/c/str/cpy/stp/stpe/stpecpy.c
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/stpe/stpecpy.h>
+#include <c/str/cpy/stp/stpe/stpecpy.h>
 
-#include <c/stp/_compiler.h>
+#include <c/str/cpy/stp/_compiler.h>
 
 
 #pragma clang assume_nonnull begin
diff --git a/src/c/stp/stpe/stpeprintf.c b/src/c/str/cpy/stp/stpe/stpeprintf.c
index bf7ad39..32d18f8 100644
--- a/src/c/stp/stpe/stpeprintf.c
+++ b/src/c/str/cpy/stp/stpe/stpeprintf.c
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/stpe/stpeprintf.h>
+#include <c/str/cpy/stp/stpe/stpeprintf.h>
 
 #include <stdarg.h>
 
-#include <c/stp/_compiler.h>
+#include <c/str/cpy/stp/_compiler.h>
 
 
 #pragma clang assume_nonnull begin
diff --git a/src/c/stp/ustp/ustpcpy.c b/src/c/str/cpy/stp/ustp/ustpcpy.c
index 22e8768..a838769 100644
--- a/src/c/stp/ustp/ustpcpy.c
+++ b/src/c/str/cpy/stp/ustp/ustpcpy.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/ustp/ustpcpy.h>
+#include <c/str/cpy/stp/ustp/ustpcpy.h>
 
 #include <stddef.h>
 
diff --git a/src/c/stp/ustp/zustr2ustp.c b/src/c/str/cpy/stp/ustp/zustr2ustp.c
index 4ba3b57..932af12 100644
--- a/src/c/stp/ustp/zustr2ustp.c
+++ b/src/c/str/cpy/stp/ustp/zustr2ustp.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier:  LGPL-3.0-or-later WITH LGPL-3.0-linking-exception
 
 
-#include <c/stp/ustp/zustr2ustp.h>
+#include <c/str/cpy/stp/ustp/zustr2ustp.h>
 
 #include <stddef.h>