[dovecot-cvs] dovecot/src/lib istream-file.c,1.11,1.12

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv29769

Modified Files:
	istream-file.c 
Log Message:
fix



Index: istream-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-file.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- istream-file.c	29 Oct 2003 13:50:36 -0000	1.11
+++ istream-file.c	29 Oct 2003 14:54:03 -0000	1.12
@@ -161,7 +161,8 @@
 			ret = pread(stream->fd,
 				    stream->w_buffer + stream->pos, size,
 				    stream->istream.start_offset +
-				    stream->istream.v_offset);
+				    stream->istream.v_offset +
+				    (stream->pos - stream->skip));
 		} else {
 			ret = read(stream->fd,
 				   stream->w_buffer + stream->pos, size);
@@ -209,8 +210,10 @@
 {
 	struct file_istream *fstream = (struct file_istream *) stream;
 
+	i_assert(stream->skip == stream->pos);
+
 	if (!fstream->file)
-		fstream->skip_left += count - (stream->pos - stream->skip);
+		fstream->skip_left += count;
 	stream->istream.v_offset += count;
 	stream->skip = stream->pos = 0;
 }