lib/osutil: Fix globbing at root (fixes #3201)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3202
This commit is contained in:
Audrius Butkevicius 2016-05-28 04:13:34 +00:00 committed by Jakob Borg
parent 87701339fe
commit 242db26343
1 changed files with 4 additions and 1 deletions

View File

@ -11,6 +11,7 @@ package osutil
import (
"os"
"path/filepath"
"runtime"
"sort"
"strings"
)
@ -32,7 +33,9 @@ func Glob(pattern string) (matches []string, err error) {
case string(filepath.Separator):
// nothing
default:
dir = dir[0 : len(dir)-1] // chop off trailing separator
if runtime.GOOS != "windows" || len(dir) < 2 || dir[len(dir)-2] != ':' {
dir = dir[0 : len(dir)-1] // chop off trailing separator, if it's not after the drive letter
}
}
if !hasMeta(dir) {