Spawn.vala

[gitlive] / Spawn.vala

diff --git a/Spawn.vala b/Spawn.vala
index 8602c66..8b081b4 100644 (file)
--- a/Spawn.vala
+++ b/Spawn.vala
@@ -230,7 +230,7 @@ public class Spawn : Object
         ChildWatch.add (this.pid, (w_pid, result) => {
            
             this.result = result;
-            if (this.debug) {
+            if (this.cfg.debug) {
                 stdout.printf("child_watch_add : result:%d ", result);
             }
            
@@ -378,8 +378,8 @@ public class Spawn : Object
         
         //print("write_char retunred:" + JSON.stringify(res) +  ' ' +JSON.stringify(ret)  );
         
-            if (res != GLib.IOStatus.NORMAL) {
-                throw "Write failed";
+        if (res != GLib.IOStatus.NORMAL) {
+            throw "Write failed";
         }
         //return ret.value;
         return str.length;
@@ -396,13 +396,13 @@ public class Spawn : Object
         string prop = (ch == this.out_ch) ? "output" : "stderr";
        // print("prop: " + prop);
         var _this = this;
-        
+        string str_return;
        
         //print(JSON.stringify(ch, null,4));
         while (true) {
  
-            var x =   {};
-            var status = ch.read_line( x);
+           
+            var status = ch.read_line( str_return, len, term_pos );
             // print('status: '  +JSON.stringify(status));
             // print(JSON.stringify(x));
              switch(status) {