From 5e02468e76d61060f83a4d755b43f834981188f1 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 30 Oct 2014 13:42:57 -0400 Subject: [PATCH] ./pkg/archive: clean up Stat_t assertion inspired by @tonistiigi comment (https://github.com/docker/docker/pull/8046/files#r19579960) Signed-off-by: Vincent Batts --- pkg/archive/archive.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 37b312e5b0..3857220455 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -185,8 +185,13 @@ func (ta *tarAppender) addTarFile(path, name string) error { hdr.Name = name - stat, ok := fi.Sys().(*syscall.Stat_t) - if ok { + var ( + nlink uint32 + inode uint64 + ) + if stat, ok := fi.Sys().(*syscall.Stat_t); ok { + nlink = uint32(stat.Nlink) + inode = uint64(stat.Ino) // Currently go does not fill in the major/minors if stat.Mode&syscall.S_IFBLK == syscall.S_IFBLK || stat.Mode&syscall.S_IFCHR == syscall.S_IFCHR { @@ -194,19 +199,17 @@ func (ta *tarAppender) addTarFile(path, name string) error { hdr.Devminor = int64(minor(uint64(stat.Rdev))) } } - // if it's a regular file and has more than 1 link, // it's hardlinked, so set the type flag accordingly - if fi.Mode().IsRegular() && stat.Nlink > 1 { + if fi.Mode().IsRegular() && nlink > 1 { // a link should have a name that it links too // and that linked name should be first in the tar archive - ino := uint64(stat.Ino) - if oldpath, ok := ta.SeenFiles[ino]; ok { + if oldpath, ok := ta.SeenFiles[inode]; ok { hdr.Typeflag = tar.TypeLink hdr.Linkname = oldpath hdr.Size = 0 // This Must be here for the writer math to add up! } else { - ta.SeenFiles[ino] = name + ta.SeenFiles[inode] = name } }