bob/libscio
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed EOF bug for seek 0 from end

Browse Source
This commit is contained in:
Bob Polis 2022-12-12 19:44:58 +01:00
parent 03ccac4d1f
commit 4f5244237a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/memstreambuf.cpp
View File

@ -54,24 +54,25 @@ std::streamsize sc::io::memstreambuf::xsputn(const char* /*s*/, std::streamsize
std::streambuf::pos_type sc::io::memstreambuf::seekoff(std::streambuf::off_type off, std::streambuf::pos_type sc::io::memstreambuf::seekoff(std::streambuf::off_type off,
std::ios_base::seekdir dir, std::ios_base::seekdir dir,
std::ios_base::openmode which) { std::ios_base::openmode which) {
uint64_t pos {0};
if (which & std::ios::in) { // reading if (which & std::ios::in) { // reading
switch (dir) { switch (dir) {
case std::ios::beg: case std::ios::beg:
if (off < 0 || static_cast<size_t>(off) > _size) return EOF; if (off < 0 || static_cast<size_t>(off) > _size) return EOF;
setg(_mem, _mem + off, _mem + _size); pos = off;
break; break;
case std::ios::cur: { case std::ios::cur: {
int64_t pos = gptr() - _mem + off; int64_t spos = gptr() - _mem + off;
if (pos < 0 || static_cast<size_t>(pos) > _size) return EOF; if (spos < 0 || static_cast<size_t>(spos) > _size) return EOF;
setg(_mem, gptr() + off, _mem + _size); pos = static_cast<uint64_t>(spos);
break; break;
} }
case std::ios::end: case std::ios::end:
if (off > 0 || static_cast<size_t>(off) < -_size) return EOF; if (off > 0 || static_cast<std::streambuf::off_type>(_size) < -off) return EOF;
setg(_mem, _mem + _size + off - 1, _mem + _size); pos = _size + off - 1;
break; break;
} }
return gptr() - _mem; setg(_mem, _mem + pos, _mem + _size);
} }
if (which & std::ios::out) { // writing if (which & std::ios::out) { // writing
switch (dir) { // TODO switch (dir) { // TODO
@ -82,9 +83,8 @@ std::streambuf::pos_type sc::io::memstreambuf::seekoff(std::streambuf::off_type
case std::ios::end: case std::ios::end:
break; break;
} }
return pptr() - _mem;
} }
return EOF; return pos;
} }
std::streambuf::pos_type sc::io::memstreambuf::seekpos(std::streambuf::pos_type pos, std::streambuf::pos_type sc::io::memstreambuf::seekpos(std::streambuf::pos_type pos,