/* Copyright (c) 2008, Avian Contributors

   Permission to use, copy, modify, and/or distribute this software
   for any purpose with or without fee is hereby granted, provided
   that the above copyright notice and this permission notice appear
   in all copies.

   There is NO WARRANTY for this software.  See license.txt for
   details. */

package java.io;

public class BufferedReader extends Reader {
	private final Reader in;
	private final char[] buffer;
	private int position;
	private int limit;

	public BufferedReader (Reader in, int bufferSize) {
		this.in = in;
		this.buffer = new char[bufferSize];
	}

	public BufferedReader (Reader in) {
		this(in, 32);
	}

	private void fill () throws IOException {
		position = 0;
		limit = in.read(buffer);
	}

	public String readLine () throws IOException {
		StringBuilder sb = new StringBuilder();
		while (true) {
			if (position >= limit) {
				fill();
			}

			if (position >= limit) {
				return sb.length() == 0 ? null : sb.toString();
			}

			for (int i = position; i < limit; ++i) {
				if (buffer[i] == '\r') {
					sb.append(buffer, position, i - position);
					position = i + 1;
					if (i + 1 < limit) {
						if (buffer[i + 1] == '\n') {
							position = i + 2;
						}
					} else {
						fill();
						if (buffer[position] == '\n') {
							position += 1;
						}
					}
					return sb.toString();
				} else if (buffer[i] == '\n') {
					sb.append(buffer, position, i - position);
					position = i + 1;
					return sb.toString();
				}
			}
			sb.append(buffer, position, limit - position);
			position = limit;
		}
	}

	public int read (char[] b, int offset, int length) throws IOException {
		int count = 0;

		if (position >= limit && length < buffer.length) {
			fill();
		}

		if (position < limit) {
			int remaining = limit - position;
			if (remaining > length) {
				remaining = length;
			}

			System.arraycopy(buffer, position, b, offset, remaining);

			count += remaining;
			position += remaining;
			offset += remaining;
			length -= remaining;
		}

		if (length > 0) {
			int c = in.read(b, offset, length);
			if (c == -1) {
				if (count == 0) {
					count = -1;
				}
			} else {
				count += c;
			}
		}

		return count;
	}

	public void close () throws IOException {
		in.close();
	}
}

@@ -689,9 +689,11 @@
 in, 
-3
+819
 2);%0D

Increase default buffer size to limit utf8 corruption, see #3350