Improve ExternalTask::run_and_capture_output

[builder.git] / source / externaltask.h

diff --git a/source/externaltask.h b/source/externaltask.h
index 00465f3af4f3ba501952f1a7bf29ce149d04865a..26a6acabe569356e630e109289ed8cb8e80e0546 100644 (file)
--- a/source/externaltask.h
+++ b/source/externaltask.h
@@ -31,6 +31,7 @@ private:
        Msp::FS::Path work_dir;
        Msp::Process *process;
        int exit_code;
+       StreamAction stdin_action;
        Msp::FS::Path stdin_file;
        StreamAction stdout_action;
        Msp::FS::Path stdout_file;
@@ -70,9 +71,9 @@ public:
        still running, but it will always return all output. */
        const std::string &get_output() const { return output; }
 
-       /** Executes a command and captures its output.  Stderr is ignored, but if
-       the command exits with a nonzero status, an exception is thrown. */
-       static std::string run_and_capture_output(const Arguments &, const Msp::FS::Path & = Msp::FS::Path());
+       /** Executes a command and captures its output.  If the command exits with
+       a nonzero status, an exception is thrown. */
+       static std::string run_and_capture_output(const Arguments &, const Msp::FS::Path & = Msp::FS::Path(), bool = false);
 };
 
 #endif