Mercurial > dovecot > original-hg > dovecot-1.2

changeset 7311:fce616c59597 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Seek also non-seekable parent streams to current offset as long as we're not seeking backwards.
author Timo Sirainen <tss@iki.fi>
date Sat, 01 Mar 2008 00:15:34 +0200
parents 18766f26a7ed
children 6f59434cf229
files src/lib/istream-limit.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }