lib/fs: Use generic case resolver on windows (fixes #6968) (#6969)

lib/fs/basicfs_realcaser_unix.go

@@ -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)
-}

lib/fs/basicfs_realcaser_windows.go

@@ -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() {}

lib/fs/casefs.go

@@ -74,12 +74,7 @@ func NewCaseFilesystem(fs Filesystem) Filesystem {
 	}
 	caseFs := &caseFilesystem{
 		Filesystem: fs,
-	}
+		realCaser:  newDefaultRealCaser(fs),
-	switch k.fstype {
-	case FilesystemTypeBasic:
-		caseFs.realCaser = newBasicRealCaser(fs)
-	default:
-		caseFs.realCaser = newDefaultRealCaser(fs)
 	}
 	caseFilesystems[k] = caseFs
 	return caseFs