perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enforce correct filename normalization (fixes #96)

Browse Source
This commit is contained in:
Jakob Borg
2014-03-21 09:09:01 +01:00
parent a4e56caf78
commit 68d9454bc4
5 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/syncthing/model.go
View File

@@ -839,8 +839,8 @@ func (m *Model) recomputeNeedForFile(gf scanner.File, toAdd []addOrder, toDelete
} else {
local, remote := scanner.BlockDiff(lf.Blocks, gf.Blocks)
fm := fileMonitor{
name: gf.Name,
path: path.Clean(path.Join(m.dir, gf.Name)),
name: FSNormalize(gf.Name),
path: FSNormalize(path.Clean(path.Join(m.dir, gf.Name))),
global: gf,
model: m,
localBlocks: local,
@@ -875,7 +875,7 @@ func (m *Model) deleteLoop() {
if debugPull {
dlog.Println("delete", file.Name)
}
path := path.Clean(path.Join(m.dir, file.Name))
path := FSNormalize(path.Clean(path.Join(m.dir, file.Name)))
err := os.Remove(path)
if err != nil {
warnf("%s: %v", file.Name, err)