2004-09-19 Dick Porter <dick@ximian.com>
authorDick Porter <dick@acm.org>
Sun, 19 Sep 2004 12:52:12 +0000 (12:52 -0000)
committerDick Porter <dick@acm.org>
Sun, 19 Sep 2004 12:52:12 +0000 (12:52 -0000)
* Console.cs: Use the internal wrappers for StreamReader and
StreamWriter that catch IOException.

2004-09-19  Dick Porter  <dick@ximian.com>

* UnexceptionalStreamWriter.cs:
* UnexceptionalStreamReader.cs: Wrappers around StreamWriter and
StreamReader that catch IOException.  Used by System.Console so
that graphical applications dont get IO errors when their
stdin/out/err vanishes (ie when they spew debug output.)

svn path=/trunk/mcs/; revision=34062

mcs/class/corlib/System.IO/ChangeLog
mcs/class/corlib/System.IO/UnexceptionalStreamReader.cs [new file with mode: 0644]
mcs/class/corlib/System.IO/UnexceptionalStreamWriter.cs [new file with mode: 0644]
mcs/class/corlib/System/ChangeLog
mcs/class/corlib/System/Console.cs
mcs/class/corlib/corlib.dll.sources

index 153dd2892b94117574ecf85d94328cd1d22f0daf..f02d0e5cd278aae75663182adec710837136e3c1 100644 (file)
@@ -1,3 +1,11 @@
+2004-09-19  Dick Porter  <dick@ximian.com>
+
+       * UnexceptionalStreamWriter.cs: 
+       * UnexceptionalStreamReader.cs: Wrappers around StreamWriter and
+       StreamReader that catch IOException.  Used by System.Console so
+       that graphical applications dont get IO errors when their
+       stdin/out/err vanishes (ie when they spew debug output.)
+
 2004-09-12 Ben Maurer  <bmaurer@ximian.com>
 
        * BinaryReader.cs: Use ReadByte when possible. Gives a tad
diff --git a/mcs/class/corlib/System.IO/UnexceptionalStreamReader.cs b/mcs/class/corlib/System.IO/UnexceptionalStreamReader.cs
new file mode 100644 (file)
index 0000000..7c52745
--- /dev/null
@@ -0,0 +1,149 @@
+//
+// System.IO.UnexceptionalStreamReader.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Miguel de Icaza (miguel@ximian.com)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// Copyright (C) 2004 Novell (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.
+//
+
+
+// This is a wrapper around StreamReader used by System.Console that
+// catches IOException so that graphical applications don't suddenly
+// get IO errors when their terminal vanishes.  See
+// UnexceptionalStreamWriter too.
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace System.IO {
+       internal class UnexceptionalStreamReader : StreamReader {
+               public UnexceptionalStreamReader(Stream stream)
+                       : base (stream)
+               {
+               }
+
+               public UnexceptionalStreamReader(Stream stream, bool detect_encoding_from_bytemarks)
+                       : base (stream, detect_encoding_from_bytemarks)
+               {
+               }
+
+               public UnexceptionalStreamReader(Stream stream, Encoding encoding)
+                       : base (stream, encoding)
+               {
+               }
+
+               public UnexceptionalStreamReader(Stream stream, Encoding encoding, bool detect_encoding_from_bytemarks)
+                       : base (stream, encoding, detect_encoding_from_bytemarks)
+               {
+               }
+               
+               public UnexceptionalStreamReader(Stream stream, Encoding encoding, bool detect_encoding_from_bytemarks, int buffer_size)
+                       : base (stream, encoding, detect_encoding_from_bytemarks, buffer_size)
+               {
+               }
+
+               public UnexceptionalStreamReader(string path)
+                       : base (path)
+               {
+               }
+
+               public UnexceptionalStreamReader(string path, bool detect_encoding_from_bytemarks)
+                       : base (path, detect_encoding_from_bytemarks)
+               {
+               }
+
+               public UnexceptionalStreamReader(string path, Encoding encoding)
+                       : base (path, encoding)
+               {
+               }
+
+               public UnexceptionalStreamReader(string path, Encoding encoding, bool detect_encoding_from_bytemarks)
+                       : base (path, encoding, detect_encoding_from_bytemarks)
+               {
+               }
+               
+               public UnexceptionalStreamReader(string path, Encoding encoding, bool detect_encoding_from_bytemarks, int buffer_size)
+                       : base (path, encoding, detect_encoding_from_bytemarks, buffer_size)
+               {
+               }
+
+               public override int Peek ()
+               {
+                       try {
+                               return(base.Peek ());
+                       } catch (IOException) {
+                       }
+
+                       return(-1);
+               }
+
+               public override int Read ()
+               {
+                       try {
+                               return(base.Read ());
+                       } catch (IOException) {
+                       }
+
+                       return(-1);
+               }
+
+               public override int Read ([In, Out] char[] dest_buffer,
+                                         int index, int count)
+               {
+                       try {
+                               return(base.Read (dest_buffer, index, count));
+                       } catch (IOException) {
+                       }
+
+                       return(0);
+               }
+
+               public override string ReadLine()
+               {
+                       try {
+                               return(base.ReadLine ());
+                       } catch (IOException) {
+                       }
+
+                       return(null);
+               }
+
+               public override string ReadToEnd()
+               {
+                       try {
+                               return(base.ReadToEnd ());
+                       } catch (IOException) {
+                       }
+
+                       return(null);
+               }
+       }
+}
diff --git a/mcs/class/corlib/System.IO/UnexceptionalStreamWriter.cs b/mcs/class/corlib/System.IO/UnexceptionalStreamWriter.cs
new file mode 100644 (file)
index 0000000..db9fd58
--- /dev/null
@@ -0,0 +1,128 @@
+//
+// System.IO.StreamWriter.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Paolo Molaro (lupus@ximian.com)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 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.
+//
+
+
+// This is a wrapper around StreamWriter used by System.Console that
+// catches IOException so that graphical applications don't suddenly
+// get IO errors when their terminal vanishes (ie when they spew debug
+// output.)  See UnexceptionalStreamReader too.
+
+using System.Text;
+using System;
+
+namespace System.IO {
+       internal class UnexceptionalStreamWriter: StreamWriter {
+               public UnexceptionalStreamWriter (Stream stream)
+                       : base (stream)
+               {
+               }
+
+               public UnexceptionalStreamWriter (Stream stream,
+                                                 Encoding encoding)
+                       : base (stream, encoding)
+               {
+               }
+
+               public UnexceptionalStreamWriter (Stream stream,
+                                                 Encoding encoding,
+                                                 int bufferSize)
+                       : base (stream, encoding, bufferSize)
+               {
+               }
+
+               public UnexceptionalStreamWriter (string path)
+                       : base (path)
+               {
+               }
+
+               public UnexceptionalStreamWriter (string path, bool append)
+                       : base (path, append)
+               {
+               }
+
+               public UnexceptionalStreamWriter (string path, bool append,
+                                                 Encoding encoding)
+                       : base (path, append, encoding)
+               {
+               }
+
+               public UnexceptionalStreamWriter (string path, bool append,
+                                                 Encoding encoding,
+                                                 int bufferSize)
+                       : base (path, append, encoding, bufferSize)
+               {
+               }
+
+               public override void Flush ()
+               {
+                       try {
+                               base.Flush ();
+                       } catch (IOException) {
+                       }
+               }
+
+               public override void Write (char[] buffer, int index,
+                                           int count)
+               {
+                       try {
+                               base.Write (buffer, index, count);
+                       } catch (IOException) {
+                       }
+               }
+
+               public override void Write (char value)
+               {
+                       try {
+                               base.Write (value);
+                       } catch (IOException) {
+                       }
+               }
+
+               public override void Write (char[] value)
+               {
+                       try {
+                               base.Write (value);
+                       } catch (IOException) {
+                       }
+               }
+
+               public override void Write (string value)
+               {
+                       try {
+                               base.Write (value);
+                       } catch (IOException) {
+                       }
+               }
+       }
+}
index d76d7e5aea5b07e32290ace8b2038d2f3c1349a4..b818dc0f171420dad8773eb452bdaf293de37962 100644 (file)
@@ -1,3 +1,8 @@
+2004-09-19  Dick Porter  <dick@ximian.com>
+
+       * Console.cs: Use the internal wrappers for StreamReader and
+       StreamWriter that catch IOException.
+
 2004-09-16  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Environment.cs: Bumped mono_corlib_version to 25.
index 833232ee5fa1a203137df643e5ad22baa61f5787..8f6c38e6034b65e0d4b291ddf58260b3f2253e75 100644 (file)
@@ -69,15 +69,15 @@ namespace System
                                encoding = Encoding.Default;
                        }
 
-                       stderr = new StreamWriter (OpenStandardError (0), encoding); 
+                       stderr = new UnexceptionalStreamWriter (OpenStandardError (0), encoding); 
                        ((StreamWriter)stderr).AutoFlush = true;
                        stderr = TextWriter.Synchronized (stderr, true);
 
-                       stdout = new StreamWriter (OpenStandardOutput (0), encoding);
+                       stdout = new UnexceptionalStreamWriter (OpenStandardOutput (0), encoding);
                        ((StreamWriter)stdout).AutoFlush = true;
                        stdout = TextWriter.Synchronized (stdout, true);
 
-                       stdin  = new StreamReader (OpenStandardInput (0), encoding);
+                       stdin  = new UnexceptionalStreamReader (OpenStandardInput (0), encoding);
                        stdin = TextReader.Synchronized (stdin);
                }
 
index ae6b4bcf3f2546f69acea733e849ce39470f7737..cbda8f198b35a159d54d7977a30aac46af19c6ca 100755 (executable)
@@ -319,6 +319,8 @@ System.IO/StringReader.cs
 System.IO/StringWriter.cs
 System.IO/TextReader.cs
 System.IO/TextWriter.cs
+System.IO/UnexceptionalStreamReader.cs
+System.IO/UnexceptionalStreamWriter.cs
 System.IO.IsolatedStorage/INormalizeForIsolatedStorage.cs
 System.IO.IsolatedStorage/IsolatedStorage.cs
 System.IO.IsolatedStorage/IsolatedStorageException.cs