[mono-config] use right type for result of strlen

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

diff --git a/mcs/class/corlib/System.IO/IntPtrStream.cs b/mcs/class/corlib/System.IO/IntPtrStream.cs
index b43c6bc8d0801b6de4a8b0b3539949549d2e68fa..40b1c580f6242647a72dcbccf64851951bba8b5a 100644 (file)
--- a/mcs/class/corlib/System.IO/IntPtrStream.cs
+++ b/mcs/class/corlib/System.IO/IntPtrStream.cs
@@ -14,18 +14,55 @@
 // (c) 2003 Ximian, Inc. (http://www.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.Runtime.InteropServices;
 namespace System.IO {
 
        internal class IntPtrStream : Stream {
-               IntPtr base_address;
+               unsafe byte *base_address;
                int size;
                int position;
+               bool closed;
+
+               public event EventHandler Closed;
                
                public IntPtrStream (IntPtr base_address, int size)
                {
-                       this.base_address = base_address;
+                       unsafe {
+                               this.base_address = (byte*)((void *)base_address);
+                       }
                        this.size = size;
+                       position = 0;
+               }
+
+               internal IntPtr BaseAddress {
+                       get {
+                               unsafe {
+                                       return new IntPtr ((void*) base_address);
+                               }
+                       }
                }
 
                public override bool CanRead {
@@ -79,13 +116,18 @@ namespace System.IO {
                                throw new ArgumentException ("offset+count",
                                                              "The size of the buffer is less than offset + count.");
 
+                       if (closed)
+                               throw new ObjectDisposedException ("Stream has been closed");
+
                        if (position >= size || count == 0)
                                return 0;
 
                        if (position > size - count)
                                count = size - position;
 
-                       Marshal.Copy (base_address, buffer, offset, count);
+                       unsafe {
+                               Marshal.Copy ((IntPtr) (base_address + position), buffer, offset, count);
+                       }
                        position += count;
                        return count;
                }
@@ -95,9 +137,11 @@ namespace System.IO {
                        if (position >= size)
                                return -1;
 
+                       if (closed)
+                               throw new ObjectDisposedException ("Stream has been closed");
+
                        unsafe {
-                               byte *p = (byte*)base_address;
-                               return p [position++];
+                               return base_address [position++];
                        }
                }
 
@@ -107,6 +151,9 @@ namespace System.IO {
                        if (offset > (long) Int32.MaxValue)
                                throw new ArgumentOutOfRangeException ("Offset out of range. " + offset);
 
+                       if (closed)
+                               throw new ObjectDisposedException ("Stream has been closed");
+
                        int ref_point;
                        switch (loc) {
                        case SeekOrigin.Begin:
@@ -157,5 +204,13 @@ namespace System.IO {
                public override void Flush ()
                {
                }
+
+               public override void Close ()
+               {
+                       closed = true;
+
+                       if (Closed != null)
+                               Closed (this, null);
+               }
        }
 }