# HG changeset patch # User Timo Sirainen # Date 1204323334 -7200 # Node ID fce616c5959795d3f99017be425eec3a72a2bba3 # Parent 18766f26a7ed9cc6df518a2be6d262c78a236836 Seek also non-seekable parent streams to current offset as long as we're not seeking backwards. diff -r 18766f26a7ed -r fce616c59597 src/lib/istream-limit.c --- a/src/lib/istream-limit.c Fri Feb 29 11:21:11 2008 +0200 +++ b/src/lib/istream-limit.c Sat Mar 01 00:15:34 2008 +0200 @@ -12,12 +12,14 @@ static void i_stream_limit_destroy(struct iostream_private *stream) { struct limit_istream *lstream = (struct limit_istream *) stream; + uoff_t v_offset; - if (lstream->istream.parent->seekable) { + v_offset = lstream->istream.parent_start_offset + + lstream->istream.istream.v_offset; + if (lstream->istream.parent->seekable || + v_offset > lstream->istream.parent->v_offset) { /* get to same position in parent stream */ - i_stream_seek(lstream->istream.parent, - lstream->istream.parent_start_offset + - lstream->istream.istream.v_offset); + i_stream_seek(lstream->istream.parent, v_offset); } i_stream_unref(&lstream->istream.parent); }