[libc-commits] [libc] b118330 - [libc] Add strlcat
Alex Brachet via libc-commits
libc-commits at lists.llvm.org
Thu May 19 14:48:43 PDT 2022
Author: Alex Brachet
Date: 2022-05-19T21:48:39Z
New Revision: b1183305f882f15a368cc33ed9b2f77aedb5b9a6
URL: https://github.com/llvm/llvm-project/commit/b1183305f882f15a368cc33ed9b2f77aedb5b9a6
DIFF: https://github.com/llvm/llvm-project/commit/b1183305f882f15a368cc33ed9b2f77aedb5b9a6.diff
LOG: [libc] Add strlcat
Differential Revision: https://reviews.llvm.org/D125978
Added:
libc/src/string/strlcat.cpp
libc/src/string/strlcat.h
libc/test/src/string/strlcat_test.cpp
Modified:
libc/config/darwin/arm/entrypoints.txt
libc/config/linux/aarch64/entrypoints.txt
libc/config/linux/x86_64/entrypoints.txt
libc/config/windows/entrypoints.txt
libc/spec/bsd_ext.td
libc/src/string/CMakeLists.txt
libc/src/string/string_utils.h
libc/src/string/strlcpy.cpp
libc/test/src/string/CMakeLists.txt
Removed:
################################################################################
diff --git a/libc/config/darwin/arm/entrypoints.txt b/libc/config/darwin/arm/entrypoints.txt
index 568a8fb119dee..a8f882f04cc21 100644
--- a/libc/config/darwin/arm/entrypoints.txt
+++ b/libc/config/darwin/arm/entrypoints.txt
@@ -35,6 +35,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.string.strcmp
libc.src.string.strcpy
libc.src.string.strcspn
+ libc.src.string.strlcat
libc.src.string.strlcpy
libc.src.string.strlen
libc.src.string.strncat
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index 31a596928481b..01b4fac24af78 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -40,6 +40,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.string.strcmp
libc.src.string.strcpy
libc.src.string.strcspn
+ libc.src.string.strlcat
libc.src.string.strlcpy
libc.src.string.strlen
libc.src.string.strncat
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 783dabf9a8f07..a0b7a6b5af225 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -40,6 +40,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.string.strcmp
libc.src.string.strcpy
libc.src.string.strcspn
+ libc.src.string.strlcat
libc.src.string.strlcpy
libc.src.string.strlen
libc.src.string.strncat
diff --git a/libc/config/windows/entrypoints.txt b/libc/config/windows/entrypoints.txt
index 0f5b14a6e3c2b..8d7cf6713c86e 100644
--- a/libc/config/windows/entrypoints.txt
+++ b/libc/config/windows/entrypoints.txt
@@ -35,6 +35,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.string.strcmp
libc.src.string.strcpy
libc.src.string.strcspn
+ libc.src.string.strlcat
libc.src.string.strlcpy
libc.src.string.strlen
libc.src.string.strncat
diff --git a/libc/spec/bsd_ext.td b/libc/spec/bsd_ext.td
index 09832f7168650..577d978ca7264 100644
--- a/libc/spec/bsd_ext.td
+++ b/libc/spec/bsd_ext.td
@@ -5,6 +5,11 @@ def BsdExtensions : StandardSpec<"BSDExtensions"> {
[], // Types
[], // Enumerations
[
+ FunctionSpec<
+ "strlcat",
+ RetValSpec<SizeTType>,
+ [ArgSpec<CharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>]
+ >,
FunctionSpec<
"strlcpy",
RetValSpec<SizeTType>,
diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt
index 20b1b4c95c01b..68962e21c15d1 100644
--- a/libc/src/string/CMakeLists.txt
+++ b/libc/src/string/CMakeLists.txt
@@ -6,6 +6,8 @@ add_header_library(
string_utils.h
DEPENDS
libc.src.__support.CPP.bitset
+ .memory_utils.memcpy_implementation
+ .memory_utils.memset_implementation
)
add_entrypoint_object(
@@ -126,6 +128,17 @@ add_entrypoint_object(
libc.include.stdlib
)
+add_entrypoint_object(
+ strlcat
+ SRCS
+ strlcat.cpp
+ HDRS
+ strlcat.h
+ DEPENDS
+ .string_utils
+ libc.include.string
+)
+
add_entrypoint_object(
strlcpy
SRCS
@@ -133,8 +146,6 @@ add_entrypoint_object(
HDRS
strlcpy.h
DEPENDS
- .memory_utils.memcpy_implementation
- .memory_utils.memset_implementation
.string_utils
libc.include.string
)
diff --git a/libc/src/string/string_utils.h b/libc/src/string/string_utils.h
index 699f65f0a9b19..3d854d3c881fc 100644
--- a/libc/src/string/string_utils.h
+++ b/libc/src/string/string_utils.h
@@ -11,6 +11,8 @@
#include "src/__support/CPP/Bitset.h"
#include "src/__support/common.h"
+#include "src/string/memory_utils/memcpy_implementations.h"
+#include "src/string/memory_utils/memset_implementations.h"
#include <stddef.h> // size_t
namespace __llvm_libc {
@@ -85,6 +87,17 @@ static inline char *string_token(char *__restrict src,
return token;
}
+static inline size_t strlcpy(char *__restrict dst, const char *__restrict src,
+ size_t size) {
+ size_t len = internal::string_length(src);
+ if (!size)
+ return len;
+ size_t n = len < size - 1 ? len : size - 1;
+ inline_memcpy(dst, src, n);
+ inline_memset(dst + n, 0, size - n);
+ return len;
+}
+
} // namespace internal
} // namespace __llvm_libc
diff --git a/libc/src/string/strlcat.cpp b/libc/src/string/strlcat.cpp
new file mode 100644
index 0000000000000..a718de7698838
--- /dev/null
+++ b/libc/src/string/strlcat.cpp
@@ -0,0 +1,27 @@
+//===-- Implementation of strlcat -----------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/string/strlcat.h"
+#include "src/string/string_utils.h"
+
+#include "src/__support/common.h"
+
+namespace __llvm_libc {
+
+LLVM_LIBC_FUNCTION(size_t, strlcat,
+ (char *__restrict dst, const char *__restrict src,
+ size_t size)) {
+ char *new_dst = reinterpret_cast<char *>(internal::find_first_character(
+ reinterpret_cast<unsigned char *>(dst), 0, size));
+ if (!new_dst)
+ return size + internal::string_length(src);
+ size_t first_len = new_dst - dst;
+ return first_len + internal::strlcpy(new_dst, src, size - first_len);
+}
+
+} // namespace __llvm_libc
diff --git a/libc/src/string/strlcat.h b/libc/src/string/strlcat.h
new file mode 100644
index 0000000000000..7b073c6706826
--- /dev/null
+++ b/libc/src/string/strlcat.h
@@ -0,0 +1,20 @@
+//===-- Implementation header for strlcat -----------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_STRING_STRLCAT_H
+#define LLVM_LIBC_SRC_STRING_STRLCAT_H
+
+#include <string.h>
+
+namespace __llvm_libc {
+
+size_t strlcat(char *__restrict dst, const char *__restrict src, size_t size);
+
+} // namespace __llvm_libc
+
+#endif // LLVM_LIBC_SRC_STRING_STRLCAT_H
diff --git a/libc/src/string/strlcpy.cpp b/libc/src/string/strlcpy.cpp
index 3cb3dd151108e..fa1f10290e8ec 100644
--- a/libc/src/string/strlcpy.cpp
+++ b/libc/src/string/strlcpy.cpp
@@ -7,9 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlcpy.h"
-#include "src/string/bzero.h"
-#include "src/string/memory_utils/memcpy_implementations.h"
-#include "src/string/memory_utils/memset_implementations.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
@@ -19,13 +16,7 @@ namespace __llvm_libc {
LLVM_LIBC_FUNCTION(size_t, strlcpy,
(char *__restrict dst, const char *__restrict src,
size_t size)) {
- size_t len = internal::string_length(src);
- if (!size)
- return len;
- size_t n = len < size - 1 ? len : size - 1;
- inline_memcpy(dst, src, n);
- inline_memset(dst + n, 0, size - n);
- return len;
+ return internal::strlcpy(dst, src, size);
}
} // namespace __llvm_libc
diff --git a/libc/test/src/string/CMakeLists.txt b/libc/test/src/string/CMakeLists.txt
index 5bdb47a7e6729..e60f9ab3d3994 100644
--- a/libc/test/src/string/CMakeLists.txt
+++ b/libc/test/src/string/CMakeLists.txt
@@ -123,6 +123,16 @@ add_libc_unittest(
libc.src.string.strdup
)
+add_libc_unittest(
+ strlcat_test
+ SUITE
+ libc_string_unittests
+ SRCS
+ strlcat_test.cpp
+ DEPENDS
+ libc.src.string.strlcat
+)
+
add_libc_unittest(
strlcpy_test
SUITE
diff --git a/libc/test/src/string/strlcat_test.cpp b/libc/test/src/string/strlcat_test.cpp
new file mode 100644
index 0000000000000..66db15e589278
--- /dev/null
+++ b/libc/test/src/string/strlcat_test.cpp
@@ -0,0 +1,37 @@
+//===-- Unittests for strlcat ---------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/string/strlcat.h"
+#include "utils/UnitTest/Test.h"
+#include <stdlib.h>
+
+TEST(LlvmLibcStrlcatTest, TooBig) {
+ const char *str = "cd";
+ char buf[4]{"ab"};
+ EXPECT_EQ(__llvm_libc::strlcat(buf, str, 3), size_t(4));
+ EXPECT_STREQ(buf, "ab");
+ EXPECT_EQ(__llvm_libc::strlcat(buf, str, 4), size_t(4));
+ EXPECT_STREQ(buf, "abc");
+}
+
+TEST(LlvmLibcStrlcatTest, Smaller) {
+ const char *str = "cd";
+ char buf[7]{"ab"};
+
+ EXPECT_EQ(__llvm_libc::strlcat(buf, str, 7), size_t(4));
+ EXPECT_STREQ(buf, "abcd");
+}
+
+TEST(LlvmLibcStrlcatTest, No0) {
+ const char *str = "cd";
+ char buf[7]{"ab"};
+ EXPECT_EQ(__llvm_libc::strlcat(buf, str, 1), size_t(3));
+ EXPECT_STREQ(buf, "ab");
+ EXPECT_EQ(__llvm_libc::strlcat(buf, str, 2), size_t(4));
+ EXPECT_STREQ(buf, "ab");
+}
More information about the libc-commits
mailing list