Replace path.Join with filepath.Join

[rbdr/mobius] / hotline / file_transfer.go

diff --git a/hotline/file_transfer.go b/hotline/file_transfer.go
index 4a93390457c82a8e9c9f7b1f9f9e4f78f2f24db4..90dbbe669a2c9391afbb481f81f5c27bcded0eaa 100644 (file)
--- a/hotline/file_transfer.go
+++ b/hotline/file_transfer.go
@@ -3,7 +3,7 @@ package hotline
 import (
        "encoding/binary"
        "fmt"
 import (
        "encoding/binary"
        "fmt"

-       "strings"
+       "path/filepath"

 )
 
 // File transfer types
 )
 
 // File transfer types


@@ -51,11 +51,12 @@ func (fu *folderUpload) FormattedPath() string {
        var pathSegments []string
        pathData := fu.FileNamePath
 
        var pathSegments []string
        pathData := fu.FileNamePath
 

+       // TODO: implement scanner interface instead?

        for i := uint16(0); i < pathItemLen; i++ {
                segLen := pathData[2]
                pathSegments = append(pathSegments, string(pathData[3:3+segLen]))
                pathData = pathData[3+segLen:]
        }
 
        for i := uint16(0); i < pathItemLen; i++ {
                segLen := pathData[2]
                pathSegments = append(pathSegments, string(pathData[3:3+segLen]))
                pathData = pathData[3+segLen:]
        }
 

-       return strings.Join(pathSegments, pathSeparator)
+       return filepath.Join(pathSegments...)

 }
 }