Fix windows paths being escaped incorrectly

zlepper · Aug 16, 2017 · c14a7aa · c14a7aa
1 parent b8ef9a4
commit c14a7aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/process-manager.go b/process-manager.go
@@ -47,7 +47,7 @@ func Tokenize(s string) (tokens []string) {
 	hasQuote := false
 	// True if the next char should be treated as a literal
 	escapeNext := false
-	for _, char := range s {
+	for index, char := range s {
 		if escapeNext {
 			token += string(char)
 			escapeNext = false
@@ -65,8 +65,13 @@ func Tokenize(s string) (tokens []string) {
 		}
 
 		if char == '\\' {
-			escapeNext = true
-			continue
+			if index+1 < len(s) {
+				nextChar := s[index+1]
+				if nextChar == ' ' || nextChar == '"' {
+					escapeNext = true
+					continue
+				}
+			}
 		}
 
 		if char == ' ' {

diff --git a/process-manager_test.go b/process-manager_test.go
@@ -6,8 +6,8 @@ import (
 )
 
 func TestTokenize(t *testing.T) {
-	s := `gfs --config=/foo/var --serve=\"/bar\ baz/foo\" -d /var\ foo "var foo"`
-	expected := []string{`gfs`, `--config=/foo/var`, `--serve="/bar baz/foo"`, "-d", "/var foo", "var foo"}
+	s := `gfs --config=/foo/var --serve=\"/bar\ baz/foo\" -d /var\ foo "var foo" C:\this\is\test`
+	expected := []string{`gfs`, `--config=/foo/var`, `--serve="/bar baz/foo"`, "-d", "/var foo", "var foo", `C:\this\is\test`}
 
 	actual := Tokenize(s)