tornadocontrib/bsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use filepath.clean instead of path.clean (#26404)

Browse Source 
* internal/flags: use filepath.Clean instead of path.Clean

* internal/flags: fix windows pipe issue

* internal/flags: modify test for windows

* internal/flags: use backticks, fix test
This commit is contained in:
Marius van der Wijden 2023-01-13 15:48:42 +01:00 committed by GitHub
parent e04d63ebd3
commit 0e486a56c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/flags/flags.go
View File

@ -23,7 +23,7 @@ import (
"math/big" "math/big"
"os" "os"
"os/user" "os/user"
"path" "path/filepath"
"strings" "strings"
"github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common/math"
@ -314,12 +314,16 @@ func GlobalBig(ctx *cli.Context, name string) *big.Int {
// 3. cleans the path, e.g. /a/b/../c -> /a/c // 3. cleans the path, e.g. /a/b/../c -> /a/c
// Note, it has limitations, e.g. ~someuser/tmp will not be expanded // Note, it has limitations, e.g. ~someuser/tmp will not be expanded
func expandPath(p string) string { func expandPath(p string) string {
// Named pipes are not file paths on windows, ignore
if strings.HasPrefix(p, `\\.\pipe`) {
return p
}
if strings.HasPrefix(p, "~/") || strings.HasPrefix(p, "~\\") { if strings.HasPrefix(p, "~/") || strings.HasPrefix(p, "~\\") {
if home := HomeDir(); home != "" { if home := HomeDir(); home != "" {
p = home + p[1:] p = home + p[1:]
} }
} }
return path.Clean(os.ExpandEnv(p)) return filepath.Clean(os.ExpandEnv(p))
} }
func HomeDir() string { func HomeDir() string {

36
internal/flags/flags_test.go
View File

@ -19,23 +19,43 @@ package flags
import ( import (
"os" "os"
"os/user" "os/user"
"runtime"
"testing" "testing"
) )
func TestPathExpansion(t *testing.T) { func TestPathExpansion(t *testing.T) {
user, _ := user.Current() user, _ := user.Current()
tests := map[string]string{ var tests map[string]string
"/home/someuser/tmp": "/home/someuser/tmp",
"~/tmp": user.HomeDir + "/tmp", if runtime.GOOS == "windows" {
"~thisOtherUser/b/": "~thisOtherUser/b", tests = map[string]string{
"$DDDXXX/a/b": "/tmp/a/b", `/home/someuser/tmp`: `\home\someuser\tmp`,
"/a/b/": "/a/b", `~/tmp`: user.HomeDir + `\tmp`,
`~thisOtherUser/b/`: `~thisOtherUser\b`,
`$DDDXXX/a/b`: `\tmp\a\b`,
`/a/b/`: `\a\b`,
`C:\Documents\Newsletters\`: `C:\Documents\Newsletters`,
`C:\`: `C:\`,
`\\.\pipe\\pipe\geth621383`: `\\.\pipe\\pipe\geth621383`,
}
} else {
tests = map[string]string{
`/home/someuser/tmp`: `/home/someuser/tmp`,
`~/tmp`: user.HomeDir + `/tmp`,
`~thisOtherUser/b/`: `~thisOtherUser/b`,
`$DDDXXX/a/b`: `/tmp/a/b`,
`/a/b/`: `/a/b`,
`C:\Documents\Newsletters\`: `C:\Documents\Newsletters\`,
`C:\`: `C:\`,
`\\.\pipe\\pipe\geth621383`: `\\.\pipe\\pipe\geth621383`,
}
} }
os.Setenv("DDDXXX", "/tmp")
os.Setenv(`DDDXXX`, `/tmp`)
for test, expected := range tests { for test, expected := range tests {
got := expandPath(test) got := expandPath(test)
if got != expected { if got != expected {
t.Errorf("test %s, got %s, expected %s\n", test, got, expected) t.Errorf(`test %s, got %s, expected %s\n`, test, got, expected)
} }
} }
} }