namespace System.IO {
[Serializable]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public class StreamReader : TextReader {
const int DefaultBufferSize = 1024;
Stream base_stream;
bool mayBlock;
+ StringBuilder line_builder;
private class NullStreamReader : StreamReader {
public override int Peek ()
if (buffer_size <= 0)
throw new ArgumentOutOfRangeException ("buffer_size", "The minimum size of the buffer must be positive");
- string DirName = Path.GetDirectoryName(path);
- if (DirName != String.Empty && !Directory.Exists(DirName))
- throw new DirectoryNotFoundException ("Directory '" + DirName + "' not found.");
- if (!File.Exists(path))
- throw new FileNotFoundException("File not found.", path);
-
Stream stream = (Stream) File.OpenRead (path);
Initialize (stream, encoding, detect_encoding_from_bytemarks, buffer_size);
}
do_checks = detect_encoding_from_bytemarks ? 1 : 0;
do_checks += (preamble.Length == 0) ? 0 : 2;
- decoded_buffer = new char [encoding.GetMaxCharCount (buffer_size)];
+ // since GetChars() might add flushed character, it
+ // should have additional char buffer for extra 1
+ // (probably 1 is ok, but might be insufficient. I'm not sure)
+ decoded_buffer = new char [encoding.GetMaxCharCount (buffer_size) + 1];
decoded_count = 0;
pos = 0;
}
}
}
+#if NET_2_0
+ public bool EndOfStream {
+ get { return Peek () < 0; }
+ }
+#endif
+
public override void Close ()
{
Dispose (true);
if (count < 2)
return 0;
- if (input_buffer [0] == 0xfe && input_buffer [1] == 0xff){
- this.encoding = Encoding.BigEndianUnicode;
+#if !NET_2_0
+ if (input_buffer [0] == 0xff && input_buffer [1] == 0xfe){
+ this.encoding = Encoding.Unicode;
return 2;
}
+#endif
- if (input_buffer [0] == 0xff && input_buffer [1] == 0xfe){
- this.encoding = Encoding.Unicode;
+ if (input_buffer [0] == 0xfe && input_buffer [1] == 0xff){
+ this.encoding = Encoding.BigEndianUnicode;
return 2;
}
this.encoding = Encoding.UTF8Unmarked;
return 3;
}
+
+#if NET_2_0
+ if (count < 4) {
+ if (input_buffer [0] == 0xff && input_buffer [1] == 0xfe && input_buffer [2] != 0) {
+ this.encoding = Encoding.Unicode;
+ return 2;
+ }
+ return 0;
+ }
+
+ if (input_buffer [0] == 0 && input_buffer [1] == 0
+ && input_buffer [2] == 0xfe && input_buffer [3] == 0xff)
+ {
+ this.encoding = Encoding.BigEndianUTF32;
+ return 4;
+ }
+
+ if (input_buffer [0] == 0xff && input_buffer [1] == 0xfe) {
+ if (input_buffer [2] == 0 && input_buffer[3] == 0) {
+ this.encoding = Encoding.UTF32;
+ return 4;
+ }
+
+ this.encoding = Encoding.Unicode;
+ return 2;
+ }
+#endif
}
return 0;
{
pos = decoded_count = 0;
mayBlock = false;
+ // Discard internal state of the decoder too.
+ decoder = encoding.GetDecoder ();
}
// the buffer is empty, fill it again
{
cbEncoded = base_stream.Read (input_buffer, 0, buffer_size);
- if (cbEncoded == 0)
+ if (cbEncoded <= 0)
return 0;
mayBlock = (cbEncoded < buffer_size);
index += cch;
count -= cch;
chars_read += cch;
+ if (mayBlock)
+ break;
}
return chars_read;
}
+ bool foundCR;
+ int FindNextEOL ()
+ {
+ char c = '\0';
+ for (; pos < decoded_count; pos++) {
+ c = decoded_buffer [pos];
+ if (c == '\n') {
+ pos++;
+ int res = (foundCR) ? (pos - 2) : (pos - 1);
+ if (res < 0)
+ res = 0; // if a new buffer starts with a \n and there was a \r at
+ // the end of the previous one, we get here.
+ foundCR = false;
+ return res;
+ } else if (foundCR) {
+ foundCR = false;
+ return pos - 1;
+ }
+
+ foundCR = (c == '\r');
+ }
+
+ return -1;
+ }
+
public override string ReadLine()
{
if (base_stream == null)
throw new ObjectDisposedException ("StreamReader", "Cannot read from a closed StreamReader");
-
- bool foundCR = false;
- StringBuilder text = new StringBuilder ();
- while (true) {
- int c = Read ();
+ if (pos >= decoded_count && ReadBuffer () == 0)
+ return null;
- if (c == -1) { // end of stream
- if (text.Length == 0)
- return null;
+ int begin = pos;
+ int end = FindNextEOL ();
+ if (end < decoded_count && end >= begin)
+ return new string (decoded_buffer, begin, end - begin);
- if (foundCR)
- text.Length--;
+ if (line_builder == null)
+ line_builder = new StringBuilder ();
+ else
+ line_builder.Length = 0;
- break;
+ while (true) {
+ if (foundCR) // don't include the trailing CR if present
+ decoded_count--;
+
+ line_builder.Append (decoded_buffer, begin, decoded_count - begin);
+ if (ReadBuffer () == 0) {
+ if (line_builder.Capacity > 32768) {
+ StringBuilder sb = line_builder;
+ line_builder = null;
+ return sb.ToString (0, sb.Length);
+ }
+ return line_builder.ToString (0, line_builder.Length);
}
- if (c == '\n') { // newline
- if ((text.Length > 0) && (text [text.Length - 1] == '\r'))
- text.Length--;
-
- foundCR = false;
- break;
- } else if (foundCR) {
- pos--;
- text.Length--;
- break;
+ begin = pos;
+ end = FindNextEOL ();
+ if (end < decoded_count && end >= begin) {
+ line_builder.Append (decoded_buffer, begin, end - begin);
+ if (line_builder.Capacity > 32768) {
+ StringBuilder sb = line_builder;
+ line_builder = null;
+ return sb.ToString (0, sb.Length);
+ }
+ return line_builder.ToString (0, line_builder.Length);
}
-
- if (c == '\r')
- foundCR = true;
-
-
- text.Append ((char) c);
}
-
- return text.ToString ();
}
public override string ReadToEnd()
char [] buffer = new char [size];
int len;
- while ((len = Read (buffer, 0, size)) != 0)
+ while ((len = Read (buffer, 0, size)) > 0)
text.Append (buffer, 0, len);
return text.ToString ();
projects / mono.git / blobdiff