if (this.cfg.debug) {
- stdout.printf("cd %s; %s" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
+ stdout.printf("cd %s; %s\n" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
}
Process.spawn_async_with_pipes (
if (this.cfg.debug) {
- stdout.printf("PID: %d" ,this.pid);
+ stdout.printf("PID: %d\n" ,this.pid);
}
this.ref(); // additional ref - cleared on tidyup...
this.result = result;
if (this.cfg.debug) {
- stdout.printf("child_watch_add : result:%d ", result);
+ stdout.printf("child_watch_add : result:%d\n", result);
}
this.read(this.out_ch);
this.out_src = (int) this.out_ch.add_watch (
IOCondition.OUT | IOCondition.IN | IOCondition.PRI | IOCondition.HUP | IOCondition.ERR ,
(channel, condition) => {
-
- return this.out_ch != null ? this.read(this.out_ch) : false;
+ return this.read(channel);
+ //return this.out_ch != null ? this.read(this.out_ch) : true;
}
);
this.err_src = (int) this.err_ch.add_watch (
IOCondition.OUT | IOCondition.IN | IOCondition.PRI | IOCondition.HUP | IOCondition.ERR ,
(channel, condition) => {
- return this.read(this.err_ch);
+ return this.read(channel);
+ //return this.err_ch != null ? this.read(this.err_ch) : true;
}
);
// start mainloop if not async..
if (this.pid > -1) {
- print("starting main loop");
+ //print("starting main loop");
//if (this.cfg.debug) {
//
// }
this.ctx = new MainLoop ();
this.ctx.run(); // wait fore exit?
- print("main_loop done!");
+ //print("main_loop done!");
} else {
this.tidyup(); // tidyup get's called in main loop.
}
+
if (this.cfg.exceptions && this.result != 0) {
-
- throw new SpawnError.EXECUTE_ERROR(this.stderr);
+ var errstr = string.joinv(" ", this.cfg.args) + "\n";
+ errstr += this.output;
+ errstr += this.output.length > 0 ? "\n" : "";
+ errstr += this.stderr;
+ //print("Throwing execute error:%s\n", errstr);
+ throw new SpawnError.EXECUTE_ERROR(errstr);
//this.toString = function() { return this.stderr; };
///throw new Exception this; // we throw self...
}
-
// finally throw, or return self..
-
return;
}
-
-
private void tidyup()
{
- this.unref();
+ //print("Tidyup\n");
if (this.pid > -1) {
Process.close_pid(this.pid); // hopefully kills it..
this.pid = -1;
if (this.out_ch != null) this.out_ch.shutdown(true);
if (this.err_ch != null) this.err_ch.shutdown(true);
} catch (Error e) {
- // error shutting donw.
+ // error shutting down
}
// blank out channels
this.in_ch = null;
//if (this.out_src > -1 ) GLib.source_remove(this.out_src);
this.err_src = -1;
this.out_src = -1;
-
+ this.unref();
}
{
string prop = (ch == this.out_ch) ? "output" : "stderr";
// print("prop: " + prop);
-
+ //print ("spawn.read: %s\n", prop);
//print(JSON.stringify(ch, null,4));
while (true) {
try {
var cond = ch.get_buffer_condition();
- if ((cond & GLib.IOCondition.ERR) > 0) {
- return false;
- }
- if ((cond & GLib.IOCondition.IN) < 1) {
- return false;
- }
+ //if ((cond & GLib.IOCondition.ERR) > 0) {
+ // return false;
+ //}
+ //if ((cond & GLib.IOCondition.IN) < 1) {
+ // return false;
+ //}
status = ch.read_line( out buffer, out len, out term_pos );
} catch (Error e) {
//FIXme
return false;
}
-
+ if (buffer == null) {
+ return false;
+ }
+ //print("got buffer of %s\n", buffer);
// print('status: ' +JSON.stringify(status));
// print(JSON.stringify(x));
switch(status) {
}
//_this[prop] += x.str_return;
//if (this.cfg.debug) {
- stdout.printf("%s : %s", prop , buffer);
+ // stdout.printf("%s : %s", prop , buffer);
//}
if (this.cfg.async) {
if ( Gtk.events_pending()) {
Gtk.main_iteration();
}
-
}
//this.ctx.iteration(true);