interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed EOF behavior.

This commit is contained in:
Pietro Gagliardi 2018-05-22 21:23:38 -04:00
parent c38564a8f7
commit a5e07be2f5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
windows/tools/hresultwrap.cpp
View File

@ -10,6 +10,7 @@ class Scanner {
size_t n; size_t n;
std::vector<char> *line; std::vector<char> *line;
bool eof; bool eof;
bool eofNextTime;
bool error; bool error;
public: public:
Scanner(FILE *fin); Scanner(FILE *fin);
@ -68,11 +69,19 @@ bool Scanner::Scan(void)
// otherwise, the buffer was exhausted in the middle of a line, so fall through // otherwise, the buffer was exhausted in the middle of a line, so fall through
} }
// need to refill the buffer // need to refill the buffer
if (this->eofNextTime) {
this->eof = true;
return false;
}
this->n = fread(this->buf, sizeof (char), nbuf, this->fin); this->n = fread(this->buf, sizeof (char), nbuf, this->fin);
if (this->n < nbuf) { if (this->n < nbuf) {
// TODO what if this->eof && this->error? the C standard does not expressly disallow this // TODO what if this->eofNextTime && this->error? the C standard does not expressly disallow this
this->eof = feof(this->fin) != 0; this->eofNextTime = feof(this->fin) != 0;
this->error = ferror(this->fin) != 0; this->error = ferror(this->fin) != 0;
// according to various people in irc.freenode.net/##c, feof() followed by fread() can result in ferror(), so we must be sure not to read twice on a feof()
// however, because a partial (nonzero) fread() may or may not set feof(), we have to do this whole delayed check acrobatics
if (this->eofNextTime && this->n == 0)
this->eof = true;
if (this->eof || this->error) if (this->eof || this->error)
return false; return false;
// otherwise process this last chunk of the file // otherwise process this last chunk of the file