octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-05 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/syncthing, lib/model: Handle rel/abs paths for config/protected paths (fixes #3183)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3995
This commit is contained in:
Simon Frei 2017-03-04 07:49:48 +00:00 committed by Jakob Borg
parent 3475a9ab0a
commit c20d612736
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/syncthing/main.go
View File

@ -344,7 +344,13 @@ func main() {
if options.confDir != "" { if options.confDir != "" {
// Not set as default above because the string can be really long. // Not set as default above because the string can be really long.
baseDirs["config"] = options.confDir if !filepath.IsAbs(options.confDir) {
path, err := filepath.Abs(options.confDir)
if err != nil {
l.Fatalln(err)
}
baseDirs["config"] = path
}
} }
if err := expandLocations(); err != nil { if err := expandLocations(); err != nil {

3
lib/model/model.go
View File

@ -285,7 +285,8 @@ func (m *Model) warnAboutOverwritingProtectedFiles(folder string) {
} }
// check if file is ignored // check if file is ignored
if ignores.Match(protectedFilePath).IsIgnored() { relPath, _ := filepath.Rel(folderLocation, protectedFilePath)
if ignores.Match(relPath).IsIgnored() {
continue continue
} }