diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-07 17:56:40 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-07 17:56:40 -0800 |
| commit | 1a1507a6039ce44220447d2b1ab723d631515b07 (patch) | |
| tree | 1533573b7e7da1f442a37222a7d27262bcf9620f | |
| parent | d799762ea7a8e6790d06bfc64297f9896e12c3b4 (diff) | |
| download | vcpkg-1a1507a6039ce44220447d2b1ab723d631515b07.tar.gz vcpkg-1a1507a6039ce44220447d2b1ab723d631515b07.zip | |
Move search_file() to commands_own.cpp
| -rw-r--r-- | toolsrc/include/vcpkg.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_owns.cpp | 26 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 25 |
3 files changed, 26 insertions, 27 deletions
diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h index 3a8160c71..0797f7f74 100644 --- a/toolsrc/include/vcpkg.h +++ b/toolsrc/include/vcpkg.h @@ -17,6 +17,4 @@ namespace vcpkg void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs& status_db); void deinstall_package(const vcpkg_paths& paths, const package_spec& spec, StatusParagraphs& status_db); - - void search_file(const vcpkg_paths& paths, const std::string& file_substr, const StatusParagraphs& status_db); } // namespace vcpkg diff --git a/toolsrc/src/commands_owns.cpp b/toolsrc/src/commands_owns.cpp index b3dab2e44..e5599ce01 100644 --- a/toolsrc/src/commands_owns.cpp +++ b/toolsrc/src/commands_owns.cpp @@ -1,9 +1,35 @@ #include "vcpkg_Commands.h" #include "vcpkg_System.h" #include "vcpkg.h" +#include <fstream> namespace vcpkg { + static void search_file(const vcpkg_paths& paths, const std::string& file_substr, const StatusParagraphs& status_db) + { + std::string line; + + for (auto&& pgh : status_db) + { + if (pgh->state != install_state_t::installed) + continue; + + std::fstream listfile(paths.listfile_path(pgh->package)); + while (std::getline(listfile, line)) + { + if (line.empty()) + { + continue; + } + + if (line.find(file_substr) != std::string::npos) + { + System::println("%s: %s", pgh->package.displayname(), line); + } + } + } + } + void owns_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths) { static const std::string example = Strings::format("The argument should be a pattern to search for. %s", create_example_string("owns zlib.dll")); diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 729a0c8d5..00aea1e2e 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -369,28 +369,3 @@ void vcpkg::deinstall_package(const vcpkg_paths& paths, const package_spec& spec write_update(paths, pkg); System::println(System::color::success, "Package %s was successfully removed", pkg.package.displayname()); } - -void vcpkg::search_file(const vcpkg_paths& paths, const std::string& file_substr, const StatusParagraphs& status_db) -{ - std::string line; - - for (auto&& pgh : status_db) - { - if (pgh->state != install_state_t::installed) - continue; - - std::fstream listfile(paths.listfile_path(pgh->package)); - while (std::getline(listfile, line)) - { - if (line.empty()) - { - continue; - } - - if (line.find(file_substr) != std::string::npos) - { - System::println("%s: %s", pgh->package.displayname(), line); - } - } - } -} |
