From e4548a8cf46b20b8e89ab75ee9201e3b244484ba Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 15 Dec 2016 18:19:22 -0800
Subject: Add Files::read_all_lines() and Files::write_all_lines()

---
 toolsrc/src/vcpkg_Files.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 698579736..889ceb055 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -42,6 +42,35 @@ namespace vcpkg {namespace Files
         return std::move(output);
     }
 
+    expected<std::vector<std::string>> read_all_lines(const fs::path& file_path)
+    {
+        std::fstream file_stream(file_path, std::ios_base::in | std::ios_base::binary);
+        if (file_stream.fail())
+        {
+            return std::errc::no_such_file_or_directory;
+        }
+
+        std::vector<std::string> output;
+        std::string line;
+        while (std::getline(file_stream, line))
+        {
+            output.push_back(line);
+        }
+        file_stream.close();
+
+        return std::move(output);
+    }
+
+    void write_all_lines(const fs::path& file_path, const std::vector<std::string>& lines)
+    {
+        std::fstream output(file_path, std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
+        for (const std::string& line : lines)
+        {
+            output << line << "\n";
+        }
+        output.close();
+    }
+
     fs::path find_file_recursively_up(const fs::path& starting_dir, const std::string& filename)
     {
         fs::path current_dir = starting_dir;
-- 
cgit v1.2.3


From fdec39f452df368a0dd9184cd556607857605832 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Dec 2016 19:37:11 -0800
Subject: Use check_exit() instead of check_throw()

---
 toolsrc/src/vcpkg_Files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 889ceb055..853a57d16 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -9,7 +9,7 @@ namespace vcpkg {namespace Files
 
     void check_is_directory(const fs::path& dirpath)
     {
-        Checks::check_throw(fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string());
+        Checks::check_exit(fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string());
     }
 
     bool has_invalid_chars_for_filesystem(const std::string s)
-- 
cgit v1.2.3


From b666e90c32e58a673331b303e64e299cc1168aa2 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Dec 2016 19:38:02 -0800
Subject: Pass by ref

---
 toolsrc/src/vcpkg_Files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 853a57d16..9e7002a37 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -12,7 +12,7 @@ namespace vcpkg {namespace Files
         Checks::check_exit(fs::is_directory(dirpath), "The path %s is not a directory", dirpath.string());
     }
 
-    bool has_invalid_chars_for_filesystem(const std::string s)
+    bool has_invalid_chars_for_filesystem(const std::string& s)
     {
         return std::regex_search(s, FILESYSTEM_INVALID_CHARACTERS_REGEX);
     }
-- 
cgit v1.2.3


From aad0cc4c042aad87b2b52eded0e465ed01e799c1 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Dec 2016 19:40:58 -0800
Subject: Files::get_contents() -> Files::read_contents()

---
 toolsrc/src/vcpkg_Files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/src/vcpkg_Files.cpp')

diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 9e7002a37..48283e43f 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -17,7 +17,7 @@ namespace vcpkg {namespace Files
         return std::regex_search(s, FILESYSTEM_INVALID_CHARACTERS_REGEX);
     }
 
-    expected<std::string> get_contents(const fs::path& file_path) noexcept
+    expected<std::string> read_contents(const fs::path& file_path) noexcept
     {
         std::fstream file_stream(file_path, std::ios_base::in | std::ios_base::binary);
         if (file_stream.fail())
-- 
cgit v1.2.3