mirror of
https://github.com/octoleo/syncthing.git
synced 2025-01-23 15:18:24 +00:00
Merge branch 'release'
* release: lib/fs: Revert removal of \\?\ for drive letters (fixes #5695)
This commit is contained in:
commit
62a6d619e7
@ -12,7 +12,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
|
||||||
|
|
||||||
"github.com/syncthing/notify"
|
"github.com/syncthing/notify"
|
||||||
)
|
)
|
||||||
@ -33,12 +32,6 @@ func (f *BasicFilesystem) Watch(name string, ignore Matcher, ctx context.Context
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove `\\?\` prefix if the path is just a drive letter as a dirty
|
|
||||||
// fix for https://github.com/syncthing/syncthing/issues/5578
|
|
||||||
if runtime.GOOS == "windows" && len(absName) <= 7 && len(absName) > 4 && absName[:4] == `\\?\` {
|
|
||||||
absName = absName[4:]
|
|
||||||
}
|
|
||||||
|
|
||||||
outChan := make(chan Event)
|
outChan := make(chan Event)
|
||||||
backendChan := make(chan notify.EventInfo, backendBuffer)
|
backendChan := make(chan notify.EventInfo, backendBuffer)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user