From 00a4a2e674584308178c4c125c173e591d30ecd7 Mon Sep 17 00:00:00 2001
From: Stephen Chung <schung@redhat.com>
Date: Tue, 9 Aug 2016 13:30:31 -0400
Subject: [PATCH] tar: remove "time" keyword before tree creation

Instead of checking each time during keyword evaluation if
the keyword is "time", just remove it from the start and
replace it with "tar_time" (if necessary).

Signed-off-by: Stephen Chung <schung@redhat.com>
---
 tar.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tar.go b/tar.go
index 1fbf6b7..bcab9c8 100644
--- a/tar.go
+++ b/tar.go
@@ -47,6 +47,20 @@ type tarStream struct {
 }
 
 func (ts *tarStream) readHeaders() {
+	// remove "time" keyword
+	notimekws := []string{}
+	for _, kw := range ts.keywords {
+		if !inSlice(kw, notimekws) {
+			if kw != "time" {
+				notimekws = append(notimekws, kw)
+			} else {
+				if !inSlice("tar_time", ts.keywords) {
+					notimekws = append(notimekws, "tar_time")
+				}
+			}
+		}
+	}
+	ts.keywords = notimekws
 	// We have to start with the directory we're in, and anything beyond these
 	// items is determined at the time a tar is extracted.
 	ts.root = &Entry{
@@ -106,9 +120,6 @@ func (ts *tarStream) readHeaders() {
 
 		// now collect keywords on the file
 		for _, keyword := range ts.keywords {
-			if keyword == "time" {
-				keyword = "tar_time"
-			}
 			if keyFunc, ok := KeywordFuncs[keyword]; ok {
 				// We can't extract directories on to disk, so "size" keyword
 				// is irrelevant for now
@@ -142,9 +153,6 @@ func (ts *tarStream) readHeaders() {
 				Type: SpecialType,
 			}
 			for _, setKW := range SetKeywords {
-				if setKW == "time" {
-					setKW = "tar_time"
-				}
 				if keyFunc, ok := KeywordFuncs[setKW]; ok {
 					val, err := keyFunc(hdr.Name, hdr.FileInfo(), tmpFile)
 					if err != nil {