@@ -1,6 +1,7 @@

 package graph

 import (

+	"archive/tar"

 	"bytes"

 	"io"

 	"os"

@@ -12,7 +13,6 @@ import (

 	_ "github.com/docker/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/utils"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 const (

@@ -59,17 +59,6 @@ clone git github.com/go-fsnotify/fsnotify v1.0.4

 clone git github.com/go-check/check 64131543e7896d5bcc6bd5a76287eb75ea96c673

-# get Go tip's archive/tar, for xattr support and improved performance

-# TODO after Go 1.4 drops, bump our minimum supported version and drop this vendored dep

-if [ "$1" = '--go' ]; then

-	# Go takes forever and a half to clone, so we only redownload it when explicitly requested via the "--go" flag to this script.

-	clone hg code.google.com/p/go 1b17b3426e3c

-	mv src/code.google.com/p/go/src/pkg/archive/tar tmp-tar

-	rm -rf src/code.google.com/p/go

-	mkdir -p src/code.google.com/p/go/src/pkg/archive

-	mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar

-fi

-

 # get distribution packages

 clone git github.com/docker/distribution d957768537c5af40e4f4cd96871f7b2bde9e2923

 mv src/github.com/docker/distribution/digest tmp-digest

@@ -1,6 +1,7 @@

 package main

 import (

+	"archive/tar"

 	"bytes"

 	"encoding/json"

 	"io"

@@ -11,7 +12,6 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 	"github.com/go-check/check"

 )

@@ -1,6 +1,7 @@

 package main

 import (

+	"archive/tar"

 	"fmt"

 	"io/ioutil"

 	"os"

@@ -8,7 +9,6 @@ import (

 	"strings"

 	"time"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 	"github.com/go-check/check"

 )

@@ -1,6 +1,7 @@

 package main

 import (

+	"archive/tar"

 	"bytes"

 	"encoding/json"

 	"errors"

@@ -17,7 +18,6 @@ import (

 	"time"

 	"github.com/docker/docker/pkg/stringutils"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 func getExitCode(err error) (int, error) {

@@ -1,6 +1,7 @@

 package archive

 import (

+	"archive/tar"

 	"bufio"

 	"bytes"

 	"compress/bzip2"

@@ -16,8 +17,6 @@ import (

 	"strings"

 	"syscall"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

-

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/pkg/fileutils"

 	"github.com/docker/docker/pkg/pools"

@@ -1,6 +1,7 @@

 package archive

 import (

+	"archive/tar"

 	"bytes"

 	"fmt"

 	"io"

@@ -15,7 +16,6 @@ import (

 	"time"

 	"github.com/docker/docker/pkg/system"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 func TestIsArchiveNilHeader(t *testing.T) {

@@ -3,11 +3,10 @@

 package archive

 import (

+	"archive/tar"

 	"errors"

 	"os"

 	"syscall"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 // canonicalTarNameForPath returns platform-specific filepath

@@ -3,11 +3,10 @@

 package archive

 import (

+	"archive/tar"

 	"fmt"

 	"os"

 	"strings"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 // canonicalTarNameForPath returns platform-specific filepath

@@ -1,6 +1,7 @@

 package archive

 import (

+	"archive/tar"

 	"bytes"

 	"fmt"

 	"io"

@@ -11,8 +12,6 @@ import (

 	"syscall"

 	"time"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

-

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/pkg/pools"

 	"github.com/docker/docker/pkg/system"

@@ -1,6 +1,7 @@

 package archive

 import (

+	"archive/tar"

 	"fmt"

 	"io"

 	"io/ioutil"

@@ -9,8 +10,6 @@ import (

 	"strings"

 	"syscall"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

-

 	"github.com/docker/docker/pkg/pools"

 	"github.com/docker/docker/pkg/system"

 )

@@ -1,9 +1,8 @@

 package archive

 import (

+	"archive/tar"

 	"testing"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 func TestApplyLayerInvalidFilenames(t *testing.T) {

@@ -1,6 +1,7 @@

 package archive

 import (

+	"archive/tar"

 	"bytes"

 	"fmt"

 	"io"

@@ -8,8 +9,6 @@ import (

 	"os"

 	"path/filepath"

 	"time"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 var testUntarFns = map[string]func(string, io.Reader) error{

@@ -1,8 +1,8 @@

 package archive

 import (

+	"archive/tar"

 	"bytes"

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 	"io/ioutil"

 )

@@ -1,6 +1,7 @@

 package tarsum

 import (

+	"archive/tar"

 	"bytes"

 	"compress/gzip"

 	"crypto"

@@ -11,8 +12,6 @@ import (

 	"hash"

 	"io"

 	"strings"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 const (

@@ -1,6 +1,7 @@

 package tarsum

 import (

+	"archive/tar"

 	"bytes"

 	"compress/gzip"

 	"crypto/md5"

@@ -14,8 +15,6 @@ import (

 	"io/ioutil"

 	"os"

 	"testing"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 type testLayer struct {

@@ -1,12 +1,11 @@

 package tarsum

 import (

+	"archive/tar"

 	"errors"

 	"sort"

 	"strconv"

 	"strings"

-

-	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

 // versioning of the TarSum algorithm

deleted file mode 100644

@@ -1,305 +0,0 @@

-// Copyright 2009 The Go Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-// Package tar implements access to tar archives.

-// It aims to cover most of the variations, including those produced

-// by GNU and BSD tars.

-//

-// References:

-//   http://www.freebsd.org/cgi/man.cgi?query=tar&sektion=5

-//   http://www.gnu.org/software/tar/manual/html_node/Standard.html

-//   http://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html

-package tar

-

-import (

-	"bytes"

-	"errors"

-	"fmt"

-	"os"

-	"path"

-	"time"

-)

-

-const (

-	blockSize = 512

-

-	// Types

-	TypeReg           = '0'    // regular file

-	TypeRegA          = '\x00' // regular file

-	TypeLink          = '1'    // hard link

-	TypeSymlink       = '2'    // symbolic link

-	TypeChar          = '3'    // character device node

-	TypeBlock         = '4'    // block device node

-	TypeDir           = '5'    // directory

-	TypeFifo          = '6'    // fifo node

-	TypeCont          = '7'    // reserved

-	TypeXHeader       = 'x'    // extended header

-	TypeXGlobalHeader = 'g'    // global extended header

-	TypeGNULongName   = 'L'    // Next file has a long name

-	TypeGNULongLink   = 'K'    // Next file symlinks to a file w/ a long name

-	TypeGNUSparse     = 'S'    // sparse file

-)

-

-// A Header represents a single header in a tar archive.

-// Some fields may not be populated.

-type Header struct {

-	Name       string    // name of header file entry

-	Mode       int64     // permission and mode bits

-	Uid        int       // user id of owner

-	Gid        int       // group id of owner

-	Size       int64     // length in bytes

-	ModTime    time.Time // modified time

-	Typeflag   byte      // type of header entry

-	Linkname   string    // target name of link

-	Uname      string    // user name of owner

-	Gname      string    // group name of owner

-	Devmajor   int64     // major number of character or block device

-	Devminor   int64     // minor number of character or block device

-	AccessTime time.Time // access time

-	ChangeTime time.Time // status change time

-	Xattrs     map[string]string

-}

-

-// File name constants from the tar spec.

-const (

-	fileNameSize       = 100 // Maximum number of bytes in a standard tar name.

-	fileNamePrefixSize = 155 // Maximum number of ustar extension bytes.

-)

-

-// FileInfo returns an os.FileInfo for the Header.

-func (h *Header) FileInfo() os.FileInfo {

-	return headerFileInfo{h}

-}

-

-// headerFileInfo implements os.FileInfo.

-type headerFileInfo struct {

-	h *Header

-}

-

-func (fi headerFileInfo) Size() int64        { return fi.h.Size }

-func (fi headerFileInfo) IsDir() bool        { return fi.Mode().IsDir() }

-func (fi headerFileInfo) ModTime() time.Time { return fi.h.ModTime }

-func (fi headerFileInfo) Sys() interface{}   { return fi.h }

-

-// Name returns the base name of the file.

-func (fi headerFileInfo) Name() string {

-	if fi.IsDir() {

-		return path.Base(path.Clean(fi.h.Name))

-	}

-	return path.Base(fi.h.Name)

-}

-

-// Mode returns the permission and mode bits for the headerFileInfo.

-func (fi headerFileInfo) Mode() (mode os.FileMode) {

-	// Set file permission bits.

-	mode = os.FileMode(fi.h.Mode).Perm()

-

-	// Set setuid, setgid and sticky bits.

-	if fi.h.Mode&c_ISUID != 0 {

-		// setuid

-		mode |= os.ModeSetuid

-	}

-	if fi.h.Mode&c_ISGID != 0 {

-		// setgid

-		mode |= os.ModeSetgid

-	}

-	if fi.h.Mode&c_ISVTX != 0 {

-		// sticky

-		mode |= os.ModeSticky

-	}

-

-	// Set file mode bits.

-	// clear perm, setuid, setgid and sticky bits.

-	m := os.FileMode(fi.h.Mode) &^ 07777

-	if m == c_ISDIR {

-		// directory

-		mode |= os.ModeDir

-	}

-	if m == c_ISFIFO {

-		// named pipe (FIFO)

-		mode |= os.ModeNamedPipe

-	}

-	if m == c_ISLNK {

-		// symbolic link

-		mode |= os.ModeSymlink

-	}

-	if m == c_ISBLK {

-		// device file

-		mode |= os.ModeDevice

-	}

-	if m == c_ISCHR {

-		// Unix character device

-		mode |= os.ModeDevice

-		mode |= os.ModeCharDevice

-	}

-	if m == c_ISSOCK {

-		// Unix domain socket

-		mode |= os.ModeSocket

-	}

-

-	switch fi.h.Typeflag {

-	case TypeLink, TypeSymlink:

-		// hard link, symbolic link

-		mode |= os.ModeSymlink

-	case TypeChar:

-		// character device node

-		mode |= os.ModeDevice

-		mode |= os.ModeCharDevice

-	case TypeBlock:

-		// block device node

-		mode |= os.ModeDevice

-	case TypeDir:

-		// directory

-		mode |= os.ModeDir

-	case TypeFifo:

-		// fifo node

-		mode |= os.ModeNamedPipe

-	}

-

-	return mode

-}

-

-// sysStat, if non-nil, populates h from system-dependent fields of fi.

-var sysStat func(fi os.FileInfo, h *Header) error

-

-// Mode constants from the tar spec.

-const (

-	c_ISUID  = 04000   // Set uid

-	c_ISGID  = 02000   // Set gid

-	c_ISVTX  = 01000   // Save text (sticky bit)

-	c_ISDIR  = 040000  // Directory

-	c_ISFIFO = 010000  // FIFO

-	c_ISREG  = 0100000 // Regular file

-	c_ISLNK  = 0120000 // Symbolic link

-	c_ISBLK  = 060000  // Block special file

-	c_ISCHR  = 020000  // Character special file

-	c_ISSOCK = 0140000 // Socket

-)

-

-// Keywords for the PAX Extended Header

-const (

-	paxAtime    = "atime"

-	paxCharset  = "charset"

-	paxComment  = "comment"

-	paxCtime    = "ctime" // please note that ctime is not a valid pax header.

-	paxGid      = "gid"

-	paxGname    = "gname"

-	paxLinkpath = "linkpath"

-	paxMtime    = "mtime"

-	paxPath     = "path"

-	paxSize     = "size"

-	paxUid      = "uid"

-	paxUname    = "uname"

-	paxXattr    = "SCHILY.xattr."

-	paxNone     = ""

-)

-

-// FileInfoHeader creates a partially-populated Header from fi.

-// If fi describes a symlink, FileInfoHeader records link as the link target.

-// If fi describes a directory, a slash is appended to the name.

-// Because os.FileInfo's Name method returns only the base name of

-// the file it describes, it may be necessary to modify the Name field

-// of the returned header to provide the full path name of the file.

-func FileInfoHeader(fi os.FileInfo, link string) (*Header, error) {

-	if fi == nil {

-		return nil, errors.New("tar: FileInfo is nil")

-	}

-	fm := fi.Mode()

-	h := &Header{

-		Name:    fi.Name(),

-		ModTime: fi.ModTime(),

-		Mode:    int64(fm.Perm()), // or'd with c_IS* constants later

-	}

-	switch {

-	case fm.IsRegular():

-		h.Mode |= c_ISREG

-		h.Typeflag = TypeReg

-		h.Size = fi.Size()

-	case fi.IsDir():

-		h.Typeflag = TypeDir

-		h.Mode |= c_ISDIR

-		h.Name += "/"

-	case fm&os.ModeSymlink != 0:

-		h.Typeflag = TypeSymlink

-		h.Mode |= c_ISLNK

-		h.Linkname = link

-	case fm&os.ModeDevice != 0:

-		if fm&os.ModeCharDevice != 0 {

-			h.Mode |= c_ISCHR

-			h.Typeflag = TypeChar

-		} else {

-			h.Mode |= c_ISBLK

-			h.Typeflag = TypeBlock

-		}

-	case fm&os.ModeNamedPipe != 0:

-		h.Typeflag = TypeFifo

-		h.Mode |= c_ISFIFO

-	case fm&os.ModeSocket != 0:

-		h.Mode |= c_ISSOCK

-	default:

-		return nil, fmt.Errorf("archive/tar: unknown file mode %v", fm)

-	}

-	if fm&os.ModeSetuid != 0 {

-		h.Mode |= c_ISUID

-	}

-	if fm&os.ModeSetgid != 0 {

-		h.Mode |= c_ISGID

-	}

-	if fm&os.ModeSticky != 0 {

-		h.Mode |= c_ISVTX

-	}

-	if sysStat != nil {

-		return h, sysStat(fi, h)

-	}

-	return h, nil

-}

-

-var zeroBlock = make([]byte, blockSize)

-

-// POSIX specifies a sum of the unsigned byte values, but the Sun tar uses signed byte values.

-// We compute and return both.

-func checksum(header []byte) (unsigned int64, signed int64) {

-	for i := 0; i < len(header); i++ {

-		if i == 148 {

-			// The chksum field (header[148:156]) is special: it should be treated as space bytes.

-			unsigned += ' ' * 8

-			signed += ' ' * 8

-			i += 7

-			continue

-		}

-		unsigned += int64(header[i])

-		signed += int64(int8(header[i]))

-	}

-	return

-}

-

-type slicer []byte

-

-func (sp *slicer) next(n int) (b []byte) {

-	s := *sp

-	b, *sp = s[0:n], s[n:]

-	return

-}

-

-func isASCII(s string) bool {

-	for _, c := range s {

-		if c >= 0x80 {

-			return false

-		}

-	}

-	return true

-}

-

-func toASCII(s string) string {

-	if isASCII(s) {

-		return s

-	}

-	var buf bytes.Buffer

-	for _, c := range s {

-		if c < 0x80 {

-			buf.WriteByte(byte(c))

-		}

-	}

-	return buf.String()

-}

deleted file mode 100644

@@ -1,79 +0,0 @@

-// Copyright 2013 The Go Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package tar_test

-

-import (

-	"archive/tar"

-	"bytes"

-	"fmt"

-	"io"

-	"log"

-	"os"

-)

-

-func Example() {

-	// Create a buffer to write our archive to.

-	buf := new(bytes.Buffer)

-

-	// Create a new tar archive.

-	tw := tar.NewWriter(buf)

-

-	// Add some files to the archive.

-	var files = []struct {

-		Name, Body string

-	}{

-		{"readme.txt", "This archive contains some text files."},

-		{"gopher.txt", "Gopher names:\nGeorge\nGeoffrey\nGonzo"},

-		{"todo.txt", "Get animal handling licence."},

-	}

-	for _, file := range files {

-		hdr := &tar.Header{

-			Name: file.Name,

-			Size: int64(len(file.Body)),

-		}

-		if err := tw.WriteHeader(hdr); err != nil {

-			log.Fatalln(err)

-		}

-		if _, err := tw.Write([]byte(file.Body)); err != nil {

-			log.Fatalln(err)

-		}

-	}

-	// Make sure to check the error on Close.

-	if err := tw.Close(); err != nil {

-		log.Fatalln(err)

-	}

-

-	// Open the tar archive for reading.

-	r := bytes.NewReader(buf.Bytes())

-	tr := tar.NewReader(r)

-

-	// Iterate through the files in the archive.

-	for {

-		hdr, err := tr.Next()

-		if err == io.EOF {

-			// end of tar archive

-			break

-		}

-		if err != nil {

-			log.Fatalln(err)

-		}

-		fmt.Printf("Contents of %s:\n", hdr.Name)

-		if _, err := io.Copy(os.Stdout, tr); err != nil {

-			log.Fatalln(err)

-		}

-		fmt.Println()

-	}

-

-	// Output:

-	// Contents of readme.txt:

-	// This archive contains some text files.

-	// Contents of gopher.txt:

-	// Gopher names:

-	// George

-	// Geoffrey

-	// Gonzo

-	// Contents of todo.txt:

-	// Get animal handling licence.

-}

deleted file mode 100644

@@ -1,820 +0,0 @@

-// Copyright 2009 The Go Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-package tar

-

-// TODO(dsymonds):

-//   - pax extensions

-

-import (

-	"bytes"

-	"errors"

-	"io"

-	"io/ioutil"

-	"os"

-	"strconv"

-	"strings"

-	"time"

-)

-

-var (

-	ErrHeader = errors.New("archive/tar: invalid tar header")

-)

-

-const maxNanoSecondIntSize = 9

-

-// A Reader provides sequential access to the contents of a tar archive.

-// A tar archive consists of a sequence of files.

-// The Next method advances to the next file in the archive (including the first),

-// and then it can be treated as an io.Reader to access the file's data.

-type Reader struct {

-	r       io.Reader

-	err     error

-	pad     int64           // amount of padding (ignored) after current file entry

-	curr    numBytesReader  // reader for current file entry

-	hdrBuff [blockSize]byte // buffer to use in readHeader

-}

-

-// A numBytesReader is an io.Reader with a numBytes method, returning the number

-// of bytes remaining in the underlying encoded data.

-type numBytesReader interface {

-	io.Reader

-	numBytes() int64

-}

-

-// A regFileReader is a numBytesReader for reading file data from a tar archive.

-type regFileReader struct {

-	r  io.Reader // underlying reader

-	nb int64     // number of unread bytes for current file entry

-}

-

-// A sparseFileReader is a numBytesReader for reading sparse file data from a tar archive.

-type sparseFileReader struct {

-	rfr *regFileReader // reads the sparse-encoded file data

-	sp  []sparseEntry  // the sparse map for the file

-	pos int64          // keeps track of file position

-	tot int64          // total size of the file

-}

-

-// Keywords for GNU sparse files in a PAX extended header

-const (

-	paxGNUSparseNumBlocks = "GNU.sparse.numblocks"

-	paxGNUSparseOffset    = "GNU.sparse.offset"

-	paxGNUSparseNumBytes  = "GNU.sparse.numbytes"

-	paxGNUSparseMap       = "GNU.sparse.map"

-	paxGNUSparseName      = "GNU.sparse.name"

-	paxGNUSparseMajor     = "GNU.sparse.major"

-	paxGNUSparseMinor     = "GNU.sparse.minor"

-	paxGNUSparseSize      = "GNU.sparse.size"

-	paxGNUSparseRealSize  = "GNU.sparse.realsize"

-)

-

-// Keywords for old GNU sparse headers

-const (

-	oldGNUSparseMainHeaderOffset               = 386

-	oldGNUSparseMainHeaderIsExtendedOffset     = 482

-	oldGNUSparseMainHeaderNumEntries           = 4

-	oldGNUSparseExtendedHeaderIsExtendedOffset = 504

-	oldGNUSparseExtendedHeaderNumEntries       = 21

-	oldGNUSparseOffsetSize                     = 12

-	oldGNUSparseNumBytesSize                   = 12

-)

-

-// NewReader creates a new Reader reading from r.

-func NewReader(r io.Reader) *Reader { return &Reader{r: r} }

-

-// Next advances to the next entry in the tar archive.

-func (tr *Reader) Next() (*Header, error) {

-	var hdr *Header

-	if tr.err == nil {

-		tr.skipUnread()

-	}

-	if tr.err != nil {

-		return hdr, tr.err

-	}

-	hdr = tr.readHeader()

-	if hdr == nil {

-		return hdr, tr.err

-	}

-	// Check for PAX/GNU header.

-	switch hdr.Typeflag {

-	case TypeXHeader:

-		//  PAX extended header

-		headers, err := parsePAX(tr)

-		if err != nil {

-			return nil, err

-		}

-		// We actually read the whole file,

-		// but this skips alignment padding

-		tr.skipUnread()

-		hdr = tr.readHeader()

-		mergePAX(hdr, headers)

-

-		// Check for a PAX format sparse file

-		sp, err := tr.checkForGNUSparsePAXHeaders(hdr, headers)

-		if err != nil {

-			tr.err = err

-			return nil, err

-		}

-		if sp != nil {

-			// Current file is a PAX format GNU sparse file.

-			// Set the current file reader to a sparse file reader.

-			tr.curr = &sparseFileReader{rfr: tr.curr.(*regFileReader), sp: sp, tot: hdr.Size}

-		}

-		return hdr, nil

-	case TypeGNULongName:

-		// We have a GNU long name header. Its contents are the real file name.

-		realname, err := ioutil.ReadAll(tr)

-		if err != nil {

-			return nil, err

-		}

-		hdr, err := tr.Next()

-		hdr.Name = cString(realname)

-		return hdr, err

-	case TypeGNULongLink:

-		// We have a GNU long link header.

-		realname, err := ioutil.ReadAll(tr)

-		if err != nil {

-			return nil, err

-		}

-		hdr, err := tr.Next()

-		hdr.Linkname = cString(realname)

-		return hdr, err

-	}

-	return hdr, tr.err

-}

-

-// checkForGNUSparsePAXHeaders checks the PAX headers for GNU sparse headers. If they are found, then

-// this function reads the sparse map and returns it. Unknown sparse formats are ignored, causing the file to

-// be treated as a regular file.

-func (tr *Reader) checkForGNUSparsePAXHeaders(hdr *Header, headers map[string]string) ([]sparseEntry, error) {

-	var sparseFormat string

-

-	// Check for sparse format indicators

-	major, majorOk := headers[paxGNUSparseMajor]

-	minor, minorOk := headers[paxGNUSparseMinor]

-	sparseName, sparseNameOk := headers[paxGNUSparseName]

-	_, sparseMapOk := headers[paxGNUSparseMap]

-	sparseSize, sparseSizeOk := headers[paxGNUSparseSize]

-	sparseRealSize, sparseRealSizeOk := headers[paxGNUSparseRealSize]

-

-	// Identify which, if any, sparse format applies from which PAX headers are set

-	if majorOk && minorOk {

-		sparseFormat = major + "." + minor

-	} else if sparseNameOk && sparseMapOk {

-		sparseFormat = "0.1"

-	} else if sparseSizeOk {

-		sparseFormat = "0.0"

-	} else {

-		// Not a PAX format GNU sparse file.

-		return nil, nil

-	}

-

-	// Check for unknown sparse format

-	if sparseFormat != "0.0" && sparseFormat != "0.1" && sparseFormat != "1.0" {

-		return nil, nil

-	}

-

-	// Update hdr from GNU sparse PAX headers

-	if sparseNameOk {

-		hdr.Name = sparseName

-	}

-	if sparseSizeOk {

-		realSize, err := strconv.ParseInt(sparseSize, 10, 0)

-		if err != nil {

-			return nil, ErrHeader

-		}

-		hdr.Size = realSize

-	} else if sparseRealSizeOk {

-		realSize, err := strconv.ParseInt(sparseRealSize, 10, 0)

-		if err != nil {

-			return nil, ErrHeader

-		}

-		hdr.Size = realSize

-	}

-

-	// Set up the sparse map, according to the particular sparse format in use

-	var sp []sparseEntry

-	var err error