2004-07-05 Dick Porter <dick@ximian.com>

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

diff --git a/mcs/class/corlib/System.IO/FileStream.cs b/mcs/class/corlib/System.IO/FileStream.cs
index feb56c90a349f9a6e8e236646672588c9c3f0f77..01b726a0b9231409c6160bfaa893465e37b0f065 100644 (file)
--- a/mcs/class/corlib/System.IO/FileStream.cs
+++ b/mcs/class/corlib/System.IO/FileStream.cs
@@ -10,6 +10,29 @@
 // (c) 2004 Novell, Inc. (http://www.novell.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.Collections;
 using System.Globalization;
@@ -80,7 +103,7 @@ namespace System.IO
                        : this (name, mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.Read, DefaultBufferSize, false) { }
 
                public FileStream (string name, FileMode mode, FileAccess access)
-                       : this (name, mode, access, FileShare.ReadWrite, DefaultBufferSize, false) { }
+                       : this (name, mode, access, access == FileAccess.Write ? FileShare.None : FileShare.Read, DefaultBufferSize, false) { }
 
                public FileStream (string name, FileMode mode, FileAccess access, FileShare share)
                        : this (name, mode, access, share, DefaultBufferSize, false) { }
@@ -98,6 +121,9 @@ namespace System.IO
                                throw new ArgumentException ("Name is empty");
                        }
 
+                       if (bufferSize <= 0)
+                               throw new ArgumentOutOfRangeException ("Positive number required.");
+
                        if (mode < FileMode.CreateNew || mode > FileMode.Append)
                                throw new ArgumentOutOfRangeException ("mode");
 
@@ -129,7 +155,7 @@ namespace System.IO
 
                        if (access == FileAccess.Read && mode != FileMode.Create && mode != FileMode.OpenOrCreate &&
                                        mode != FileMode.CreateNew && !File.Exists (name))
-                               throw new FileNotFoundException ("Could not find file \"" + name + "\".");
+                               throw new FileNotFoundException ("Could not find file \"" + name + "\".", name);
 
                        if (mode == FileMode.CreateNew) {
                                string dname = Path.GetDirectoryName (name);
@@ -712,17 +738,14 @@ namespace System.IO
                        if (handle == MonoIO.InvalidHandle)
                                throw new ObjectDisposedException ("Stream has been closed");
 
-                       if(CanSeek == false) {
+                       if(CanSeek == false)
                                throw new NotSupportedException("The stream does not support seeking");
-                       }
 
-                       if(CanWrite == false) {
+                       if(CanWrite == false)
                                throw new NotSupportedException("The stream does not support writing");
-                       }
 
-                       if(length < 0) {
+                       if(length < 0)
                                throw new ArgumentOutOfRangeException("Length is less than 0");
-                       }
                        
                        Flush ();
 
@@ -942,18 +965,15 @@ namespace System.IO
                        /* when async == true, if we get here we don't suport AIO or it's disabled
                         * and we're using the threadpool */
                        amount = MonoIO.Read (handle, buf, offset, count, out error);
-                       if (error != MonoIOError.ERROR_SUCCESS) {
+                       if (error == MonoIOError.ERROR_BROKEN_PIPE) {
+                               amount = 0; // might not be needed, but well...
+                       } else if (error != MonoIOError.ERROR_SUCCESS) {
                                throw MonoIO.GetException (name, error);
                        }
                        
                        /* Check for read error */
                        if(amount == -1) {
-                               /* Kludge around broken pipes */
-                               if(error == MonoIOError.ERROR_BROKEN_PIPE) {
-                                       amount = 0;
-                               } else {
-                                       throw new IOException ();
-                               }
+                               throw new IOException ();
                        }
                        
                        return(amount);