lib/model: Handle filename conflicts on Windows.
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3810 LGTM: calmh
This commit is contained in:
committed by
Audrius Butkevicius
parent
bab7c8ebbf
commit
01e50eb3fa
@@ -130,6 +130,14 @@ func (w *walker) walk() (chan protocol.FileInfo, error) {
|
||||
filepath.Walk(w.Dir, hashFiles)
|
||||
} else {
|
||||
for _, sub := range w.Subs {
|
||||
if !osutil.IsDir(w.Dir, filepath.Dir(sub)) {
|
||||
l.Infoln("Skipping sub path that is not in a directory", w.Dir, sub)
|
||||
continue
|
||||
}
|
||||
if !osutil.CheckNameConflict(w.Dir, sub) {
|
||||
l.Infoln("Skipping sub path that collides", w.Dir, sub)
|
||||
continue
|
||||
}
|
||||
filepath.Walk(filepath.Join(w.Dir, sub), hashFiles)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user