2004-12-03 Lluis Sanchez Gual <lluis@novell.com>

[mono.git] / mcs / class / corlib / System.IO / BinaryReader.cs

diff --git a/mcs/class/corlib/System.IO/BinaryReader.cs b/mcs/class/corlib/System.IO/BinaryReader.cs
index bf8a2fc71e828d95307a5ed4319e5603d6bda295..7958b70efb0a40521488a6e03209415214e26922 100644 (file)
--- a/mcs/class/corlib/System.IO/BinaryReader.cs
+++ b/mcs/class/corlib/System.IO/BinaryReader.cs
@@ -6,6 +6,29 @@
 //   Dick Porter (dick@ximian.com)
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Text;
 using System.Globalization;
@@ -231,17 +254,17 @@ namespace System.IO {
                }
 
                public virtual bool ReadBoolean() {
-                       FillBuffer(1);
-
                        // Return value:
                        //  true if the byte is non-zero; otherwise false.
-                       return(m_buffer[0] != 0);
+                       return ReadByte() != 0;
                }
 
                public virtual byte ReadByte() {
-                       FillBuffer(1);
-
-                       return(m_buffer[0]);
+                       int val = m_stream.ReadByte ();
+                       if (val != -1)
+                               return (byte) val;
+                       
+                       throw new EndOfStreamException ();
                }
 
                public virtual byte[] ReadBytes(int count) {
@@ -383,9 +406,7 @@ namespace System.IO {
 
                [CLSCompliant(false)]
                public virtual sbyte ReadSByte() {
-                       FillBuffer(1);
-
-                       return((sbyte)m_buffer[0]);
+                       return (sbyte) ReadByte ();
                }
 
                public virtual string ReadString() {