From 6c528220aaf62f4ba5890483797d6661352500bb Mon Sep 17 00:00:00 2001
From: Tom N Harris <tnharris@whoopdedo.org>
Date: Tue, 16 Nov 2010 17:58:28 -0500
Subject: Repurpose io_runcmd for pipes

---
 inc/io.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'inc/io.php')

diff --git a/inc/io.php b/inc/io.php
index 1d69dabc9..9b797ebf2 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -533,17 +533,20 @@ function io_rename($from,$to){
  *
  * @author Harry Brueckner <harry_b@eml.cc>
  * @author Andreas Gohr <andi@splitbrain.org>
- * @deprecated
  */
-function io_runcmd($cmd){
-    $fh = popen($cmd, "r");
-    if(!$fh) return false;
-    $ret = '';
-    while (!feof($fh)) {
-        $ret .= fread($fh, 8192);
-    }
-    pclose($fh);
-    return $ret;
+function io_runcmd($cmd, $input, &$output){
+    $descspec = array(
+            0=>array("pipe","r"),
+            1=>array("pipe","w"),
+            2=>array("pipe","w"));
+    $ph = proc_open($cmd, $descspec, $pipes);
+    if(!$ph) return -1;
+    fclose($pipes[2]); // ignore stderr
+    fwrite($pipes[0], $input);
+    fclose($pipes[0]);
+    $output = stream_get_contents($pipes[1]);
+    fclose($pipes[1]);
+    return proc_close($ph);
 }
 
 /**
-- 
cgit v1.2.3


From 420edfd639fb3d0a0f6a2504ecb2f8f6b68be1f7 Mon Sep 17 00:00:00 2001
From: Tom N Harris <tnharris@whoopdedo.org>
Date: Thu, 18 Nov 2010 13:55:55 -0500
Subject: Restore io_runcmd, use io_exec for exec with pipes

---
 inc/io.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'inc/io.php')

diff --git a/inc/io.php b/inc/io.php
index 9b797ebf2..a0be00da3 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -529,12 +529,30 @@ function io_rename($from,$to){
 
 
 /**
- * Runs an external command and returns it's output as string
+ * Runs an external command and returns its output as string
  *
  * @author Harry Brueckner <harry_b@eml.cc>
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @deprecated
  */
-function io_runcmd($cmd, $input, &$output){
+function io_runcmd($cmd){
+    $fh = popen($cmd, "r");
+    if(!$fh) return false;
+    $ret = '';
+    while (!feof($fh)) {
+        $ret .= fread($fh, 8192);
+    }
+    pclose($fh);
+    return $ret;
+}
+
+/**
+ * Runs an external command with input and output pipes.
+ * Returns the exit code from the process.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function io_exec($cmd, $input, &$output){
     $descspec = array(
             0=>array("pipe","r"),
             1=>array("pipe","w"),
-- 
cgit v1.2.3


From 5b72404c10cb148753118be9ff987ab339b2db06 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 8 Dec 2010 23:12:25 +0100
Subject: fixed indent

---
 inc/io.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/io.php')

diff --git a/inc/io.php b/inc/io.php
index 1d69dabc9..559f3febc 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -486,7 +486,7 @@ function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=20
                     preg_match('/attachment;\s*filename\s*=\s*"([^"]*)"/i', $content_disposition, $match)) {
 
                 $name = basename($match[1]);
-        }
+            }
 
         }
 
-- 
cgit v1.2.3