588f95dca0
Currently pkg/archive stores nested windows files with backslashes (e.g. `dir\`, `dir\file.txt`) and this causes tar not being correctly extracted on Linux daemon. This change assures we canonicalize all paths to unix paths and add them to tar with that name independent of platform. Fixes the following test cases for Windows CI: - TestBuildAddFileWithWhitespace - TestBuildCopyFileWithWhitespace - TestBuildAddDirContentToRoot - TestBuildAddDirContentToExistingDir - TestBuildCopyDirContentToRoot - TestBuildCopyDirContentToExistDir - TestBuildDockerignore - TestBuildEnvUsage - TestBuildEnvUsage2 Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
46 lines
1.1 KiB
Go
46 lines
1.1 KiB
Go
// +build !windows
|
|
|
|
package archive
|
|
|
|
import (
|
|
"errors"
|
|
"syscall"
|
|
|
|
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
)
|
|
|
|
// canonicalTarNameForPath returns platform-specific filepath
|
|
// to canonical posix-style path for tar archival. p is relative
|
|
// path.
|
|
func canonicalTarNameForPath(p string) (string, error) {
|
|
return p, nil // already unix-style
|
|
}
|
|
|
|
func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) {
|
|
s, ok := stat.(*syscall.Stat_t)
|
|
|
|
if !ok {
|
|
err = errors.New("cannot convert stat value to syscall.Stat_t")
|
|
return
|
|
}
|
|
|
|
nlink = uint32(s.Nlink)
|
|
inode = uint64(s.Ino)
|
|
|
|
// Currently go does not fil in the major/minors
|
|
if s.Mode&syscall.S_IFBLK == syscall.S_IFBLK ||
|
|
s.Mode&syscall.S_IFCHR == syscall.S_IFCHR {
|
|
hdr.Devmajor = int64(major(uint64(s.Rdev)))
|
|
hdr.Devminor = int64(minor(uint64(s.Rdev)))
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func major(device uint64) uint64 {
|
|
return (device >> 8) & 0xfff
|
|
}
|
|
|
|
func minor(device uint64) uint64 {
|
|
return (device & 0xff) | ((device >> 12) & 0xfff00)
|
|
}
|