Windows: Fixed shell constants, marked `os::shell` as deleted. Review: https://reviews.apache.org/r/46393/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fc4f9d25 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fc4f9d25 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fc4f9d25 Branch: refs/heads/master Commit: fc4f9d25f75dc0ca87732c8b0ee868a5713f1d0f Parents: e94ded3 Author: Alex Clemmer <clemmer.alexan...@gmail.com> Authored: Sun May 8 17:00:05 2016 -0400 Committer: Joris Van Remoortere <joris.van.remoort...@gmail.com> Committed: Sun May 8 17:11:34 2016 -0400 ---------------------------------------------------------------------- .../3rdparty/stout/include/stout/os/windows/shell.hpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fc4f9d25/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/shell.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/shell.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/shell.hpp index 18f038f..ea6ae5a 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/shell.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/shell.hpp @@ -30,9 +30,9 @@ namespace Shell { // by the callee, usually the command name and `arg1` is the second // command argument received by the callee. - constexpr const char* name = "sh"; - constexpr const char* arg0 = "sh"; - constexpr const char* arg1 = "-c"; + constexpr const char* name = "cmd.exe"; + constexpr const char* arg0 = "cmd"; + constexpr const char* arg1 = "/c"; } // namespace Shell { @@ -40,10 +40,7 @@ namespace Shell { // of the command. Optionally, the output is returned via an argument. // TODO(vinod): Pass an istream object that can provide input to the command. template <typename... T> -Try<std::string> shell(const std::string& fmt, const T... t) -{ - UNIMPLEMENTED; -} +Try<std::string> shell(const std::string& fmt, const T... t) = delete; // Executes a command by calling "cmd /c <command>", and returns // after the command has been completed. Returns 0 if succeeds, and
