Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #42 from pmconrad/getline_eof

Browse source 
Dont ignore EOF because users cannot distinguish EOF and empty input …
This commit is contained in:
Vikram Rajkumar 2015-06-21 22:15:05 -04:00
commit a8b85f6dcc
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/io/iostream.cpp
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;