Do wildcard globbing on Windows (#1362)

* Glob wildcards on Windows * test/cases/globbing/0001
johnkerl · Aug 19, 2023 · 9d1d2e0 · 9d1d2e0
1 parent 793f52c
commit 9d1d2e0
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git a/internal/pkg/platform/getargs_windows.go b/internal/pkg/platform/getargs_windows.go
@@ -11,6 +11,7 @@ package platform
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 
 	shellquote "github.com/kballard/go-shellquote"
@@ -76,7 +77,20 @@ func GetArgs() []string {
 		}
 	}
 	//printArgs(retargs, "NEW")
-	return retargs
+
+	globbed := make([]string, 0)
+	for i, _ := range retargs {
+		// Expand things like *.csv
+		matches, err := filepath.Glob(retargs[i])
+		if matches != nil && err == nil {
+			globbed = append(globbed, matches...)
+		} else {
+			globbed = append(globbed, retargs[i])
+		}
+	}
+	//printArgs(globbed, "NEW")
+
+	return globbed
 }
 
 // ----------------------------------------------------------------

diff --git a/test/cases/globbing/0001/a.csv b/test/cases/globbing/0001/a.csv
@@ -0,0 +1,2 @@
+a,b,c
+1,2,3
diff --git a/test/cases/globbing/0001/b.csv b/test/cases/globbing/0001/b.csv
@@ -0,0 +1,2 @@
+a,b,c
+4,5,6
diff --git a/test/cases/globbing/0001/cmd b/test/cases/globbing/0001/cmd
@@ -0,0 +1 @@
+mlr --c2p cat ${CASEDIR}/*.csv
diff --git a/test/cases/globbing/0001/experr b/test/cases/globbing/0001/experr
diff --git a/test/cases/globbing/0001/expout b/test/cases/globbing/0001/expout
@@ -0,0 +1,3 @@
+a b c
+1 2 3
+4 5 6