octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/fs: Basic with empty root shouldn't point at / (#6483)

Browse Source
This commit is contained in:
Simon Frei 2020-03-31 13:56:07 +02:00 committed by GitHub
parent 9c67d57c28
commit 123941cf62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fs/basicfs.go
View File

@ -30,6 +30,10 @@ type BasicFilesystem struct {
} }
func newBasicFilesystem(root string) *BasicFilesystem { func newBasicFilesystem(root string) *BasicFilesystem {
if root == "" {
root = "." // Otherwise "" becomes "/" below
}
// The reason it's done like this: // The reason it's done like this:
// C: -> C:\ -> C:\ (issue that this is trying to fix) // C: -> C:\ -> C:\ (issue that this is trying to fix)
// C:\somedir -> C:\somedir\ -> C:\somedir // C:\somedir -> C:\somedir\ -> C:\somedir

7
lib/fs/basicfs_test.go
View File

@ -514,6 +514,10 @@ func TestNewBasicFilesystem(t *testing.T) {
t.Skip("non-windows root paths") t.Skip("non-windows root paths")
} }
currentDir, err := filepath.Abs(".")
if err != nil {
t.Fatal(err)
}
testCases := []struct { testCases := []struct {
input string input string
expectedRoot string expectedRoot string
@ -521,7 +525,8 @@ func TestNewBasicFilesystem(t *testing.T) {
}{ }{
{"/foo/bar/baz", "/foo/bar/baz", "/foo/bar/baz"}, {"/foo/bar/baz", "/foo/bar/baz", "/foo/bar/baz"},
{"/foo/bar/baz/", "/foo/bar/baz", "/foo/bar/baz"}, {"/foo/bar/baz/", "/foo/bar/baz", "/foo/bar/baz"},
{"", "/", "/"}, {"", currentDir, currentDir},
{".", currentDir, currentDir},
{"/", "/", "/"}, {"/", "/", "/"},
} }