diff --git a/lib/fs/basicfs_realcaser_unix.go b/lib/fs/basicfs_realcaser_unix.go deleted file mode 100644 index c523cfa39..000000000 --- a/lib/fs/basicfs_realcaser_unix.go +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (C) 2020 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -// +build !windows - -package fs - -func newBasicRealCaser(fs Filesystem) realCaser { - return newDefaultRealCaser(fs) -} diff --git a/lib/fs/basicfs_realcaser_windows.go b/lib/fs/basicfs_realcaser_windows.go deleted file mode 100644 index d4416f7f7..000000000 --- a/lib/fs/basicfs_realcaser_windows.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (C) 2020 The Syncthing Authors. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -// +build windows - -package fs - -import ( - "path/filepath" - "strings" - "syscall" -) - -type basicRealCaserWindows struct { - uri string -} - -func newBasicRealCaser(fs Filesystem) realCaser { - return &basicRealCaserWindows{fs.URI()} -} - -// RealCase returns the correct case for the given name, which is a relative -// path below root, as it exists on disk. -func (r *basicRealCaserWindows) realCase(name string) (string, error) { - if name == "." { - return ".", nil - } - path := r.uri - comps := strings.Split(name, string(PathSeparator)) - var err error - for i, comp := range comps { - path = filepath.Join(path, comp) - comps[i], err = r.realCaseBase(path) - if err != nil { - return "", err - } - } - return filepath.Join(comps...), nil -} - -func (*basicRealCaserWindows) realCaseBase(path string) (string, error) { - p, err := syscall.UTF16PtrFromString(fixLongPath(path)) - if err != nil { - return "", err - } - var fd syscall.Win32finddata - h, err := syscall.FindFirstFile(p, &fd) - if err != nil { - return "", err - } - syscall.FindClose(h) - return syscall.UTF16ToString(fd.FileName[:]), nil -} - -func (r *basicRealCaserWindows) dropCache() {} diff --git a/lib/fs/casefs.go b/lib/fs/casefs.go index 49f127950..6d09d90cc 100644 --- a/lib/fs/casefs.go +++ b/lib/fs/casefs.go @@ -74,12 +74,7 @@ func NewCaseFilesystem(fs Filesystem) Filesystem { } caseFs := &caseFilesystem{ Filesystem: fs, - } - switch k.fstype { - case FilesystemTypeBasic: - caseFs.realCaser = newBasicRealCaser(fs) - default: - caseFs.realCaser = newDefaultRealCaser(fs) + realCaser: newDefaultRealCaser(fs), } caseFilesystems[k] = caseFs return caseFs