Merge pull request #17 from serkanalgur/development

Working

Author: serkanalgur

exec.go

@@ -2,41 +2,50 @@ package phpfuncs
 
 import (
 	"bytes"
-	"fmt"
 	"log"
 	"os"
 	"os/exec"
+	"regexp"
+	"strings"
 )
 
+var rPatt *regexp.Regexp
+
+
+func init() {
+	rPatt = regexp.MustCompile(`[^\w@%+=:,./-]`)
+}
+
 // Exec - Start a command on system
 //
 // Original : https://www.php.net/manual/tr/function.exec.php
 //
 // exec() executes the given command.
-func Exec(of string) {
+func Exec(of string) string {
 	var out bytes.Buffer
 	cmd := exec.Command(of)
 	cmd.Stdout = &out
 	err := cmd.Run()
 	if err != nil {
 		log.Fatal(err)
 	}
+	return out.String()
 }
 
 // ShellExec - Execute command via shell and return the complete output as a string
 //
 // Original : https://www.php.net/manual/en/function.shell-exec.php
 //
 // This function is identical to the backtick operator.
-func ShellExec(of string) {
+func ShellExec(of string) string {
 	var out bytes.Buffer
 	cmd := exec.Command(of)
 	cmd.Stdout = &out
 	err := cmd.Run()
 	if err != nil {
 		log.Fatal(err)
 	}
-	fmt.Printf("%q\n", out.String())
+	return out.String()
 }
 
 // Exit - Output a message and terminate the current script
@@ -56,3 +65,33 @@ func Exit(of int) {
 func Die(of int) {
 	os.Exit(of)
 }
+
+// Escapeshellarg - Escape a string to be used as a shell argument
+//
+// Original: https://www.php.net/manual/en/function.escapeshellarg.php
+//
+func Escapeshellarg(s string) string {
+	if len(s) == 0 {return "''"}
+
+	if rPatt.MatchString(s) {
+		return "'" + strings.ReplaceAll(s, "'", "'\"'\"'") + "'"
+	}
+
+	return s
+}
+
+// Escapeshellcmd - Escape shell metacharacters
+//
+// Original: https://www.php.net/manual/en/function.escapeshellcmd.php
+//
+func Escapeshellcmd(s string) string {
+	cmds := Explode(s, " ") // I know thats maybe not proper way...
+
+	z := make([]string, len(cmds))
+
+		for i ,s := range cmds {
+			z[i] = Escapeshellarg(s)
+		}
+
+		return Join(" ",z)
+}

tests/Encryption/Base64Decode/Base64Decode_test.go

@@ -6,10 +6,15 @@ import (
 	"github.com/serkanalgur/phpfuncs"
 )
 
+func CoverCheck(t *testing.T, s, exp string) {
+	if s != exp {
+		t.Errorf("%q (expected: %q)", s, exp)
+	}
+}
+
 // TestBase64Decode - Test for Encryption
 func TestBase64Decode(t *testing.T) {
 	want := "Hello World"
-	if got, _ := phpfuncs.Base64Decode("SGVsbG8gV29ybGQ="); got != want {
-		t.Errorf("Base64Decode() = %v, want %v", got, want)
-	}
+	g, _ := phpfuncs.Base64Decode("SGVsbG8gV29ybGQ=")
+	CoverCheck(t, g, want)
 }

tests/Encryption/Base64Encode/Base64Encode_test.go

@@ -6,10 +6,14 @@ import (
 	"github.com/serkanalgur/phpfuncs"
 )
 
+func CoverCheck(t *testing.T, s, exp string) {
+	if s != exp {
+		t.Errorf("%q (expected: %q)", s, exp)
+	}
+}
+
 // TestBase64Encode - Test for Encryption
 func TestBase64Encode(t *testing.T) {
 	want := "SGVsbG8gV29ybGQ="
-	if got := phpfuncs.Base64Encode("Hello World"); got != want {
-		t.Errorf("Base64Encode() = %v, want %v", got, want)
-	}
+	CoverCheck(t,phpfuncs.Base64Encode("Hello World"),want)
 }

tests/Encryption/MD5/MD5_test.go

@@ -6,10 +6,15 @@ import (
 	"github.com/serkanalgur/phpfuncs"
 )
 
+func CoverCheck(t *testing.T, s, exp string) {
+	if s != exp {
+		t.Errorf("%q (expected: %q)", s, exp)
+	}
+}
+
+
 // TestMD5 - Test for Encryption
 func TestMD5(t *testing.T) {
 	want := "b10a8db164e0754105b7a99be72e3fe5"
-	if got := phpfuncs.MD5("Hello World"); got != want {
-		t.Errorf("MD5() = %v, want %v", got, want)
-	}
+	CoverCheck(t,phpfuncs.MD5("Hello World"),want)
 }

tests/arrays/InArray_test.go

@@ -11,19 +11,21 @@ const TestWords = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed
 
 const needle = "est"
 
+func CoverCheck(t *testing.T, s, exp bool) {
+	if s != exp {
+		t.Errorf("%v (expected: %v)", s, exp)
+	}
+}
+
 func TestInArrayString(t *testing.T) {
 	want := true
 	stack := strings.Split(TestWords, " ")
-	if got := phpfuncs.InArray(needle, stack); got != want {
-		t.Errorf("inArray() = %v, want %v", got, want)
-	}
+	CoverCheck(t,phpfuncs.InArray(needle, stack),want)
 }
 
 func TestInArrrayInt(t *testing.T) {
 	want := true
 	var needle = 2
 	stack := [10]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 0}
-	if got := phpfuncs.InArray(needle, stack); got != want {
-		t.Errorf("inArray() = %v, want %v", got, want)
-	}
+	CoverCheck(t,phpfuncs.InArray(needle, stack),want)
 }