Reverted the previous change to read() and readline().

Kevin Jacobs found that the code simplification did not
exactly match the semantics of the original.  Regression
test cases were requested.