vbatts/tar-split
1
0
Fork 0
forked from mirrors/tar-split
Code Releases Activity

archive/tar: move round-trip reading into common os file

Browse source 
Fixes #11426

Change-Id: I77368b0e852149ed4533e139cc43887508ac7f78
Reviewed-on: https://go-review.googlesource.com/11662
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Alex Brainman 2015-06-29 16:42:28 +10:00 committed by Vincent Batts
parent 27e18409b9
commit 3b34dbd368
3 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
archive/tar/common.go
View file

@ -249,6 +249,30 @@ func FileInfoHeader(fi os.FileInfo, link string) (*Header, error) {
if fm&os.ModeSticky != 0 {
h.Mode |= c_ISVTX
}
// If possible, populate additional fields from OS-specific
// FileInfo fields.
if sys, ok := fi.Sys().(*Header); ok {
// This FileInfo came from a Header (not the OS). Use the
// original Header to populate all remaining fields.
h.Uid = sys.Uid
h.Gid = sys.Gid
h.Uname = sys.Uname
h.Gname = sys.Gname
h.AccessTime = sys.AccessTime
h.ChangeTime = sys.ChangeTime
if sys.Xattrs != nil {
h.Xattrs = make(map[string]string)
for k, v := range sys.Xattrs {
h.Xattrs[k] = v
}
}
if sys.Typeflag == TypeLink {
// hard link
h.Typeflag = TypeLink
h.Size = 0
h.Linkname = sys.Linkname
}
}
if sysStat != nil {
return h, sysStat(fi, h)
}

27
archive/tar/stat_unix.go
View file

@ -16,8 +16,10 @@ func init() {
}
func statUnix(fi os.FileInfo, h *Header) error {
switch sys := fi.Sys().(type) {
case *syscall.Stat_t:
sys, ok := fi.Sys().(*syscall.Stat_t)
if !ok {
return nil
}
h.Uid = int(sys.Uid)
h.Gid = int(sys.Gid)
// TODO(bradfitz): populate username & group. os/user
@ -31,26 +33,5 @@ func statUnix(fi os.FileInfo, h *Header) error {
h.Size = 0
// TODO(vbatts): Linkname?
}
case *Header:
// for the roundtrip logic
h.Uid = sys.Uid
h.Gid = sys.Gid
h.Uname = sys.Uname
h.Gname = sys.Gname
h.AccessTime = sys.AccessTime
h.ChangeTime = sys.ChangeTime
if sys.Xattrs != nil {
h.Xattrs = make(map[string]string)
for k, v := range sys.Xattrs {
h.Xattrs[k] = v
}
}
if sys.Typeflag == TypeLink {
// hard link
h.Typeflag = TypeLink
h.Size = 0
h.Linkname = sys.Linkname
}
}
return nil
}

4
archive/tar/tar_test.go
View file

@ -10,7 +10,6 @@ import (
"os"
"path"
"reflect"
"runtime"
"strings"
"testing"
"time"
@ -136,9 +135,6 @@ type headerRoundTripTest struct {
}
func TestHeaderRoundTrip(t *testing.T) {
if runtime.GOOS == "windows" || runtime.GOOS == "plan9" || runtime.GOOS == "nacl" {
t.Skipf("skipping on %s; issue 11426", runtime.GOOS)
}
golden := []headerRoundTripTest{
// regular file.
{