Dont ignore EOF because users cannot distinguish EOF and empty input line
This commit is contained in:
parent
dd1c77b327
commit
8ff0f3e764
1 changed files with 6 additions and 11 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue