diff --git a/libc/src/string/allocating_string_utils.h b/libc/src/string/allocating_string_utils.h new file mode 100644 --- /dev/null +++ b/libc/src/string/allocating_string_utils.h @@ -0,0 +1,37 @@ +//===-- Allocating string utils ---------------------------------*- 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 LIBC_SRC_STRING_ALLOCATING_STRING_UTILS_H +#define LIBC_SRC_STRING_ALLOCATING_STRING_UTILS_H + +#include "src/__support/CPP/bitset.h" +#include "src/__support/common.h" +#include "src/string/memory_utils/bzero_implementations.h" +#include "src/string/memory_utils/memcpy_implementations.h" +#include "src/string/string_utils.h" +#include // For size_t +#include // For malloc + +namespace __llvm_libc { +namespace internal { + +inline char *strdup(const char *src) { + if (src == nullptr) + return nullptr; + size_t len = string_length(src) + 1; + char *newstr = reinterpret_cast(::malloc(len)); + if (newstr == nullptr) + return nullptr; + inline_memcpy(newstr, src, len); + return newstr; +} + +} // namespace internal +} // namespace __llvm_libc + +#endif diff --git a/libc/src/string/strdup.cpp b/libc/src/string/strdup.cpp --- a/libc/src/string/strdup.cpp +++ b/libc/src/string/strdup.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "src/string/strdup.h" +#include "src/string/allocating_string_utils.h" #include "src/string/memory_utils/memcpy_implementations.h" -#include "src/string/string_utils.h" #include "src/__support/common.h" diff --git a/libc/src/string/string_utils.h b/libc/src/string/string_utils.h --- a/libc/src/string/string_utils.h +++ b/libc/src/string/string_utils.h @@ -5,6 +5,11 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +// +// Standalone string utility functions. Utilities requiring memory allocations +// should be placed in allocating_string_utils.h intead. +// +//===----------------------------------------------------------------------===// #ifndef LIBC_SRC_STRING_STRING_UTILS_H #define LIBC_SRC_STRING_STRING_UTILS_H @@ -14,7 +19,6 @@ #include "src/string/memory_utils/bzero_implementations.h" #include "src/string/memory_utils/memcpy_implementations.h" #include // For size_t -#include // For malloc and free namespace __llvm_libc { namespace internal { @@ -99,17 +103,6 @@ return len; } -inline char *strdup(const char *src) { - if (src == nullptr) - return nullptr; - size_t len = string_length(src) + 1; - char *newstr = reinterpret_cast(::malloc(len)); - if (newstr == nullptr) - return nullptr; - inline_memcpy(newstr, src, len); - return newstr; -} - } // namespace internal } // namespace __llvm_libc diff --git a/libc/src/unistd/linux/getcwd.cpp b/libc/src/unistd/linux/getcwd.cpp --- a/libc/src/unistd/linux/getcwd.cpp +++ b/libc/src/unistd/linux/getcwd.cpp @@ -10,7 +10,7 @@ #include "src/__support/OSUtil/syscall.h" // For internal syscall function. #include "src/__support/common.h" -#include "src/string/string_utils.h" // For strdup. +#include "src/string/allocating_string_utils.h" // For strdup. #include #include // This is safe to include without any name pollution.