Update FileAttributes size to work on 32 bit platforms

jiria · jiria · commit 350b9857debe · 2018-08-02T10:42:57.000-07:00
diff --git a/backuptar/tar.go b/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/fileinfo.go b/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.

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ func FileInfoFromHeader(hdr tar.Header) (name string, size int64, fileInfo win`
`303`	`303`	`if err != nil {`
`304`	`304`	`return "", 0, nil, err`
`305`	`305`	`}`
`306`		`- fileInfo.FileAttributes = uintptr(attr)`
	`306`	`+ fileInfo.FileAttributes = attr`
`307`	`307`	`} else {`
`308`	`308`	`if hdr.Typeflag == tar.TypeDir {`
`309`	`309`	`fileInfo.FileAttributes \|= syscall.FILE_ATTRIBUTE_DIRECTORY`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const (`
`20`	`20`	`// FileBasicInfo contains file access time and file attributes information.`
`21`	`21`	`type FileBasicInfo struct {`
`22`	`22`	`CreationTime, LastAccessTime, LastWriteTime, ChangeTime syscall.Filetime`
`23`		`- FileAttributes uintptr // includes padding`
	`23`	`+ FileAttributes uint64 // includes padding`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// GetFileBasicInfo retrieves times and attributes for a file.`