GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The seekableInputStreamRegionAdapter now stores its own current position, to avoid issues when multiple adapters share the same underlying stream.

Browse Source
This commit is contained in:
Vincent Richard 2013-02-15 14:58:00 +01:00
parent 34c4fce797
commit 51111254a4
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/utility/seekableInputStreamRegionAdapter.cpp
View File

@ -30,49 +30,57 @@ namespace utility {
seekableInputStreamRegionAdapter::seekableInputStreamRegionAdapter seekableInputStreamRegionAdapter::seekableInputStreamRegionAdapter
(ref <seekableInputStream> stream, const size_type begin, const size_type length) (ref <seekableInputStream> stream, const size_type begin, const size_type length)
: m_stream(stream), m_begin(begin), m_length(length) : m_stream(stream), m_begin(begin), m_length(length), m_position(0)
{ {
} }
bool seekableInputStreamRegionAdapter::eof() const bool seekableInputStreamRegionAdapter::eof() const
{ {
return getPosition() >= m_length; return m_position >= m_length;
} }
void seekableInputStreamRegionAdapter::reset() void seekableInputStreamRegionAdapter::reset()
{ {
m_stream->seek(m_begin); m_position = 0;
} }
stream::size_type seekableInputStreamRegionAdapter::read stream::size_type seekableInputStreamRegionAdapter::read
(value_type* const data, const size_type count) (value_type* const data, const size_type count)
{ {
if (getPosition() + count >= m_length) m_stream->seek(m_begin + m_position);
size_type readBytes = 0;
if (m_position + count >= m_length)
{ {
const size_type remaining = m_length - getPosition(); const size_type remaining = m_length - m_position;
return m_stream->read(data, remaining); readBytes = m_stream->read(data, remaining);
} }
else else
{ {
return m_stream->read(data, count); readBytes = m_stream->read(data, count);
} }
m_position += readBytes;
return readBytes;
} }
stream::size_type seekableInputStreamRegionAdapter::skip(const size_type count) stream::size_type seekableInputStreamRegionAdapter::skip(const size_type count)
{ {
if (getPosition() + count >= m_length) if (m_position + count >= m_length)
{ {
const size_type remaining = m_length - getPosition(); const size_type remaining = m_length - m_position;
m_stream->skip(remaining); m_position += remaining;
return remaining; return remaining;
} }
else else
{ {
m_stream->skip(count); m_position += count;
return count; return count;
} }
} }
@ -80,13 +88,16 @@ stream::size_type seekableInputStreamRegionAdapter::skip(const size_type count)
stream::size_type seekableInputStreamRegionAdapter::getPosition() const stream::size_type seekableInputStreamRegionAdapter::getPosition() const
{ {
return m_stream->getPosition() - m_begin; return m_position;
} }
void seekableInputStreamRegionAdapter::seek(const size_type pos) void seekableInputStreamRegionAdapter::seek(const size_type pos)
{ {
m_stream->seek(m_begin + pos); if (pos > m_length)
m_position = m_length;
else
m_position = pos;
} }

1
vmime/utility/seekableInputStreamRegionAdapter.hpp
View File

@ -60,6 +60,7 @@ private:
ref <seekableInputStream> m_stream; ref <seekableInputStream> m_stream;
size_type m_begin; size_type m_begin;
size_type m_length; size_type m_length;
size_type m_position;
}; };