introduce os.EOF and io.ErrUnexpectedEOF.

remove io.ErrEOF.
rename io.FullRead to io.ReadFull, to match
   ReadAtLeast and ReadAll.
remove io.FullReader, because it is now unused.

R=r
DELTA=295  (88 added, 105 deleted, 102 changed)
OCL=30544
CL=30588

2 files changed, 5 insertions, 20 deletions

diff --git a/src/pkg/bufio/bufio.go b/src/pkg/bufio/bufio.go
index 7bfbb089f..520fd3afc 100644
--- a/src/pkg/bufio/bufio.go
+++ b/src/pkg/bufio/bufio.go
@@ -113,7 +113,7 @@ func (b *Reader) fill() os.Error {
 // It returns the number of bytes read into p.
 // If nn < len(p), also returns an error explaining
 // why the read is short.  At EOF, the count will be
-// zero and err will be io.ErrEOF.
+// zero and err will be os.EOF.
 func (b *Reader) Read(p []byte) (nn int, err os.Error) {
 	nn = 0;
 	for len(p) > 0 {
@@ -131,18 +131,12 @@ func (b *Reader) Read(p []byte) (nn int, err os.Error) {
 				if b.err != nil {
 					return nn, b.err
 				}
-				if n == 0 {
-					return nn, io.ErrEOF
-				}
 				continue;
 			}
 			b.fill();
 			if b.err != nil {
 				return nn, b.err
 			}
-			if b.w == b.r {
-				return nn, io.ErrEOF
-			}
 		}
 		if n > b.w - b.r {
 			n = b.w - b.r
@@ -164,9 +158,6 @@ func (b *Reader) ReadByte() (c byte, err os.Error) {
 		if b.err != nil {
 			return 0, b.err
 		}
-		if b.w == b.r {
-			return 0, io.ErrEOF
-		}
 	}
 	c = b.buf[b.r];
 	b.r++;
@@ -205,9 +196,6 @@ func (b *Reader) ReadRune() (rune int, size int, err os.Error) {
 		}
 		if b.w - b.r == n {
 			// no bytes read
-			if b.r == b.w {
-				return 0, 0, io.ErrEOF
-			}
 			break;
 		}
 	}
@@ -259,12 +247,9 @@ func (b *Reader) ReadLineSlice(delim byte) (line []byte, err os.Error) {
 		n := b.Buffered();
 		b.fill();
 		if b.err != nil {
-			return nil, b.err
-		}
-		if b.Buffered() == n {	// no data added; end of file
 			line := b.buf[b.r:b.w];
 			b.r = b.w;
-			return line, io.ErrEOF
+			return line, b.err
 		}
 
 		// Search new part of buffer
diff --git a/src/pkg/bufio/bufio_test.go b/src/pkg/bufio/bufio_test.go
index 6e5135df7..dfb9e3ac8 100644
--- a/src/pkg/bufio/bufio_test.go
+++ b/src/pkg/bufio/bufio_test.go
@@ -46,7 +46,7 @@ func readBytes(buf *Reader) string {
 	nb := 0;
 	for {
 		c, e := buf.ReadByte();
-		if e == io.ErrEOF {
+		if e == os.EOF {
 			break
 		}
 		if e != nil {
@@ -88,7 +88,7 @@ func readLines(b *Reader) string {
 	s := "";
 	for {
 		s1, e := b.ReadLineString('\n', true);
-		if e == io.ErrEOF {
+		if e == os.EOF {
 			break
 		}
 		if e != nil {
@@ -106,7 +106,7 @@ func reads(buf *Reader, m int) string {
 	for {
 		n, e := buf.Read(b[nb:nb+m]);
 		nb += n;
-		if e == io.ErrEOF {
+		if e == os.EOF {
 			break
 		}
 	}