From 188f72ab20d9523d6ffde8ad8361ecf17bb75946 Mon Sep 17 00:00:00 2001
From: Siva Chandra Reddy <sivachandra@google.com>
Date: Mon, 6 Jan 2020 10:38:45 -0800
Subject: [PATCH] [libc] Move implementations of strcat and strcpy to the
 string directory.

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.

Reviewers: MaskRay

Subscribers: mgorny, tschuett, libc-commits

Tags: #libc-project

Differential Revision: https://reviews.llvm.org/D72295
---
 libc/src/string/CMakeLists.txt          | 22 ++++++++++++++++++++--
 libc/src/string/{strcat => }/strcat.cpp |  4 ++--
 libc/src/string/{strcat => }/strcat.h   |  0
 libc/src/string/strcat/CMakeLists.txt   | 10 ----------
 libc/src/string/{strcpy => }/strcpy.cpp |  2 +-
 libc/src/string/{strcpy => }/strcpy.h   |  0
 libc/src/string/strcpy/CMakeLists.txt   |  9 ---------
 libc/test/src/string/strcat_test.cpp    |  2 +-
 libc/test/src/string/strcpy_test.cpp    |  2 +-
 9 files changed, 25 insertions(+), 26 deletions(-)
 rename libc/src/string/{strcat => }/strcat.cpp (90%)
 rename libc/src/string/{strcat => }/strcat.h (100%)
 delete mode 100644 libc/src/string/strcat/CMakeLists.txt
 rename libc/src/string/{strcpy => }/strcpy.cpp (94%)
 rename libc/src/string/{strcpy => }/strcpy.h (100%)
 delete mode 100644 libc/src/string/strcpy/CMakeLists.txt

diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt
index 459d948..b53da21 100644
--- a/libc/src/string/CMakeLists.txt
+++ b/libc/src/string/CMakeLists.txt
@@ -1,2 +1,20 @@
-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
+)
diff --git a/libc/src/string/strcat/strcat.cpp b/libc/src/string/strcat.cpp
similarity index 90%
rename from libc/src/string/strcat/strcat.cpp
rename to libc/src/string/strcat.cpp
index 09cc62d..366b185 100644
--- a/libc/src/string/strcat/strcat.cpp
+++ b/libc/src/string/strcat.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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 {
 
diff --git a/libc/src/string/strcat/strcat.h b/libc/src/string/strcat.h
similarity index 100%
rename from libc/src/string/strcat/strcat.h
rename to libc/src/string/strcat.h
diff --git a/libc/src/string/strcat/CMakeLists.txt b/libc/src/string/strcat/CMakeLists.txt
deleted file mode 100644
index e37e426..0000000
--- a/libc/src/string/strcat/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_entrypoint_object(
-  strcat
-  SRCS
-    strcat.cpp
-  HDRS
-    strcat.h
-  DEPENDS
-    strcpy
-    string_h
-)
diff --git a/libc/src/string/strcpy/strcpy.cpp b/libc/src/string/strcpy.cpp
similarity index 94%
rename from libc/src/string/strcpy/strcpy.cpp
rename to libc/src/string/strcpy.cpp
index 0dfb1e3..22fe4cc 100644
--- a/libc/src/string/strcpy/strcpy.cpp
+++ b/libc/src/string/strcpy.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/string/strcpy/strcpy.h"
+#include "src/string/strcpy.h"
 
 #include "src/__support/common.h"
 
diff --git a/libc/src/string/strcpy/strcpy.h b/libc/src/string/strcpy.h
similarity index 100%
rename from libc/src/string/strcpy/strcpy.h
rename to libc/src/string/strcpy.h
diff --git a/libc/src/string/strcpy/CMakeLists.txt b/libc/src/string/strcpy/CMakeLists.txt
deleted file mode 100644
index 411333a..0000000
--- a/libc/src/string/strcpy/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-add_entrypoint_object(
-  strcpy
-  SRCS
-    strcpy.cpp
-  HDRS
-    strcpy.h
-  DEPENDS
-    string_h
-)
diff --git a/libc/test/src/string/strcat_test.cpp b/libc/test/src/string/strcat_test.cpp
index 3b8a7a7..fde432b 100644
--- a/libc/test/src/string/strcat_test.cpp
+++ b/libc/test/src/string/strcat_test.cpp
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "src/string/strcat/strcat.h"
+#include "src/string/strcat.h"
 #include "gtest/gtest.h"
 
 TEST(StrCatTest, EmptyDest) {
diff --git a/libc/test/src/string/strcpy_test.cpp b/libc/test/src/string/strcpy_test.cpp
index e68ea51..56f75ac 100644
--- a/libc/test/src/string/strcpy_test.cpp
+++ b/libc/test/src/string/strcpy_test.cpp
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "src/string/strcpy/strcpy.h"
+#include "src/string/strcpy.h"
 #include "gtest/gtest.h"
 
 TEST(StrCpyTest, EmptyDest) {
-- 
2.7.4