lib/fs: Consider win83 for root path as well when watching (ref #5706) (#5709)

This commit is contained in:
Simon Frei
2019-05-11 10:06:04 +02:00
committed by Jakob Borg
parent fbd445fe0a
commit dfbbb286fc
4 changed files with 49 additions and 24 deletions

View File

@@ -222,3 +222,28 @@ func evalSymlinks(in string) (string, error) {
}
return longFilenameSupport(out), nil
}
// watchPaths adjust the folder root for use with the notify backend and the
// corresponding absolute path to be passed to notify to watch name.
func (f *BasicFilesystem) watchPaths(name string) (string, string, error) {
root, err := evalSymlinks(f.root)
if err != nil {
return "", "", err
}
// Remove `\\?\` prefix if the path is just a drive letter as a dirty
// fix for https://github.com/syncthing/syncthing/issues/5578
if filepath.Clean(name) == "." && len(root) <= 7 && len(root) > 4 && root[:4] == `\\?\` {
root = root[4:]
}
absName, err := rooted(name, root)
if err != nil {
return "", "", err
}
root = f.resolveWin83(root)
absName = f.resolveWin83(absName)
return filepath.Join(absName, "..."), root, nil
}