[libc] Move implementations of strcat and strcpy to the string directory.

[sivachandra]

Summary

Now that tests live in separate top-level directory, keeping the
implementations of individual functions in a directory of their own is
not meaningful. Hence, this change moves them into the higher level
string directory.

NFC intended.

libc/src/string/CMakeLists.txt

-add_subdirectory(strcpy)
-add_subdirectory(strcat)
+add_entrypoint_object(
+  strcat
+  SRCS
+    strcat.cpp
+  HDRS
+    strcat.h
+  DEPENDS
+    strcpy
+    string_h
+)
+
+add_entrypoint_object(
+  strcpy
+  SRCS
+    strcpy.cpp
+  HDRS
+    strcpy.h
+  DEPENDS
+    string_h
+)

libc/src/string/strcat.h

 //===----------------- Implementation header for strcat -------------------===//
 //
 // 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_STRCAT_H
 #define LLVM_LIBC_SRC_STRING_STRCAT_H
 
 #include <string.h>
 
 namespace __llvm_libc {
 
 char *strcat(char *dest, const char *src);
 
 } // namespace __llvm_libc
 
 #endif // LLVM_LIBC_SRC_STRING_STRCAT_H

libc/src/string/strcat.cpp

 //===-------------------- Implementation of strcat -----------------------===//
 //
 // 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/strcat/strcat.h"
+#include "src/string/strcat.h"
 
 #include "src/__support/common.h"
-#include "src/string/strcpy/strcpy.h"
+#include "src/string/strcpy.h"
 
 namespace __llvm_libc {
 
 char *LLVM_LIBC_ENTRYPOINT(strcat)(char *dest, const char *src) {
   // We do not yet have an implementaion of strlen in so we will use strlen
   // from another libc.
   __llvm_libc::strcpy(dest + ::strlen(dest), src);
   return dest;
 }
 
 } // namespace __llvm_libc

libc/src/string/strcat/CMakeLists.txt

-add_entrypoint_object(
-  strcat
-  SRCS
-    strcat.cpp
-  HDRS
-    strcat.h
-  DEPENDS
-    strcpy
-    string_h
-)

libc/src/string/strcpy.h

 //===----------------- Implementation header for strcpy -------------------===//
 //
 // 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_STRCPY_H
 #define LLVM_LIBC_SRC_STRING_STRCPY_H
 
 #include <string.h>
 
 namespace __llvm_libc {
 
 char *strcpy(char *dest, const char *src);
 
 } // namespace __llvm_libc
 
 #endif // LLVM_LIBC_SRC_STRING_STRCPY_H

libc/src/string/strcpy.cpp

 //===-------------------- Implementation of strcpy -----------------------===//
 //
 // 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/strcpy/strcpy.h"
+#include "src/string/strcpy.h"
 
 #include "src/__support/common.h"
 
 namespace __llvm_libc {
 
 char *LLVM_LIBC_ENTRYPOINT(strcpy)(char *dest, const char *src) {
   return reinterpret_cast<char *>(::memcpy(dest, src, ::strlen(src) + 1));
 }
 
 } // namespace __llvm_libc

libc/src/string/strcpy/CMakeLists.txt

-add_entrypoint_object(
-  strcpy
-  SRCS
-    strcpy.cpp
-  HDRS
-    strcpy.h
-  DEPENDS
-    string_h
-)

libc/test/src/string/strcat_test.cpp

 //===---------------------- Unittests for strcat --------------------------===//
 //
 // 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 <string>
 
-#include "src/string/strcat/strcat.h"
+#include "src/string/strcat.h"
 #include "gtest/gtest.h"
 
 TEST(StrCatTest, EmptyDest) {
   std::string abc = "abc";
   char dest[4];
 
   dest[0] = '\0';
 

libc/test/src/string/strcpy_test.cpp

 //===----------------------- Unittests for strcpy -------------------------===//
 //
 // 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 <string>
 
-#include "src/string/strcpy/strcpy.h"
+#include "src/string/strcpy.h"
 #include "gtest/gtest.h"
 
 TEST(StrCpyTest, EmptyDest) {
   std::string abc = "abc";
   char dest[4];
 
   char *result = __llvm_libc::strcpy(dest, abc.c_str());
   ASSERT_EQ(dest, result);