[dovecot-cvs] dovecot/src/lib istream-limit.c,1.1,1.2 istream.c,1.14,1.15

[cras at procontrol.fi]

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

Modified Files:
	istream-limit.c istream.c 
Log Message:
fixes



Index: istream-limit.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-limit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- istream-limit.c	9 Nov 2003 18:26:25 -0000	1.1
+++ istream-limit.c	10 Nov 2003 21:36:13 -0000	1.2
@@ -47,17 +47,19 @@
 	ssize_t ret;
 	size_t pos;
 
-	if (stream->istream.v_offset >= lstream->v_size)
+	if (stream->istream.v_offset +
+	    (stream->pos - stream->skip) >= lstream->v_size)
 		return -1;
 
 	if (lstream->input->v_offset !=
 	    lstream->v_start_offset + stream->istream.v_offset) {
 		i_stream_seek(lstream->input,
-			      lstream->v_start_offset + stream->istream.v_offset);
+			      lstream->v_start_offset +
+			      stream->istream.v_offset);
 	}
 
 	if (i_stream_read(lstream->input) == -2 && stream->buffer != NULL) {
-		if (lstream->istream.skip == 0)
+		if (stream->skip == 0)
 			return -2;
 		stream->istream.eof = lstream->input->eof;
 	}
@@ -70,9 +72,9 @@
 	if (pos > left)
 		pos = left;
 
-	ret = pos <= lstream->istream.pos ? -1 :
+	ret = pos <= stream->pos ? -1 :
 		(ssize_t) (pos - stream->pos);
-	lstream->istream.pos = pos;
+	stream->pos = pos;
 	return ret;
 }
 

Index: istream.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- istream.c	9 Nov 2003 18:26:25 -0000	1.14
+++ istream.c	10 Nov 2003 21:36:13 -0000	1.15
@@ -78,11 +78,15 @@
 {
 	struct _istream *_stream = stream->real_stream;
 
+	if (v_offset > stream->v_offset) {
+		i_stream_skip(stream, v_offset - stream->v_offset);
+		return;
+	}
+
 	if (stream->closed)
 		return;
 
-	if (v_offset < stream->v_offset)
-		stream->eof = FALSE;
+	stream->eof = FALSE;
 	_stream->seek(_stream, v_offset);
 }