tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename saneSplit --> quickSplit

Browse source 
This better describes its goal and is more inclusive.

Test: go test blueprint pathtools tests
Change-Id: Ia382f1fe65d0b551dc5d92d40ddf3cb356f3204d
This commit is contained in:
Liz Kammer 2022-02-07 09:41:01 -05:00
parent 1b438d6b7e
commit 8b162be674
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pathtools/fs.go
View file

@ -245,7 +245,7 @@ type mockFs struct {
} }
func (m *mockFs) followSymlinks(name string) string { func (m *mockFs) followSymlinks(name string) string {
dir, file := saneSplit(name) dir, file := quickSplit(name)
if dir != "." && dir != "/" { if dir != "." && dir != "/" {
dir = m.followSymlinks(dir) dir = m.followSymlinks(dir)
} }
@ -330,7 +330,7 @@ func (m *mockFs) IsDir(name string) (bool, error) {
} }
func (m *mockFs) IsSymlink(name string) (bool, error) { func (m *mockFs) IsSymlink(name string) (bool, error) {
dir, file := saneSplit(name) dir, file := quickSplit(name)
dir = m.followSymlinks(dir) dir = m.followSymlinks(dir)
name = filepath.Join(dir, file) name = filepath.Join(dir, file)
@ -363,14 +363,14 @@ func unescapeGlob(s string) string {
} }
func (m *mockFs) glob(pattern string) ([]string, error) { func (m *mockFs) glob(pattern string) ([]string, error) {
dir, file := saneSplit(pattern) dir, file := quickSplit(pattern)
dir = unescapeGlob(dir) dir = unescapeGlob(dir)
toDir := m.followSymlinks(dir) toDir := m.followSymlinks(dir)
var matches []string var matches []string
for _, f := range m.all { for _, f := range m.all {
fDir, fFile := saneSplit(f) fDir, fFile := quickSplit(f)
if toDir == fDir { if toDir == fDir {
match, err := filepath.Match(file, fFile) match, err := filepath.Match(file, fFile)
if err != nil { if err != nil {
@ -402,7 +402,7 @@ func (ms *mockStat) ModTime() time.Time { return time.Time{} }
func (ms *mockStat) Sys() interface{} { return nil } func (ms *mockStat) Sys() interface{} { return nil }
func (m *mockFs) Lstat(name string) (os.FileInfo, error) { func (m *mockFs) Lstat(name string) (os.FileInfo, error) {
dir, file := saneSplit(name) dir, file := quickSplit(name)
dir = m.followSymlinks(dir) dir = m.followSymlinks(dir)
name = filepath.Join(dir, file) name = filepath.Join(dir, file)
@ -464,7 +464,7 @@ func (m *mockFs) ReadDirNames(name string) ([]string, error) {
var ret []string var ret []string
for _, f := range m.all { for _, f := range m.all {
dir, file := saneSplit(f) dir, file := quickSplit(f)
if dir == name && len(file) > 0 && file[0] != '.' { if dir == name && len(file) > 0 && file[0] != '.' {
ret = append(ret, file) ret = append(ret, file)
} }
@ -477,7 +477,7 @@ func (m *mockFs) ListDirsRecursive(name string, follow ShouldFollowSymlinks) ([]
} }
func (m *mockFs) Readlink(name string) (string, error) { func (m *mockFs) Readlink(name string) (string, error) {
dir, file := saneSplit(name) dir, file := quickSplit(name)
dir = m.followSymlinks(dir) dir = m.followSymlinks(dir)
origName := name origName := name

4
pathtools/glob.go
View file

@ -176,7 +176,7 @@ func glob(fs FileSystem, pattern string, hasRecursive bool,
return matches, dirs, err return matches, dirs, err
} }
dir, file := saneSplit(pattern) dir, file := quickSplit(pattern)
if file == "**" { if file == "**" {
if hasRecursive { if hasRecursive {
@ -230,7 +230,7 @@ func glob(fs FileSystem, pattern string, hasRecursive bool,
// Faster version of dir, file := filepath.Dir(path), filepath.File(path) with no allocations // Faster version of dir, file := filepath.Dir(path), filepath.File(path) with no allocations
// Similar to filepath.Split, but returns "." if dir is empty and trims trailing slash if dir is // Similar to filepath.Split, but returns "." if dir is empty and trims trailing slash if dir is
// not "/". Returns ".", "" if path is "." // not "/". Returns ".", "" if path is "."
func saneSplit(path string) (dir, file string) { func quickSplit(path string) (dir, file string) {
if path == "." { if path == "." {
return ".", "" return ".", ""
} }