Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
FIXUP: dots-only filenames
  • Loading branch information
cbandy committed Mar 12, 2025
commit bf5e48fde5b02a30258f453de6e6bd9c3f8625fc
7 changes: 4 additions & 3 deletions internal/shell/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ import (
// See:
// - https://pubs.opengroup.org/onlinepubs/9799919799/utilities/basename.html
func CleanFileName(path string) string {
if i := strings.LastIndexByte(path, '/'); i < 0 {
return path
} else if path = path[i+1:]; path != "." && path != ".." {
if i := strings.LastIndexByte(path, '/'); i >= 0 {
path = path[i+1:]
}
if path != "." && path != ".." {
return path
}
return ""
Expand Down
5 changes: 5 additions & 0 deletions internal/shell/paths_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ func TestCleanFileName(t *testing.T) {
})

t.Run("Dots", func(t *testing.T) {
assert.Equal(t, CleanFileName("."), "")
assert.Equal(t, CleanFileName(".."), "")
assert.Equal(t, CleanFileName("..."), "...")
assert.Equal(t, CleanFileName("././/.././../."), "")
assert.Equal(t, CleanFileName("././/.././../.."), "")
assert.Equal(t, CleanFileName("././/.././../../x.j"), "x.j")
})

t.Run("Directories", func(t *testing.T) {
assert.Equal(t, CleanFileName("/"), "")
assert.Equal(t, CleanFileName("//"), "")
assert.Equal(t, CleanFileName("asdf/"), "")
assert.Equal(t, CleanFileName("asdf//12.3"), "12.3")
assert.Equal(t, CleanFileName("//////"), "")
Expand Down