From 722abe2d0f46df4b526eb0464c798bff5298bd80 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Mon, 9 May 2016 00:46:54 -0700
Subject: [PATCH] xl/fs: pathJoin now takes variadic inputs. (#1550)

Retains slash for the last element.

Fixes #1546
---
 object-common-multipart.go |  4 ++--
 object-common.go           |  2 +-
 object-utils.go            | 10 ++++++----
 posix.go                   | 15 +++++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/object-common-multipart.go b/object-common-multipart.go
index e408abbf5..260fa4d3c 100644
--- a/object-common-multipart.go
+++ b/object-common-multipart.go
@@ -458,11 +458,11 @@ func listMultipartUploadsCommon(layer ObjectLayer, bucket, prefix, keyMarker, up
 		if fi.Mode.IsDir() {
 			// All directory entries are common prefixes.
 			uploadID = "" // Upload ids are empty for CommonPrefixes.
-			objectName = strings.TrimPrefix(fi.Name, retainSlash(path.Join(mpartMetaPrefix, bucket)))
+			objectName = strings.TrimPrefix(fi.Name, retainSlash(pathJoin(mpartMetaPrefix, bucket)))
 			result.CommonPrefixes = append(result.CommonPrefixes, objectName)
 		} else {
 			uploadID = path.Base(fi.Name)
-			objectName = strings.TrimPrefix(path.Dir(fi.Name), retainSlash(path.Join(mpartMetaPrefix, bucket)))
+			objectName = strings.TrimPrefix(path.Dir(fi.Name), retainSlash(pathJoin(mpartMetaPrefix, bucket)))
 			result.Uploads = append(result.Uploads, uploadMetadata{
 				Object:    objectName,
 				UploadID:  uploadID,
diff --git a/object-common.go b/object-common.go
index e437ed34c..d8ab93239 100644
--- a/object-common.go
+++ b/object-common.go
@@ -71,7 +71,7 @@ func cleanupDir(storage StorageAPI, volume, dirPath string) error {
 		}
 		return nil
 	}
-	return delFunc(retainSlash(dirPath))
+	return delFunc(retainSlash(pathJoin(dirPath)))
 }
 
 /// Common object layer functions.
diff --git a/object-utils.go b/object-utils.go
index 3d0d5d890..6f0fe74e4 100644
--- a/object-utils.go
+++ b/object-utils.go
@@ -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.
diff --git a/posix.go b/posix.go
index 8dcdbb4bb..dfd725604 100644
--- a/posix.go
+++ b/posix.go
@@ -19,8 +19,7 @@ package main
 import (
 	"io"
 	"os"
-	"path"
-	"path/filepath"
+	slashpath "path"
 	"strings"
 	"syscall"
 
@@ -148,7 +147,7 @@ func getAllUniqueVols(dirPath string) ([]VolInfo, error) {
 	}
 	var volsInfo []VolInfo
 	for _, entry := range entries {
-		if !strings.HasSuffix(entry, slashSeparator) || !isValidVolname(filepath.Clean(entry)) {
+		if !strings.HasSuffix(entry, slashSeparator) || !isValidVolname(slashpath.Clean(entry)) {
 			// Skip if entry is neither a directory not a valid volume name.
 			continue
 		}
@@ -479,7 +478,7 @@ func (s fsStorage) StatFile(volume, path string) (file FileInfo, err error) {
 		return FileInfo{}, err
 	}
 
-	filePath := pathJoin(volumeDir, path)
+	filePath := slashpath.Join(volumeDir, path)
 	st, err := os.Stat(filePath)
 	if err != nil {
 		log.WithFields(logrus.Fields{
@@ -548,10 +547,10 @@ func deleteFile(basePath, deletePath string) error {
 		return err
 	}
 	// Recursively go down the next path and delete again.
-	if err := deleteFile(basePath, path.Dir(deletePath)); err != nil {
+	if err := deleteFile(basePath, slashpath.Dir(deletePath)); err != nil {
 		log.WithFields(logrus.Fields{
 			"basePath":  basePath,
-			"deleteDir": path.Dir(deletePath),
+			"deleteDir": slashpath.Dir(deletePath),
 		}).Debugf("deleteFile failed with %s", err)
 		return err
 	}
@@ -595,7 +594,7 @@ func (s fsStorage) RenameFile(srcVolume, srcPath, dstVolume, dstPath string) err
 		}).Errorf("getVolumeDir failed with %s", err)
 		return err
 	}
-	if err = os.MkdirAll(path.Join(dstVolumeDir, path.Dir(dstPath)), 0755); err != nil {
+	if err = os.MkdirAll(slashpath.Join(dstVolumeDir, slashpath.Dir(dstPath)), 0755); err != nil {
 		// File path cannot be verified since one of the parents is a file.
 		if strings.Contains(err.Error(), "not a directory") {
 			return errFileAccessDenied
@@ -603,7 +602,7 @@ func (s fsStorage) RenameFile(srcVolume, srcPath, dstVolume, dstPath string) err
 		log.Errorf("os.MkdirAll failed with %s", err)
 		return err
 	}
-	err = os.Rename(path.Join(srcVolumeDir, srcPath), path.Join(dstVolumeDir, dstPath))
+	err = os.Rename(slashpath.Join(srcVolumeDir, srcPath), slashpath.Join(dstVolumeDir, dstPath))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return errFileNotFound