From 98038dcc1486f673e718c394338c5e4b0156e6a8 Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Tue, 9 Dec 2014 12:36:08 -0800 Subject: [PATCH] pkg: remove unused tarheader package This was used by actool which is now no longer in this repo --- pkg/tarheader/pop_darwin.go | 25 ------------------------- pkg/tarheader/pop_linux.go | 23 ----------------------- pkg/tarheader/pop_posix.go | 28 ---------------------------- pkg/tarheader/tarheader.go | 14 -------------- test | 2 +- 5 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkg/tarheader/pop_darwin.go delete mode 100644 pkg/tarheader/pop_linux.go delete mode 100644 pkg/tarheader/pop_posix.go delete mode 100644 pkg/tarheader/tarheader.go diff --git a/pkg/tarheader/pop_darwin.go b/pkg/tarheader/pop_darwin.go deleted file mode 100644 index dd0176a..0000000 --- a/pkg/tarheader/pop_darwin.go +++ /dev/null @@ -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 -} diff --git a/pkg/tarheader/pop_linux.go b/pkg/tarheader/pop_linux.go deleted file mode 100644 index 16c0c7e..0000000 --- a/pkg/tarheader/pop_linux.go +++ /dev/null @@ -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 -} diff --git a/pkg/tarheader/pop_posix.go b/pkg/tarheader/pop_posix.go deleted file mode 100644 index b454d7f..0000000 --- a/pkg/tarheader/pop_posix.go +++ /dev/null @@ -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 - } -} diff --git a/pkg/tarheader/tarheader.go b/pkg/tarheader/tarheader.go deleted file mode 100644 index d74ec90..0000000 --- a/pkg/tarheader/tarheader.go +++ /dev/null @@ -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) - } -} diff --git a/test b/test index 26ccecb..b4b7765 100755 --- a/test +++ b/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