minio/mc
1
0
Fork 0
mirror of https://github.com/minio/mc.git synced 2026-01-04 02:44:40 +03:00
Code Activity

Use url.Separator everywhere that is needed

Browse Source
This commit is contained in:
Harshavardhana
2015-06-10 21:54:05 -07:00
parent e6ad28079b
commit 08d38fb7da
4 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/client/fs/fs.go
View File

@@ -55,7 +55,7 @@ func (f *fsClient) fsStat() (os.FileInfo, error) {
fpath := f.path
// Golang strips trailing / if you clean(..) or
// EvalSymlinks(..). Adding '.' prevents it from doing so.
if strings.HasSuffix(fpath, string(filepath.Separator)) {
if strings.HasSuffix(fpath, string(f.URL().Separator)) {
fpath = fpath + "."
}
@@ -127,7 +127,7 @@ func (f *fsClient) GetObject(offset, length int64) (io.ReadCloser, int64, error)
fpath := f.path
// Golang strips trailing / if you clean(..) or
// EvalSymlinks(..). Adding '.' prevents it from doing so.
if strings.HasSuffix(fpath, string(filepath.Separator)) {
if strings.HasSuffix(fpath, string(f.URL().Separator)) {
fpath = fpath + "."
}
@@ -172,7 +172,7 @@ func (f *fsClient) listInRoutine(contentCh chan client.ContentOnChannel) {
fpath := f.path
// Golang strips trailing / if you clean(..) or
// EvalSymlinks(..). Adding '.' prevents it from doing so.
if strings.HasSuffix(fpath, string(filepath.Separator)) {
if strings.HasSuffix(fpath, string(f.URL().Separator)) {
fpath = fpath + "."
}
@@ -274,7 +274,7 @@ func (f *fsClient) listInRoutine(contentCh chan client.ContentOnChannel) {
func (f *fsClient) delimited(fp string) string {
var stripPrefix string
stripPrefix = f.path[:strings.LastIndex(f.path, string(filepath.Separator))+1]
stripPrefix = f.path[:strings.LastIndex(f.path, string(f.URL().Separator))+1]
return strings.TrimPrefix(fp, stripPrefix)
}