Spawn.vala

[gitlive] / Spawn.vala

diff --git a/Spawn.vala b/Spawn.vala
index 4009fac..8b081b4 100644 (file)
--- a/Spawn.vala
+++ b/Spawn.vala
@@ -1,4 +1,6 @@
 
+
+using GLib;
 // compile valac 
 
 /// # valac  --pkg gio-2.0  --pkg posix Spawn.vala -o /tmp/Spawn
@@ -9,7 +11,7 @@
 static int main (string[] args) {
     // A reference to our file
     
-    var cfg = new SpawnConfig(null, { "ls" } , "");
+    var cfg = new SpawnConfig("", { "ls" } , { "" });
     var spawn = new Spawn(cfg);
     
     
@@ -40,9 +42,9 @@ static int main (string[] args) {
 *
 *
 */
-delegate void SpawnOutput(string line);
-delegate void SpawnErr(string line);
-delegate string SpawnInput();
+public delegate void SpawnOutput(string line);
+public delegate void SpawnErr(string line);
+public delegate string SpawnInput();
 
  
 
@@ -98,6 +100,10 @@ public class  SpawnConfig {
     
 }
 
+errordomain SpawnError {
+    NO_ARGS
+}
+
 /**
  * @class Spawn
  * @param cfg {SpawnConfig} settings - see properties.
@@ -119,7 +125,7 @@ public class  SpawnConfig {
 public class Spawn : Object
 {
 
-
+    SpawnConfig cfg;
 
     public Spawn(SpawnConfig cfg) throws Error
     {
@@ -128,9 +134,9 @@ public class Spawn : Object
         this.cfg = cfg;
      
     
-        this.cwd =  this.cfg.cwd.length || GLib.get_home_dir();
-        if (!this.cfg.args.length) {
-            throw new Error("No arguments");
+        this.cfg.cwd =  this.cfg.cwd.length  < 1 ? GLib.Environment.get_home_dir() : this.cfg.cwd;
+        if (this.cfg.args.length < 0) {
+            throw new SpawnError.NO_ARGS("No arguments");
         }
         this.run();
     
@@ -195,10 +201,9 @@ public class Spawn : Object
         int standard_error;
 
 
-        var ret = {};
         
         if (this.cfg.debug) {
-            print("cd " + this.cfg.cwd +";" + string.joinv(" ", this.cfg.args));
+           stdout.printf("cd %s; %s" , this.cfg.cwd , string.joinv(" ", this.cfg.args));
         }
         
         Process.spawn_async_with_pipes (
@@ -218,27 +223,28 @@ public class Spawn : Object
        //print(JSON.stringify(gret));    
          
         if (this.cfg.debug) {
-            print("PID: " + this.pid);
+            
+            stdout.printf("PID: %d" ,this.pid);
         }
          
         ChildWatch.add (this.pid, (w_pid, result) => {
            
-           this.result = result;
-            if (_this.debug) {
-                print("child_watch_add : result: " + result);
+            this.result = result;
+            if (this.cfg.debug) {
+                stdout.printf("child_watch_add : result:%d ", result);
             }
-           
+           
             this.read(this.out_ch);
             this.read(this.err_ch);
             
-                       
+            
             Process.close_pid(this.pid);
             this.pid = -1;
             if (this.ctx) {
                 this.ctx.quit();
             }
             this.tidyup();
-           //print("DONE TIDYUP");
+        //print("DONE TIDYUP");
             if (this.cfg.finish) {
                 this.cfg.finish(this.result);
             }
@@ -247,37 +253,37 @@ public class Spawn : Object
                          
         
         
-        this.in_ch = new GLib.IOChannel.unix_new(ret.standard_input);
-        this.out_ch = new GLib.IOChannel.unix_new(ret.standard_output);
-        this.err_ch = new GLib.IOChannel.unix_new(ret.standard_error);
+        this.in_ch = new GLib.IOChannel.unix_new(standard_input);
+        this.out_ch = new GLib.IOChannel.unix_new(standard_output);
+        this.err_ch = new GLib.IOChannel.unix_new(standard_error);
         
         // make everything non-blocking!
         
         
+            
+                  // using NONBLOCKING only works if io_add_watch
+          //returns true/false in right conditions
+          this.in_ch.set_flags (GLib.IOFlags.NONBLOCK);
+          this.out_ch.set_flags (GLib.IOFlags.NONBLOCK);
+          this.err_ch.set_flags (GLib.IOFlags.NONBLOCK);
+                   
       
-                       // using NONBLOCKING only works if io_add_watch
-       //returns true/false in right conditions
-       this.in_ch.set_flags (GLib.IOFlags.NONBLOCK);
-       this.out_ch.set_flags (GLib.IOFlags.NONBLOCK);
-       this.err_ch.set_flags (GLib.IOFlags.NONBLOCK);
-                    
-
-      
-        // add handlers for output and stderr.
-       
-       this.out_src = this.out_ch.add_watch (
-           IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
-           (channel, condition) => {
-              return this.read(_this.out_ch);
-           }
-       );
+            
+            // add handlers for output and stderr.
+        
+        this.out_src = this.out_ch.add_watch (
+            IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
+            (channel, condition) => {
+               return this.read(_this.out_ch);
+            }
+        );
         this.err_src = this.err_ch.add_watch (
            IOCondition.OUT | IOCondition.IN  | IOCondition.PRI |  IOCondition.HUP |  IOCondition.ERR  ,
-           (channel, condition) => {
-              return this.read(_this.err_ch);
-           }
-       );
-          
+            (channel, condition) => {
+               return this.read(_this.err_ch);
+            }
+        );
+              
         
         // call input.. 
         if (this.pid > -1) {
@@ -361,7 +367,7 @@ public class Spawn : Object
      */
     private int write(string str) // write a line to 
     {
-        if (this.in_ch is null) {
+        if (this.in_ch == null) {
             return 0; // input is closed
         }
         //print("write: " + str);
@@ -372,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;
@@ -390,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) {