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

lib/osutil: Return "/" as filesystem root on non-windows (fixes #3321)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3332
This commit is contained in:
Audrius Butkevicius 2016-06-20 20:25:00 +00:00 committed by Jakob Borg
parent 379e2119a8
commit 502bee9a09
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/syncthing/gui.go
View File

@ -1134,9 +1134,9 @@ func (s *apiService) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
func (s *apiService) getSystemBrowse(w http.ResponseWriter, r *http.Request) { func (s *apiService) getSystemBrowse(w http.ResponseWriter, r *http.Request) {
qs := r.URL.Query() qs := r.URL.Query()
current := qs.Get("current") current := qs.Get("current")
if current == "" && runtime.GOOS == "windows" { if current == "" {
if drives, err := osutil.GetDriveLetters(); err == nil { if roots, err := osutil.GetFilesystemRoots(); err == nil {
sendJSON(w, drives) sendJSON(w, roots)
} else { } else {
http.Error(w, err.Error(), 500) http.Error(w, err.Error(), 500)
} }

4
lib/osutil/drives_unix.go → lib/osutil/fsroots_unix.go
View File

@ -8,6 +8,6 @@
package osutil package osutil
func GetDriveLetters() ([]string, error) { func GetFilesystemRoots() ([]string, error) {
return nil, nil return []string{"/"}, nil
} }

2
lib/osutil/drives_windows.go → lib/osutil/fsroots_windows.go
View File

@ -15,7 +15,7 @@ import (
"unsafe" "unsafe"
) )
func GetDriveLetters() ([]string, error) { func GetFilesystemRoots() ([]string, error) {
kernel32, err := syscall.LoadDLL("kernel32.dll") kernel32, err := syscall.LoadDLL("kernel32.dll")
if err != nil { if err != nil {
return nil, err return nil, err