Dont ignore EOF because users cannot distinguish EOF and empty input line

This commit is contained in:
Peter Conrad 2015-06-21 15:33:50 +02:00
parent dd1c77b327
commit 8ff0f3e764

View file

@ -78,17 +78,12 @@ namespace fc {
fc::istream& getline( fc::istream& i, fc::string& s, char delim ) {
fc::stringstream ss;
try
{
char c;
i.read( &c, 1 );
while( true ) {
if( c == delim ) { s = ss.str(); return i; }
if( c != '\r' ) ss.write(&c,1);
i.read( &c, 1 );
}
} catch ( fc::eof_exception& )
{
char c;
i.read( &c, 1 );
while( true ) {
if( c == delim ) { s = ss.str(); return i; }
if( c != '\r' ) ss.write(&c,1);
i.read( &c, 1 );
}
s = ss.str();
return i;