MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 04:42:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

xl/fs: pathJoin now takes variadic inputs. (#1550)

Browse Source 
Retains slash for the last element.

Fixes #1546
This commit is contained in:
Harshavardhana
2016-05-09 00:46:54 -07:00
parent 04a5b25929
commit 722abe2d0f
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
object-utils.go
View File

@@ -105,12 +105,14 @@ func retainSlash(s string) string {
}
// pathJoin - like path.Join() but retains trailing "/" of the last element
func pathJoin(s1 string, s2 string) string {
func pathJoin(elem ...string) string {
trailingSlash := ""
if strings.HasSuffix(s2, slashSeparator) {
trailingSlash = "/"
if len(elem) > 0 {
if strings.HasSuffix(elem[len(elem)-1], slashSeparator) {
trailingSlash = "/"
}
}
return path.Join(s1, s2) + trailingSlash
return path.Join(elem...) + trailingSlash
}
// Create an s3 compatible MD5sum for complete multipart transaction.