Merge pull request #258 from jonboulle/asdf

pkg: remove unused tarheader package

pkg/tarheader/pop_darwin.go

@@ -1,25 +0,0 @@
-//+build darwin
-
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-	"syscall"
-	"time"
-)
-
-func init() {
-	populateHeaderStat = append(populateHeaderStat, populateHeaderCtime)
-}
-
-func populateHeaderCtime(h *tar.Header, fi os.FileInfo, _ map[uint64]string) {
-	st, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return
-	}
-
-	sec, nsec := st.Ctimespec.Unix()
-	ctime := time.Unix(sec, nsec)
-	h.ChangeTime = ctime
-}

pkg/tarheader/pop_linux.go

@@ -1,23 +0,0 @@
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-	"syscall"
-	"time"
-)
-
-func init() {
-	populateHeaderStat = append(populateHeaderStat, populateHeaderCtime)
-}
-
-func populateHeaderCtime(h *tar.Header, fi os.FileInfo, _ map[uint64]string) {
-	st, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return
-	}
-
-	sec, nsec := st.Ctim.Unix()
-	ctime := time.Unix(sec, nsec)
-	h.ChangeTime = ctime
-}

pkg/tarheader/pop_posix.go

@@ -1,28 +0,0 @@
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-	"syscall"
-)
-
-func init() {
-	populateHeaderStat = append(populateHeaderStat, populateHeaderUnix)
-}
-
-func populateHeaderUnix(h *tar.Header, fi os.FileInfo, seen map[uint64]string) {
-	st, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return
-	}
-	h.Uid = int(st.Uid)
-	h.Gid = int(st.Gid)
-	// If we have already seen this inode, generate a hardlink
-	p, ok := seen[uint64(st.Ino)]
-	if ok {
-		h.Linkname = p
-		h.Typeflag = tar.TypeLink
-	} else {
-		seen[uint64(st.Ino)] = h.Name
-	}
-}

pkg/tarheader/tarheader.go

@@ -1,14 +0,0 @@
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-)
-
-var populateHeaderStat []func(h *tar.Header, fi os.FileInfo, seen map[uint64]string)
-
-func Populate(h *tar.Header, fi os.FileInfo, seen map[uint64]string) {
-	for _, pop := range populateHeaderStat {
-		pop(h, fi, seen)
-	}
-}

test

@@ -15,7 +15,7 @@ COVER=${COVER:-"-cover"}
 source ./build
 
 TESTABLE_AND_FORMATTABLE="cas pkg/tar"
-FORMATTABLE="$TESTABLE_AND_FORMATTABLE metadatasvc path pkg/io pkg/proc pkg/tarheader rkt stage0/run.go stage1 version"
+FORMATTABLE="$TESTABLE_AND_FORMATTABLE metadatasvc path pkg/io pkg/proc rkt stage0/run.go stage1 version"
 
 # user has not provided PKG override
 if [ -z "$PKG" ]; then