From c734591ee4137684c8e3960b130126caa29d65d8 Mon Sep 17 00:00:00 2001
From: Jiri Appl <jiria@microsoft.com>
Date: Thu, 12 Jul 2018 14:26:43 -0700
Subject: [PATCH] Fix FileAttributes of FileBasicInfo for 32 bit architectures

---
 vendor/github.com/Microsoft/go-winio/backuptar/tar.go | 2 +-
 vendor/github.com/Microsoft/go-winio/fileinfo.go      | 2 +-
 vendor/github.com/Microsoft/hcsshim/legacy.go         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vendor/github.com/Microsoft/go-winio/backuptar/tar.go b/vendor/github.com/Microsoft/go-winio/backuptar/tar.go
index 53da908f1489d..a2fdf7b772cf4 100644
--- a/vendor/github.com/Microsoft/go-winio/backuptar/tar.go
+++ b/vendor/github.com/Microsoft/go-winio/backuptar/tar.go
@@ -303,7 +303,7 @@ func FileInfoFromHeader(hdr *tar.Header) (name string, size int64, fileInfo *win
 		if err != nil {
 			return "", 0, nil, err
 		}
-		fileInfo.FileAttributes = uintptr(attr)
+		fileInfo.FileAttributes = attr
 	} else {
 		if hdr.Typeflag == tar.TypeDir {
 			fileInfo.FileAttributes |= syscall.FILE_ATTRIBUTE_DIRECTORY
diff --git a/vendor/github.com/Microsoft/go-winio/fileinfo.go b/vendor/github.com/Microsoft/go-winio/fileinfo.go
index b1d60abb83629..40828d4f576b8 100644
--- a/vendor/github.com/Microsoft/go-winio/fileinfo.go
+++ b/vendor/github.com/Microsoft/go-winio/fileinfo.go
@@ -20,7 +20,7 @@ const (
 // FileBasicInfo contains file access time and file attributes information.
 type FileBasicInfo struct {
 	CreationTime, LastAccessTime, LastWriteTime, ChangeTime syscall.Filetime
-	FileAttributes                                          uintptr // includes padding
+	FileAttributes                                          uint64 // includes padding
 }
 
 // GetFileBasicInfo retrieves times and attributes for a file.
diff --git a/vendor/github.com/Microsoft/hcsshim/legacy.go b/vendor/github.com/Microsoft/hcsshim/legacy.go
index 0b23b6c4d0074..10f957d961df6 100644
--- a/vendor/github.com/Microsoft/hcsshim/legacy.go
+++ b/vendor/github.com/Microsoft/hcsshim/legacy.go
@@ -283,7 +283,7 @@ func (r *legacyLayerReader) Next() (path string, size int64, fileInfo *winio.Fil
 		if err != nil {
 			return
 		}
-		fileInfo.FileAttributes = uintptr(attr)
+		fileInfo.FileAttributes = uint64(attr)
 		beginning := int64(4)
 
 		// Find the accurate file size.