X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexternaltask.h;h=00465f3af4f3ba501952f1a7bf29ce149d04865a;hb=4b075b4a7ed921be62740c302edeebcd8b06ca29;hp=8127c75762459f9a4c73f1c532412a7567c45281;hpb=0368a9c1972ff5fd6cd8984901ff0bdbd86afc9f;p=builder.git

diff --git a/source/externaltask.h b/source/externaltask.h
index 8127c75..00465f3 100644
--- a/source/externaltask.h
+++ b/source/externaltask.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include <msp/core/process.h>
 #include <msp/fs/path.h>
 #include <msp/io/pipe.h>
 #include "task.h"
@@ -15,22 +16,25 @@ be captured.
 class ExternalTask: public Task
 {
 public:
-	enum Destination
+	enum StreamAction
 	{
-		PASSTHROUGH,
-		CAPTURE,
-		IGNORE
+		PASSTHROUGH,  //< Do not touch the stream
+		CAPTURE,      //< Capture the stream
+		REDIRECT,     //< Redirect the stream to/from a file
+		IGNORE        //< Redirect the stream to oblivion
 	};
 
-	typedef std::vector<std::string> Arguments;
+	typedef Msp::Process::Arguments Arguments;
 
 private:
 	Arguments argv;
 	Msp::FS::Path work_dir;
-	int pid;
+	Msp::Process *process;
 	int exit_code;
-	Destination stdout_dest;
-	Destination stderr_dest;
+	Msp::FS::Path stdin_file;
+	StreamAction stdout_action;
+	Msp::FS::Path stdout_file;
+	StreamAction stderr_action;
 	Msp::IO::Pipe *capture_pipe;
 	std::string output;
 
@@ -45,10 +49,30 @@ public:
 	virtual std::string get_command() const;
 	virtual void start();
 	virtual Status check();
+	virtual Status wait();
+private:
+	Status do_wait(bool);
+
+public:
+	/// Redirect stdin from a file.  Has no effect after the task is started.
+	void set_stdin(const Msp::FS::Path &);
+
+	/// Sets destination for stdout.  Has no effect after the task is started.
+	void set_stdout(StreamAction);
 
-	void set_stdout(Destination);
-	void set_stderr(Destination);
+	/// Redirect stdout to a file.  Has no effect after the task is started.
+	void set_stdout(const Msp::FS::Path &);
+
+	/// Sets destination for stderr.  Has no effect after the task is started.
+	void set_stderr(StreamAction);
+
+	/** Returns captured output, if any.  This may be called while the task is
+	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());
 };
 
 #endif