vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

pkg/archive_windows: make use of os.PathSeparator

Browse source 
cc: @jhowardmsft

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
This commit is contained in:
Ahmet Alp Balkan 2015-03-05 17:15:11 -08:00
parent c0b5b9cafe
commit be592674ac
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archive/archive_windows.go
View file

@ -4,6 +4,7 @@ package archive
import ( import (
"fmt" "fmt"
"os"
"strings" "strings"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
@ -20,7 +21,8 @@ func CanonicalTarNameForPath(p string) (string, error) {
if strings.Contains(p, "/") { if strings.Contains(p, "/") {
return "", fmt.Errorf("windows path contains forward slash: %s", p) return "", fmt.Errorf("windows path contains forward slash: %s", p)
} }
return strings.Replace(p, "\\", "/", -1), nil return strings.Replace(p, string(os.PathSeparator), "/", -1), nil
} }
func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) { func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) {