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

diff --git a/source/externaltask.h b/source/externaltask.h
index 8127c75..cb8464b 100644
--- a/source/externaltask.h
+++ b/source/externaltask.h
@@ -17,9 +17,9 @@ class ExternalTask: public Task
 public:
 	enum Destination
 	{
-		PASSTHROUGH,
-		CAPTURE,
-		IGNORE
+		PASSTHROUGH,  //< Do not touch the stream
+		CAPTURE,      //< Capture the stream
+		IGNORE        //< Redirect the stream to oblivion
 	};
 
 	typedef std::vector<std::string> Arguments;
@@ -45,10 +45,24 @@ public:
 	virtual std::string get_command() const;
 	virtual void start();
 	virtual Status check();
+	virtual Status wait();
+private:
+	Status do_wait(bool);
 
+public:
+	/// Sets destination for stdout.  Has no effect after the task is started.
 	void set_stdout(Destination);
+
+	/// Sets destination for stderr.  Has no effect after the task is started.
 	void set_stderr(Destination);
+
+	/** 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