From 969fdf76ace84f6632c79c73be0a13e7f8c9b0a9 Mon Sep 17 00:00:00 2001
From: Manuel Coenen <manuel.coenen@gmail.com>
Date: Fri, 13 Dec 2019 21:56:17 +0100
Subject: [PATCH] Fix too many arguments

---
 executor.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/executor.go b/executor.go
index c113f4b..819ac2e 100644
--- a/executor.go
+++ b/executor.go
@@ -1,6 +1,7 @@
 package execonmcode
 
 import (
+	"fmt"
 	"log"
 	"os/exec"
 	"strings"
@@ -24,9 +25,14 @@ type Executor struct {
 
 func NewExecutor(socketPath, command string, mCode int64) *Executor {
 	s := strings.Split(command, " ")
-	a := []string{}
+	a := make([]string, 0)
 	if len(s) > 1 {
-		a = s[1:]
+		for _, p := range s[1:] {
+			pp := strings.TrimSpace(p)
+			if pp != "" {
+				a = append(a, p)
+			}
+		}
 	}
 	c := s[0]
 	return &Executor{
@@ -54,9 +60,9 @@ func (e *Executor) Run() {
 		}
 		if c.Type == types.MCode && c.MajorNumber != nil && *c.MajorNumber == e.mCode {
 			cmd := exec.Command(e.command, e.getArgs(c)...)
-			err := cmd.Run()
+			output, err := cmd.CombinedOutput()
 			if err != nil {
-				err = ic.ResolveCode(types.Error, err.Error())
+				err = ic.ResolveCode(types.Error, fmt.Sprintf("%s: %s", err.Error(), string(output)))
 			} else {
 				err = ic.ResolveCode(types.Success, "")
 			}
@@ -70,7 +76,7 @@ func (e *Executor) Run() {
 }
 
 func (e *Executor) getArgs(c *commands.Code) []string {
-	args := make([]string, len(e.args))
+	args := make([]string, 0)
 	for _, v := range e.args {
 		if strings.HasPrefix(v, variablePrefix) {
 			vl := strings.TrimSpace(strings.ToUpper(strings.TrimLeft(v, variablePrefix)))