From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 27 Mar 2015 16:15:23 +0000 (+0300)
Subject: Simplify external command call
X-Git-Tag: 2.3^2~15
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e50fee06ab1404eb4e5bf7d336abca6d69ccc4b3;p=govpn.git

Simplify external command call

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---

diff --git a/common.go b/common.go
index 545274f..4d8442e 100644
--- a/common.go
+++ b/common.go
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package govpn
 
 import (
-	"bytes"
 	"encoding/hex"
 	"io/ioutil"
 	"log"
@@ -45,15 +44,11 @@ func ScriptCall(path, ifaceName string) ([]byte, error) {
 	if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
 		return nil, err
 	}
-	cmd := exec.Command(path, ifaceName)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	result := out.Bytes()
+	out, err := exec.Command(path, ifaceName).CombinedOutput()
 	if err != nil {
-		log.Println("Script error", path, err, string(result))
+		log.Println("Script error", path, err, string(out))
 	}
-	return result, err
+	return out, err
 }
 
 // Read authentication key from the file.