merge -r 53370:58178

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

diff --git a/mcs/class/corlib/System.IO/StreamWriter.cs b/mcs/class/corlib/System.IO/StreamWriter.cs
index 117ab7f5d60d3956726125d94fccec22526b9832..c3eac0a994f16078f05a0a3ddc19fd21f5ecb6d8 100644 (file)
--- a/mcs/class/corlib/System.IO/StreamWriter.cs
+++ b/mcs/class/corlib/System.IO/StreamWriter.cs
@@ -72,6 +72,10 @@ namespace System.IO {
                        int BufferSize = Math.Max(bufferSize, MinimumBufferSize);\r
                        decode_buf = new char [BufferSize];\r
                        byte_buf = new byte [encoding.GetMaxByteCount (BufferSize)];\r
+
+                       // Fixes bug http://bugzilla.ximian.com/show_bug.cgi?id=74513
+                       if (internalStream.CanSeek && internalStream.Position > 0)
+                               preamble_done = true;
                }\r
 \r
                //[MonoTODO("Nothing is done with bufferSize")]\r
@@ -137,12 +141,16 @@ namespace System.IO {
                        get {\r
                                return iflush;\r
                        }\r
-                       set {\r
-                               if (DisposedAlready)\r
-                                       throw new ObjectDisposedException("StreamWriter");\r
-                               iflush = value;\r
-                       }\r
-               }\r
+                       set {
+                               if (DisposedAlready)
+                                       throw new ObjectDisposedException("StreamWriter");
+                               iflush = value;
+
+                               if (iflush) {
+                                       Flush ();
+                               }
+                       }
+               }
 \r
                public virtual Stream BaseStream {\r
                        get {\r
@@ -245,6 +253,28 @@ namespace System.IO {
                                index += todo;\r
                                decode_pos += todo;\r
                        }\r
+               }
+               
+               void LowLevelWrite (string s)
+               {
+                       int count = s.Length;
+                       int index = 0;
+                       while (count > 0) {
+                               int todo = decode_buf.Length - decode_pos;
+                               if (todo == 0) {
+                                       Decode ();
+                                       todo = decode_buf.Length;
+                               }
+                               if (todo > count)
+                                       todo = count;
+                               
+                               for (int i = 0; i < todo; i ++)
+                                       decode_buf [i + decode_pos] = s [i + index];
+                               
+                               count -= todo;
+                               index += todo;
+                               decode_pos += todo;
+                       }
                }\r
 \r
                public override void Write (char value)\r
@@ -278,7 +308,8 @@ namespace System.IO {
                                throw new ObjectDisposedException("StreamWriter");\r
 \r
                        if (value != null)\r
-                               LowLevelWrite (value.ToCharArray (), 0, value.Length);\r
+                               LowLevelWrite (value);
+                       \r
                        if (iflush)\r
                                Flush ();\r
                }\r