MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 06:35:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fs: Fix filtering out valid paths from previous #1321 fix (#1323)

Browse Source 
Fixes #1324
This commit is contained in:
Harshavardhana 2016-04-17 12:00:23 -07:00
parent 33633fd15d
commit b47d722d8e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs.go
View File

@ -143,16 +143,16 @@ func removeDuplicateVols(vols []VolInfo) []VolInfo {
func getAllUniqueVols(dirPath string) ([]VolInfo, error) { func getAllUniqueVols(dirPath string) ([]VolInfo, error) {
volumeFn := func(dirent fsDirent) bool { volumeFn := func(dirent fsDirent) bool {
// Return all directories. // Return all directories.
return dirent.IsDir() && isValidVolname(dirent.name) return dirent.IsDir() && isValidVolname(filepath.Clean(dirent.name))
} }
namesOnly := false // Returned dirent names are absolute. namesOnly := true // Returned are only names.
dirents, err := scandir(dirPath, volumeFn, namesOnly) dirents, err := scandir(dirPath, volumeFn, namesOnly)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var volsInfo []VolInfo var volsInfo []VolInfo
for _, dirent := range dirents { for _, dirent := range dirents {
fi, err := os.Stat(dirent.name) fi, err := os.Stat(filepath.Join(dirPath, dirent.name))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -230,7 +230,7 @@ func (s fsStorage) ListVols() (volsInfo []VolInfo, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, vol := range volsInfo { for i, vol := range volsInfo {
// Volname on case sensitive fs backends can come in as // Volname on case sensitive fs backends can come in as
// capitalized, but object layer cannot consume it // capitalized, but object layer cannot consume it
// directly. Convert it as we see fit. // directly. Convert it as we see fit.
@ -239,7 +239,7 @@ func (s fsStorage) ListVols() (volsInfo []VolInfo, err error) {
Name: volName, Name: volName,
Created: vol.Created, Created: vol.Created,
} }
volsInfo = append(volsInfo, volInfo) volsInfo[i] = volInfo
} }
return volsInfo, nil return volsInfo, nil
} }