Update Go library to last weekly.

From-SVN: r180552

5 files changed, 47 insertions, 27 deletions

diff --git a/libgo/go/archive/tar/common.go b/libgo/go/archive/tar/common.go
index 5288587..6735508 100644
--- a/libgo/go/archive/tar/common.go
+++ b/libgo/go/archive/tar/common.go
@@ -15,36 +15,37 @@ const (
 	blockSize = 512
 
 	// Types
-	TypeReg           = '0'
-	TypeRegA          = '\x00'
-	TypeLink          = '1'
-	TypeSymlink       = '2'
-	TypeChar          = '3'
-	TypeBlock         = '4'
-	TypeDir           = '5'
-	TypeFifo          = '6'
-	TypeCont          = '7'
-	TypeXHeader       = 'x'
-	TypeXGlobalHeader = 'g'
+	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.
 )
 
 // A Header represents a single header in a tar archive.
 // Some fields may not be populated.
 type Header struct {
-	Name     string
-	Mode     int64
-	Uid      int
-	Gid      int
-	Size     int64
-	Mtime    int64
-	Typeflag byte
-	Linkname string
-	Uname    string
-	Gname    string
-	Devmajor int64
-	Devminor int64
-	Atime    int64
-	Ctime    int64
+	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.
+	Mtime    int64  // modified time; seconds since epoch.
+	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.
+	Atime    int64  // access time; seconds since epoch.
+	Ctime    int64  // status change time; seconds since epoch.
+
 }
 
 var zeroBlock = make([]byte, blockSize)
diff --git a/libgo/go/archive/tar/reader.go b/libgo/go/archive/tar/reader.go
index 45d95c3..12de2ad 100644
--- a/libgo/go/archive/tar/reader.go
+++ b/libgo/go/archive/tar/reader.go
@@ -94,7 +94,7 @@ func (tr *Reader) skipUnread() {
 			return
 		}
 	}
-	_, tr.err = io.Copyn(ioutil.Discard, tr.r, nr)
+	_, tr.err = io.CopyN(ioutil.Discard, tr.r, nr)
 }
 
 func (tr *Reader) verifyChecksum(header []byte) bool {
diff --git a/libgo/go/archive/tar/testdata/writer.tar b/libgo/go/archive/tar/testdata/writer.tar
index 0358f91..e6d816a 100644
--- a/libgo/go/archive/tar/testdata/writer.tar
+++ b/libgo/go/archive/tar/testdata/writer.tar
diff --git a/libgo/go/archive/tar/writer.go b/libgo/go/archive/tar/writer.go
index 8673bad..c6ce224 100644
--- a/libgo/go/archive/tar/writer.go
+++ b/libgo/go/archive/tar/writer.go
@@ -134,7 +134,7 @@ func (tw *Writer) WriteHeader(hdr *Header) os.Error {
 	tw.numeric(s.next(12), hdr.Mtime)      // 136:148
 	s.next(8)                              // chksum (148:156)
 	s.next(1)[0] = hdr.Typeflag            // 156:157
-	s.next(100)                            // linkname (157:257)
+	tw.cString(s.next(100), hdr.Linkname)  // linkname (157:257)
 	copy(s.next(8), []byte("ustar\x0000")) // 257:265
 	tw.cString(s.next(32), hdr.Uname)      // 265:297
 	tw.cString(s.next(32), hdr.Gname)      // 297:329
diff --git a/libgo/go/archive/tar/writer_test.go b/libgo/go/archive/tar/writer_test.go
index 838cb7e..6cc9386 100644
--- a/libgo/go/archive/tar/writer_test.go
+++ b/libgo/go/archive/tar/writer_test.go
@@ -24,6 +24,10 @@ type writerTest struct {
 }
 
 var writerTests = []*writerTest{
+	// The writer test file was produced with this command:
+	// tar (GNU tar) 1.26
+	//   ln -s small.txt link.txt
+	//   tar -b 1 --format=ustar -c -f writer.tar small.txt small2.txt link.txt
 	&writerTest{
 		file: "testdata/writer.tar",
 		entries: []*writerTestEntry{
@@ -55,6 +59,21 @@ var writerTests = []*writerTest{
 				},
 				contents: "Google.com\n",
 			},
+			&writerTestEntry{
+				header: &Header{
+					Name:     "link.txt",
+					Mode:     0777,
+					Uid:      1000,
+					Gid:      1000,
+					Size:     0,
+					Mtime:    1314603082,
+					Typeflag: '2',
+					Linkname: "small.txt",
+					Uname:    "strings",
+					Gname:    "strings",
+				},
+				// no contents
+			},
 		},
 	},
 	// The truncated test file was produced using these commands: