--- a/src/auth/login-connection.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/auth/login-connection.c	Fri Dec 06 03:09:22 2002 +0200
@@ -2,8 +2,8 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "network.h"
 #include "login-connection.h"
 
@@ -20,8 +20,8 @@
 
 	int fd;
 	IO io;
-	IBuffer *inbuf;
-	OBuffer *outbuf;
+	IStream *input;
+	OStream *output;
         AuthRequestType type;
 };
 
@@ -35,10 +35,10 @@
 
 	i_assert(reply->data_size <= AUTH_MAX_REPLY_DATA_SIZE);
 
-	if (o_buffer_send(conn->outbuf, reply, sizeof(AuthReplyData)) < 0)
+	if (o_stream_send(conn->output, reply, sizeof(AuthReplyData)) < 0)
 		login_connection_destroy(conn);
 	else if (reply->data_size > 0) {
-		if (o_buffer_send(conn->outbuf, data, reply->data_size) < 0)
+		if (o_stream_send(conn->output, data, reply->data_size) < 0)
 			login_connection_destroy(conn);
 	}
 }
@@ -50,7 +50,7 @@
         unsigned char *data;
 	size_t size;
 
-	switch (i_buffer_read(conn->inbuf)) {
+	switch (i_stream_read(conn->input)) {
 	case 0:
 		return;
 	case -1:
@@ -65,7 +65,7 @@
 		return;
 	}
 
-	data = i_buffer_get_modifyable_data(conn->inbuf, &size);
+	data = i_stream_get_modifyable_data(conn->input, &size);
 	if (size < sizeof(AuthRequestType))
 		return;
 
@@ -83,7 +83,7 @@
 			return;
 
 		memcpy(&request, data, sizeof(request));
-		i_buffer_skip(conn->inbuf, sizeof(request));
+		i_stream_skip(conn->input, sizeof(request));
 
 		/* we have a full init request */
 		auth_init_request(&request, request_callback, conn);
@@ -98,7 +98,7 @@
 		if (size < sizeof(request) + request.data_size)
 			return;
 
-		i_buffer_skip(conn->inbuf, sizeof(request) + request.data_size);
+		i_stream_skip(conn->input, sizeof(request) + request.data_size);
 
 		/* we have a full continued request */
 		auth_continue_request(&request, data + sizeof(request),
@@ -122,9 +122,9 @@
 	conn = i_new(LoginConnection, 1);
 
 	conn->fd = fd;
-	conn->inbuf = i_buffer_create_file(fd, default_pool, MAX_INBUF_SIZE,
+	conn->input = i_stream_create_file(fd, default_pool, MAX_INBUF_SIZE,
 					   FALSE);
-	conn->outbuf = o_buffer_create_file(fd, default_pool, MAX_OUTBUF_SIZE,
+	conn->output = o_stream_create_file(fd, default_pool, MAX_OUTBUF_SIZE,
 					    IO_PRIORITY_DEFAULT, FALSE);
 	conn->io = io_add(fd, IO_READ, login_input, conn);
 	conn->type = AUTH_REQUEST_NONE;
@@ -132,7 +132,7 @@
 	conn->next = connections;
 	connections = conn;
 
-	if (o_buffer_send(conn->outbuf, &auth_init_data,
+	if (o_stream_send(conn->output, &auth_init_data,
 			  sizeof(auth_init_data)) < 0) {
 		login_connection_destroy(conn);
 		conn = NULL;
@@ -152,8 +152,8 @@
 		}
 	}
 
-	i_buffer_unref(conn->inbuf);
-	o_buffer_unref(conn->outbuf);
+	i_stream_unref(conn->input);
+	o_stream_unref(conn->output);
 
 	io_remove(conn->io);
 	net_disconnect(conn->fd);

--- a/src/auth/master.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/auth/master.c	Fri Dec 06 03:09:22 2002 +0200
@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "obuffer.h"
+#include "ostream.h"
 #include "network.h"
 #include "cookie.h"
 #include "master.h"
@@ -11,7 +11,7 @@
 
 static AuthCookieReplyData failure_reply;
 
-static OBuffer *outbuf;
+static OStream *output;
 static IO io_master;
 
 static unsigned int master_pos;
@@ -35,7 +35,7 @@
 	}
 
 	reply->id = request->id;
-	switch (o_buffer_send(outbuf, reply, sizeof(AuthCookieReplyData))) {
+	switch (o_stream_send(output, reply, sizeof(AuthCookieReplyData))) {
 	case -2:
 		i_fatal("Master transmit buffer full, aborting");
 	case -1:
@@ -72,7 +72,7 @@
 	memset(&failure_reply, 0, sizeof(failure_reply));
 
 	master_pos = 0;
-	outbuf = o_buffer_create_file(MASTER_SOCKET_FD, default_pool,
+	output = o_stream_create_file(MASTER_SOCKET_FD, default_pool,
 				      MAX_OUTBUF_SIZE, IO_PRIORITY_DEFAULT,
 				      FALSE);
 	io_master = io_add(MASTER_SOCKET_FD, IO_READ, master_input, NULL);
@@ -80,6 +80,6 @@
 
 void master_deinit(void)
 {
-	o_buffer_unref(outbuf);
+	o_stream_unref(output);
 	io_remove(io_master);
 }

--- a/src/auth/userinfo-passwd-file.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/auth/userinfo-passwd-file.c	Fri Dec 06 03:09:22 2002 +0200
@@ -7,7 +7,7 @@
 
 #include "userinfo-passwd.h"
 
-#include "ibuffer.h"
+#include "istream.h"
 #include "hash.h"
 #include "hex-binary.h"
 #include "md5.h"
@@ -295,15 +295,15 @@
 
 static void passwd_file_parse_file(PasswdFile *pw)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	char *const *args;
 	char *line;
 
-	inbuf = i_buffer_create_file(pw->fd, default_pool, 2048, FALSE);
+	input = i_stream_create_file(pw->fd, default_pool, 2048, FALSE);
 	for (;;) {
-		line = i_buffer_next_line(inbuf);
+		line = i_stream_next_line(input);
 		if (line == NULL) {
-			if (i_buffer_read(inbuf) <= 0)
+			if (i_stream_read(input) <= 0)
 				break;
                         continue;
 		}
@@ -319,7 +319,7 @@
 		}
 		t_pop();
 	}
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 }
 
 static PasswdFile *passwd_file_parse(const char *path)

--- a/src/imap/client.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/client.c	Fri Dec 06 03:09:22 2002 +0200
@@ -3,8 +3,8 @@
 #include "common.h"
 #include "ioloop.h"
 #include "network.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "commands.h"
 
 #include <stdlib.h>
@@ -36,8 +36,8 @@
 {
 	Client *client = context;
 
-	i_buffer_close(client->inbuf);
-	o_buffer_close(client->outbuf);
+	i_stream_close(client->input);
+	o_stream_close(client->output);
 }
 
 static void client_input_timeout(void *context)
@@ -46,7 +46,7 @@
 
 	client_send_line(my_client, "* BYE Disconnected for inactivity "
 			 "while waiting for command data.");
-	o_buffer_close(client->outbuf);
+	o_stream_close(client->output);
 }
 
 Client *client_create(int hin, int hout, MailStorage *storage)
@@ -54,9 +54,9 @@
 	Client *client;
 
 	client = i_new(Client, 1);
-	client->inbuf = i_buffer_create_file(hin, default_pool,
+	client->input = i_stream_create_file(hin, default_pool,
 					     MAX_INBUF_SIZE, FALSE);
-	client->outbuf = o_buffer_create_file(hout, default_pool, 4096,
+	client->output = o_stream_create_file(hout, default_pool, 4096,
 					      IO_PRIORITY_DEFAULT, FALSE);
 
 	/* always use nonblocking I/O */
@@ -65,15 +65,15 @@
 
 	/* set timeout for reading expected data (eg. APPEND). This is
 	   different from the actual idle time. */
-	i_buffer_set_blocking(client->inbuf, CLIENT_CMDINPUT_TIMEOUT,
+	i_stream_set_blocking(client->input, CLIENT_CMDINPUT_TIMEOUT,
 			      client_input_timeout, client);
 
 	/* set timeout for sending data */
-	o_buffer_set_blocking(client->outbuf, CLIENT_OUTPUT_TIMEOUT,
+	o_stream_set_blocking(client->output, CLIENT_OUTPUT_TIMEOUT,
 			      client_output_timeout, client);
 
 	client->io = io_add(hin, IO_READ, (IOFunc) client_input, client);
-	client->parser = imap_parser_create(client->inbuf, client->outbuf,
+	client->parser = imap_parser_create(client->input, client->output,
 					    MAX_INBUF_SIZE);
         client->last_input = ioloop_time;
 
@@ -87,7 +87,7 @@
 
 void client_destroy(Client *client)
 {
-	o_buffer_flush(client->outbuf);
+	o_stream_flush(client->output);
 
 	if (client->mailbox != NULL)
 		client->mailbox->close(client->mailbox);
@@ -96,8 +96,8 @@
 	imap_parser_destroy(client->parser);
 	io_remove(client->io);
 
-	i_buffer_unref(client->inbuf);
-	o_buffer_unref(client->outbuf);
+	i_stream_unref(client->input);
+	o_stream_unref(client->output);
 
 	i_free(client);
 
@@ -108,35 +108,35 @@
 
 void client_disconnect(Client *client)
 {
-	o_buffer_flush(client->outbuf);
+	o_stream_flush(client->output);
 
-	i_buffer_close(client->inbuf);
-	o_buffer_close(client->outbuf);
+	i_stream_close(client->input);
+	o_stream_close(client->output);
 }
 
 void client_send_line(Client *client, const char *data)
 {
-	if (client->outbuf->closed)
+	if (client->output->closed)
 		return;
 
-	(void)o_buffer_send(client->outbuf, data, strlen(data));
-	(void)o_buffer_send(client->outbuf, "\r\n", 2);
+	(void)o_stream_send(client->output, data, strlen(data));
+	(void)o_stream_send(client->output, "\r\n", 2);
 }
 
 void client_send_tagline(Client *client, const char *data)
 {
 	const char *tag = client->cmd_tag;
 
-	if (client->outbuf->closed)
+	if (client->output->closed)
 		return;
 
 	if (tag == NULL || *tag == '\0')
 		tag = "*";
 
-	(void)o_buffer_send(client->outbuf, tag, strlen(tag));
-	(void)o_buffer_send(client->outbuf, " ", 1);
-	(void)o_buffer_send(client->outbuf, data, strlen(data));
-	(void)o_buffer_send(client->outbuf, "\r\n", 2);
+	(void)o_stream_send(client->output, tag, strlen(tag));
+	(void)o_stream_send(client->output, " ", 1);
+	(void)o_stream_send(client->output, data, strlen(data));
+	(void)o_stream_send(client->output, "\r\n", 2);
 }
 
 void client_send_command_error(Client *client, const char *msg)
@@ -220,7 +220,7 @@
 
 static void client_command_finished(Client *client)
 {
-	client->inbuf_skip_line = TRUE;
+	client->input_skip_line = TRUE;
         client_reset_command(client);
 }
 
@@ -231,18 +231,17 @@
 	const unsigned char *data;
 	size_t i, data_size;
 
-	/* get the beginning of data in input buffer */
-	data = i_buffer_get_data(client->inbuf, &data_size);
+	data = i_stream_get_data(client->input, &data_size);
 
 	for (i = 0; i < data_size; i++) {
 		if (data[i] == '\n') {
-			client->inbuf_skip_line = FALSE;
-			i_buffer_skip(client->inbuf, i+1);
+			client->input_skip_line = FALSE;
+			i_stream_skip(client->input, i+1);
 			break;
 		}
 	}
 
-	return !client->inbuf_skip_line;
+	return !client->input_skip_line;
 }
 
 static int client_handle_input(Client *client)
@@ -257,7 +256,7 @@
 		return FALSE;
 	}
 
-	if (client->inbuf_skip_line) {
+	if (client->input_skip_line) {
 		/* we're just waiting for new line.. */
 		if (!client_skip_line(client))
 			return FALSE;
@@ -306,7 +305,7 @@
 {
 	client->last_input = ioloop_time;
 
-	switch (i_buffer_read(client->inbuf)) {
+	switch (i_stream_read(client->input)) {
 	case -1:
 		/* disconnected */
 		client_destroy(client);
@@ -315,19 +314,19 @@
 		/* parameter word is longer than max. input buffer size.
 		   this is most likely an error, so skip the new data
 		   until newline is found. */
-		client->inbuf_skip_line = TRUE;
+		client->input_skip_line = TRUE;
 
 		client_send_command_error(client, "Too long argument.");
 		client_command_finished(client);
 		break;
 	}
 
-	o_buffer_cork(client->outbuf);
+	o_stream_cork(client->output);
 	while (client_handle_input(client))
 		;
-	o_buffer_flush(client->outbuf);
+	o_stream_flush(client->output);
 
-	if (client->outbuf->closed)
+	if (client->output->closed)
 		client_destroy(client);
 }
 

--- a/src/imap/client.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/client.h	Fri Dec 06 03:09:22 2002 +0200
@@ -11,8 +11,8 @@
 struct _Client {
 	int socket;
 	IO io;
-	IBuffer *inbuf;
-	OBuffer *outbuf;
+	IStream *input;
+	OStream *output;
 
 	MailStorage *storage;
 	Mailbox *mailbox;
@@ -29,7 +29,7 @@
 	unsigned int cmd_uid:1; /* used UID command */
 	unsigned int sync_flags_send_uid:1;
 	unsigned int rawlog:1;
-	unsigned int inbuf_skip_line:1; /* skip all the data until we've
+	unsigned int input_skip_line:1; /* skip all the data until we've
 					   found a new line */
 };
 

--- a/src/imap/cmd-append.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/cmd-append.c	Fri Dec 06 03:09:22 2002 +0200
@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "obuffer.h"
+#include "ostream.h"
 #include "commands.h"
 #include "imap-parser.h"
 #include "imap-date.h"
@@ -126,13 +126,13 @@
 		return TRUE;
 	}
 
-	o_buffer_send(client->outbuf, "+ OK\r\n", 6);
-	o_buffer_flush(client->outbuf);
+	o_stream_send(client->output, "+ OK\r\n", 6);
+	o_stream_flush(client->output);
 
 	/* save the mail */
 	failed = !box->save(box, flags, custom_flags,
 			    internal_date, timezone_offset,
-			    client->inbuf, msg_size);
+			    client->input, msg_size);
 	box->close(box);
 
 	if (failed) {

--- a/src/imap/cmd-fetch.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/cmd-fetch.c	Fri Dec 06 03:09:22 2002 +0200
@@ -264,7 +264,7 @@
 
 	/* fetch it */
 	if (client->mailbox->fetch(client->mailbox, &data,
-				   client->outbuf, &all_found)) {
+				   client->output, &all_found)) {
 		/* NOTE: syncing isn't allowed here */
                 client_sync_without_expunges(client);
 		client_send_tagline(client, all_found ? "OK Fetch completed." :

--- a/src/imap/cmd-search.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/cmd-search.c	Fri Dec 06 03:09:22 2002 +0200
@@ -51,7 +51,7 @@
 	} else {
 		if (client->mailbox->search(client->mailbox, charset,
 					    sargs, NULL,
-					    client->outbuf, client->cmd_uid)) {
+					    client->output, client->cmd_uid)) {
 			/* NOTE: syncing isn't allowed here */
 			client_sync_without_expunges(client);
 			client_send_tagline(client, "OK Search completed.");

--- a/src/imap/cmd-sort.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/cmd-sort.c	Fri Dec 06 03:09:22 2002 +0200
@@ -120,7 +120,7 @@
 	} else {
 		if (client->mailbox->search(client->mailbox, charset,
 					    sargs, sorting,
-					    client->outbuf, client->cmd_uid)) {
+					    client->output, client->cmd_uid)) {
 			/* NOTE: syncing is allowed when returning UIDs */
 			if (client->cmd_uid)
 				client_sync_full(client);

--- a/src/imap/mail-storage-callbacks.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/imap/mail-storage-callbacks.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "common.h"
-#include "obuffer.h"
+#include "ostream.h"
 #include "imap-util.h"
 #include "commands-util.h"
 
@@ -19,7 +19,7 @@
 	Client *client = context;
 
 	client_send_line(client, t_strconcat("* OK ", text, NULL));
-	o_buffer_flush(client->outbuf);
+	o_stream_flush(client->output);
 }
 
 static void notify_no(Mailbox *mailbox __attr_unused__,
@@ -28,7 +28,7 @@
 	Client *client = context;
 
 	client_send_line(client, t_strconcat("* NO ", text, NULL));
-	o_buffer_flush(client->outbuf);
+	o_stream_flush(client->output);
 }
 
 static void expunge(Mailbox *mailbox, unsigned int seq, void *context)

--- a/src/lib-imap/imap-bodystructure.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-bodystructure.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "temp-string.h"
 #include "rfc822-tokenize.h"
 #include "message-parser.h"
@@ -220,20 +220,20 @@
 	t_pop();
 }
 
-static void part_parse_headers(MessagePart *part, IBuffer *inbuf,
+static void part_parse_headers(MessagePart *part, IStream *input,
 			       uoff_t start_offset, Pool pool)
 {
 	while (part != NULL) {
 		/* note that we want to parse the header of all
 		   the message parts, multiparts too. */
-		i_assert(part->physical_pos >= inbuf->v_offset - start_offset);
-		i_buffer_skip(inbuf, part->physical_pos -
-			      (inbuf->v_offset - start_offset));
+		i_assert(part->physical_pos >= input->v_offset - start_offset);
+		i_stream_skip(input, part->physical_pos -
+			      (input->v_offset - start_offset));
 
-		message_parse_header(part, inbuf, NULL, parse_header, pool);
+		message_parse_header(part, input, NULL, parse_header, pool);
 
 		if (part->children != NULL) {
-			part_parse_headers(part->children, inbuf,
+			part_parse_headers(part->children, input,
 					   start_offset, pool);
 		}
 
@@ -426,15 +426,15 @@
 }
 
 const char *imap_part_get_bodystructure(Pool pool, MessagePart **part,
-					IBuffer *inbuf, int extended)
+					IStream *input, int extended)
 {
 	uoff_t start_offset;
 
 	if (*part == NULL)
-		*part = message_parse(pool, inbuf, parse_header, pool);
+		*part = message_parse(pool, input, parse_header, pool);
 	else {
-		start_offset = inbuf->v_offset;
-		part_parse_headers(*part, inbuf, start_offset, pool);
+		start_offset = input->v_offset;
+		part_parse_headers(*part, input, start_offset, pool);
 	}
 
 	return part_get_bodystructure(*part, extended);
@@ -584,7 +584,7 @@
 
 const char *imap_body_parse_from_bodystructure(const char *bodystructure)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	ImapParser *parser;
 	ImapArg *args;
 	TempString *str;
@@ -595,10 +595,10 @@
 	len = strlen(bodystructure);
 	str = t_string_new(len);
 
-	inbuf = i_buffer_create_from_data(data_stack_pool, bodystructure, len);
-	(void)i_buffer_read(inbuf);
+	input = i_stream_create_from_data(data_stack_pool, bodystructure, len);
+	(void)i_stream_read(input);
 
-	parser = imap_parser_create(inbuf, NULL, 0);
+	parser = imap_parser_create(input, NULL, 0);
 	ret = imap_parser_read_args(parser, 0, IMAP_PARSE_FLAG_NO_UNESCAPE,
 				    &args);
 
@@ -611,6 +611,6 @@
 		i_error("Error parsing IMAP bodystructure: %s", bodystructure);
 
 	imap_parser_destroy(parser);
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 	return value;
 }

--- a/src/lib-imap/imap-bodystructure.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-bodystructure.h	Fri Dec 06 03:09:22 2002 +0200
@@ -4,7 +4,7 @@
 /* If *part is non-NULL, it's used as base for building the body structure.
    Otherwise it's set to the root MessagePart and parsed. */
 const char *imap_part_get_bodystructure(Pool pool, MessagePart **part,
-					IBuffer *inbuf, int extended);
+					IStream *input, int extended);
 
 /* Return BODY part from BODYSTRUCTURE */
 const char *imap_body_parse_from_bodystructure(const char *bodystructure);

--- a/src/lib-imap/imap-envelope.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-envelope.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "temp-string.h"
 #include "rfc822-address.h"
 #include "imap-parser.h"
@@ -236,7 +236,7 @@
 
 const char *imap_envelope_parse(const char *envelope, ImapEnvelopeField field)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	ImapParser *parser;
 	ImapArg *args;
 	const char *value;
@@ -244,11 +244,11 @@
 
 	i_assert(field < IMAP_ENVELOPE_FIELDS);
 
-	inbuf = i_buffer_create_from_data(data_stack_pool, envelope,
+	input = i_stream_create_from_data(data_stack_pool, envelope,
 					  strlen(envelope));
-	parser = imap_parser_create(inbuf, NULL, 0);
+	parser = imap_parser_create(input, NULL, 0);
 
-	(void)i_buffer_read(inbuf);
+	(void)i_stream_read(input);
 	ret = imap_parser_read_args(parser, field+1, 0, &args);
 	if (ret > (int)field) {
 		value = imap_envelope_parse_arg(&args[field], field, envelope);
@@ -258,6 +258,6 @@
 	}
 
 	imap_parser_destroy(parser);
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 	return value;
 }

--- a/src/lib-imap/imap-message-cache.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-message-cache.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "temp-string.h"
 #include "mmap-util.h"
 #include "message-parser.h"
@@ -50,7 +50,7 @@
 	int messages_count;
 
 	CachedMessage *open_msg;
-	IBuffer *open_inbuf;
+	IStream *open_stream;
 
 	void *context;
 };
@@ -161,23 +161,24 @@
 	}
 }
 
-static int imap_msgcache_get_inbuf(ImapMessageCache *cache, uoff_t offset)
+static int imap_msgcache_get_stream(ImapMessageCache *cache, uoff_t offset)
 {
-	if (cache->open_inbuf == NULL)
-		cache->open_inbuf = cache->iface->open_mail(cache->context);
-	else if (offset < cache->open_inbuf->v_offset) {
+	if (cache->open_stream == NULL)
+		cache->open_stream = cache->iface->open_mail(cache->context);
+	else if (offset < cache->open_stream->v_offset) {
 		/* need to rewind */
-		cache->open_inbuf =
-			cache->iface->inbuf_rewind(cache->open_inbuf,
-						   cache->context);
+		cache->open_stream =
+			cache->iface->stream_rewind(cache->open_stream,
+						    cache->context);
 	}
 
-	if (cache->open_inbuf == NULL)
+	if (cache->open_stream == NULL)
 		return FALSE;
 
-	i_assert(offset >= cache->open_inbuf->v_offset);
+	i_assert(offset >= cache->open_stream->v_offset);
 
-	i_buffer_skip(cache->open_inbuf, offset - cache->open_inbuf->v_offset);
+	i_stream_skip(cache->open_stream,
+		      offset - cache->open_stream->v_offset);
 	return TRUE;
 }
 
@@ -206,12 +207,12 @@
 	    msg->cached_bodystructure == NULL) {
 		value = cache->iface->get_cached_field(IMAP_CACHE_BODYSTRUCTURE,
 						       cache->context);
-		if (value == NULL && imap_msgcache_get_inbuf(cache, 0)) {
+		if (value == NULL && imap_msgcache_get_stream(cache, 0)) {
 			msg_get_part(cache);
 
 			value = imap_part_get_bodystructure(msg->pool,
 							    &msg->part,
-							    cache->open_inbuf,
+							    cache->open_stream,
 							    TRUE);
 		}
 
@@ -222,7 +223,7 @@
 	if ((fields & IMAP_CACHE_BODY) && msg->cached_body == NULL) {
 		value = cache->iface->get_cached_field(IMAP_CACHE_BODY,
 						       cache->context);
-		if (value == NULL && cache->open_inbuf != NULL) {
+		if (value == NULL && cache->open_stream != NULL) {
 			/* we can generate it from cached BODYSTRUCTURE.
 			   do it only if the file isn't open already, since
 			   this takes more CPU than parsing message headers. */
@@ -234,12 +235,12 @@
 			}
 		}
 
-		if (value == NULL && imap_msgcache_get_inbuf(cache, 0)) {
+		if (value == NULL && imap_msgcache_get_stream(cache, 0)) {
 			msg_get_part(cache);
 
 			value = imap_part_get_bodystructure(msg->pool,
 							    &msg->part,
-							    cache->open_inbuf,
+							    cache->open_stream,
 							    FALSE);
 		}
 
@@ -252,7 +253,7 @@
 						       cache->context);
 		if (value == NULL) {
 			if (msg->envelope == NULL &&
-			    imap_msgcache_get_inbuf(cache, 0)) {
+			    imap_msgcache_get_stream(cache, 0)) {
 				/* envelope isn't parsed yet, do it. header
 				   size is calculated anyway so save it */
 				if (msg->hdr_size == NULL) {
@@ -260,7 +261,7 @@
 							      MessageSize, 1);
 				}
 
-				message_parse_header(NULL, cache->open_inbuf,
+				message_parse_header(NULL, cache->open_stream,
 						     msg->hdr_size,
 						     parse_envelope_header,
 						     msg);
@@ -290,7 +291,7 @@
 	if (fields & IMAP_CACHE_MESSAGE_PART) {
 		msg_get_part(cache);
 
-		if (msg->part == NULL && imap_msgcache_get_inbuf(cache, 0)) {
+		if (msg->part == NULL && imap_msgcache_get_stream(cache, 0)) {
 			/* we need to parse the message */
 			MessageHeaderFunc func;
 
@@ -303,7 +304,7 @@
 				func = NULL;
 			}
 
-			msg->part = message_parse(msg->pool, cache->open_inbuf,
+			msg->part = message_parse(msg->pool, cache->open_stream,
 						  func, msg);
 		} else {
 			failed = TRUE;
@@ -336,8 +337,8 @@
 			}
 		} else {
 			/* need to do some light parsing */
-			if (imap_msgcache_get_inbuf(cache, 0)) {
-				message_get_header_size(cache->open_inbuf,
+			if (imap_msgcache_get_stream(cache, 0)) {
+				message_get_header_size(cache->open_stream,
 							msg->hdr_size);
 			} else {
 				failed = TRUE;
@@ -358,7 +359,7 @@
 	if (fields & IMAP_CACHE_MESSAGE_OPEN) {
 		/* this isn't needed for anything else than pre-opening the
 		   mail and seeing if it fails. */
-		failed = !imap_msgcache_get_inbuf(cache, 0);
+		failed = !imap_msgcache_get_stream(cache, 0);
 	}
 
 	if ((fields & IMAP_CACHE_INTERNALDATE) &&
@@ -410,9 +411,9 @@
 
 void imap_msgcache_close(ImapMessageCache *cache)
 {
-	if (cache->open_inbuf != NULL) {
-		i_buffer_unref(cache->open_inbuf);
-		cache->open_inbuf = NULL;
+	if (cache->open_stream != NULL) {
+		i_stream_unref(cache->open_stream);
+		cache->open_stream = NULL;
 	}
 
 	cache->open_msg = NULL;
@@ -467,7 +468,7 @@
 	return cache->open_msg->internal_date;
 }
 
-int imap_msgcache_get_rfc822(ImapMessageCache *cache, IBuffer **inbuf,
+int imap_msgcache_get_rfc822(ImapMessageCache *cache, IStream **stream,
 			     MessageSize *hdr_size, MessageSize *body_size)
 {
 	CachedMessage *msg;
@@ -476,14 +477,14 @@
 	i_assert(cache->open_msg != NULL);
 
 	msg = cache->open_msg;
-	if (inbuf != NULL) {
+	if (stream != NULL) {
 		if (msg->hdr_size == NULL)
 			cache_fields(cache, IMAP_CACHE_MESSAGE_HDR_SIZE);
 		offset = hdr_size != NULL ? 0 :
 			msg->hdr_size->physical_size;
-		if (!imap_msgcache_get_inbuf(cache, offset))
+		if (!imap_msgcache_get_stream(cache, offset))
 			return FALSE;
-                *inbuf = cache->open_inbuf;
+                *stream = cache->open_stream;
 	}
 
 	if (body_size != NULL) {
@@ -505,7 +506,7 @@
 	return TRUE;
 }
 
-static void get_partial_size(IBuffer *inbuf,
+static void get_partial_size(IStream *stream,
 			     uoff_t virtual_skip, uoff_t max_virtual_size,
 			     MessageSize *partial, MessageSize *dest,
 			     int *cr_skipped)
@@ -514,12 +515,12 @@
 	if (partial->virtual_size > virtual_skip)
 		memset(partial, 0, sizeof(MessageSize));
 	else {
-		i_buffer_skip(inbuf, partial->physical_size);
+		i_stream_skip(stream, partial->physical_size);
 		virtual_skip -= partial->virtual_size;
 	}
 
-	message_skip_virtual(inbuf, virtual_skip, partial, cr_skipped);
-	message_get_body_size(inbuf, dest, max_virtual_size);
+	message_skip_virtual(stream, virtual_skip, partial, cr_skipped);
+	message_get_body_size(stream, dest, max_virtual_size);
 
 	if (*cr_skipped) {
 		dest->virtual_size--;
@@ -531,7 +532,7 @@
 				     uoff_t virtual_skip,
 				     uoff_t max_virtual_size,
 				     int get_header, MessageSize *size,
-                                     IBuffer **inbuf, int *cr_skipped)
+                                     IStream **stream, int *cr_skipped)
 {
 	CachedMessage *msg;
 	uoff_t physical_skip, full_size;
@@ -540,7 +541,7 @@
 	i_assert(cache->open_msg != NULL);
 
 	memset(size, 0, sizeof(MessageSize));
-	*inbuf = NULL;
+	*stream = NULL;
 	*cr_skipped = FALSE;
 
 	msg = cache->open_msg;
@@ -575,7 +576,7 @@
 	if (size_got) {
 		physical_skip = get_header ? 0 : msg->hdr_size->physical_size;
 	} else {
-		if (!imap_msgcache_get_inbuf(cache, 0))
+		if (!imap_msgcache_get_stream(cache, 0))
 			return FALSE;
 
 		if (msg->partial_size == NULL)
@@ -583,7 +584,7 @@
 		if (!get_header)
 			virtual_skip += msg->hdr_size->virtual_size;
 
-		get_partial_size(cache->open_inbuf, virtual_skip,
+		get_partial_size(cache->open_stream, virtual_skip,
 				 max_virtual_size, msg->partial_size, size,
 				 cr_skipped);
 
@@ -591,20 +592,20 @@
 	}
 
 	/* seek to wanted position */
-	if (!imap_msgcache_get_inbuf(cache, physical_skip))
+	if (!imap_msgcache_get_stream(cache, physical_skip))
 		return FALSE;
 
-        *inbuf = cache->open_inbuf;
+        *stream = cache->open_stream;
 	return TRUE;
 }
 
-int imap_msgcache_get_data(ImapMessageCache *cache, IBuffer **inbuf)
+int imap_msgcache_get_data(ImapMessageCache *cache, IStream **stream)
 {
 	i_assert(cache->open_msg != NULL);
 
-	if (!imap_msgcache_get_inbuf(cache, 0))
+	if (!imap_msgcache_get_stream(cache, 0))
 		return FALSE;
 
-        *inbuf = cache->open_inbuf;
+        *stream = cache->open_stream;
 	return TRUE;
 }

--- a/src/lib-imap/imap-message-cache.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-message-cache.h	Fri Dec 06 03:09:22 2002 +0200
@@ -26,10 +26,10 @@
 
 typedef struct {
 	/* Open mail for reading. */
-	IBuffer *(*open_mail)(void *context);
-	/* Rewind input buffer to beginning, possibly closing the old buffer
+	IStream *(*open_mail)(void *context);
+	/* Rewind stream to beginning, possibly closing the old stream
 	   if it can't directly be rewinded. */
-	IBuffer *(*inbuf_rewind)(IBuffer *inbuf, void *context);
+	IStream *(*stream_rewind)(IStream *stream, void *context);
 
 	/* Returns field if it's already cached, or NULL. */
 	const char *(*get_cached_field)(ImapCacheField field, void *context);
@@ -56,7 +56,7 @@
 		       uoff_t vp_header_size, uoff_t vp_body_size,
 		       uoff_t full_virtual_size, void *context);
 
-/* Close the IOBuffer for opened message. */
+/* Close the IOStream for opened message. */
 void imap_msgcache_close(ImapMessageCache *cache);
 
 /* Returns the field from cache, or NULL if it's not cached. */
@@ -71,23 +71,23 @@
 /* Returns the internal date of message, or (time_t)-1 if failed. */
 time_t imap_msgcache_get_internal_date(ImapMessageCache *cache);
 
-/* Returns TRUE if successful. If inbuf is not NULL, it's set to point to
+/* Returns TRUE if successful. If stream is not NULL, it's set to point to
    beginning of message, or to beginning of message body if hdr_size is NULL. */
-int imap_msgcache_get_rfc822(ImapMessageCache *cache, IBuffer **inbuf,
+int imap_msgcache_get_rfc822(ImapMessageCache *cache, IStream **stream,
 			     MessageSize *hdr_size, MessageSize *body_size);
 
-/* Returns TRUE if successful. *inbuf is set to point to the first non-skipped
+/* Returns TRUE if successful. *stream is set to point to the first non-skipped
    character. size is set to specify the actual message size in
    virtual_skip..max_virtual_size range. cr_skipped is set to TRUE if first
-   character in inbuf is LF, and we should NOT treat it as CR+LF. */
+   character in stream is LF, and we should NOT treat it as CR+LF. */
 int imap_msgcache_get_rfc822_partial(ImapMessageCache *cache,
 				     uoff_t virtual_skip,
 				     uoff_t max_virtual_size,
 				     int get_header, MessageSize *size,
-				     IBuffer **inbuf, int *cr_skipped);
+				     IStream **stream, int *cr_skipped);
 
-/* Returns TRUE if successful. *inbuf is set to point to beginning of
+/* Returns TRUE if successful. *stream is set to point to beginning of
    message. */
-int imap_msgcache_get_data(ImapMessageCache *cache, IBuffer **inbuf);
+int imap_msgcache_get_data(ImapMessageCache *cache, IStream **stream);
 
 #endif

--- a/src/lib-imap/imap-parser.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-parser.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,8 +1,8 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "imap-parser.h"
 
 #define is_linebreak(c) \
@@ -21,8 +21,8 @@
 struct _ImapParser {
 	/* permanent */
 	Pool pool;
-	IBuffer *inbuf;
-	OBuffer *outbuf;
+	IStream *input;
+	OStream *output;
 	size_t max_literal_size;
         ImapParserFlags flags;
 
@@ -58,15 +58,15 @@
 		parser->list_arg->data.list = parser->cur_list;
 }
 
-ImapParser *imap_parser_create(IBuffer *inbuf, OBuffer *outbuf,
+ImapParser *imap_parser_create(IStream *input, OStream *output,
 			       size_t max_literal_size)
 {
 	ImapParser *parser;
 
 	parser = i_new(ImapParser, 1);
         parser->pool = pool_create("IMAP parser", 8192, FALSE);
-	parser->inbuf = inbuf;
-	parser->outbuf = outbuf;
+	parser->input = input;
+	parser->output = output;
 	parser->max_literal_size = max_literal_size;
 
 	imap_args_realloc(parser, LIST_ALLOC_SIZE);
@@ -112,7 +112,7 @@
 			break;
 	}
 
-        i_buffer_skip(parser->inbuf, i);
+        i_stream_skip(parser->input, i);
 	parser->cur_pos = 0;
 
 	*data += i;
@@ -311,9 +311,9 @@
 			return FALSE;
 		}
 
-		if (parser->outbuf != NULL) {
-			o_buffer_send(parser->outbuf, "+ OK\r\n", 6);
-			o_buffer_flush(parser->outbuf);
+		if (parser->output != NULL) {
+			o_stream_send(parser->output, "+ OK\r\n", 6);
+			o_stream_flush(parser->output);
 		}
 	}
 
@@ -332,7 +332,7 @@
 	/* expecting digits + "}" */
 	for (i = parser->cur_pos; i < data_size; i++) {
 		if (data[i] == '}') {
-			i_buffer_skip(parser->inbuf, i+1);
+			i_stream_skip(parser->input, i+1);
 			return imap_parser_literal_end(parser);
 		}
 
@@ -365,7 +365,7 @@
 
 		if (*data == '\r') {
 			data++; data_size--;
-			i_buffer_skip(parser->inbuf, 1);
+			i_stream_skip(parser->input, 1);
 
 			if (data_size == 0)
 				return FALSE;
@@ -377,7 +377,7 @@
 		}
 
 		data++; data_size--;
-		i_buffer_skip(parser->inbuf, 1);
+		i_stream_skip(parser->input, 1);
 		parser->literal_skip_crlf = FALSE;
 
 		i_assert(parser->cur_pos == 0);
@@ -407,7 +407,7 @@
 	const char *data;
 	size_t data_size;
 
-	data = (const char *) i_buffer_get_data(parser->inbuf, &data_size);
+	data = (const char *) i_stream_get_data(parser->input, &data_size);
 	if (data_size == 0)
 		return FALSE;
 
@@ -468,9 +468,9 @@
 		if (!imap_parser_read_literal(parser, data, data_size))
 			return FALSE;
 
-		/* pass through to parsing data. since inbuf->skip was
+		/* pass through to parsing data. since input->skip was
 		   modified, we need to get the data start position again. */
-		data = (const char *) i_buffer_get_data(parser->inbuf,
+		data = (const char *) i_stream_get_data(parser->input,
 							&data_size);
 
 		/* fall through */
@@ -534,8 +534,7 @@
 	const char *data;
 	size_t i, data_size;
 
-	/* get the beginning of data in input buffer */
-	data = (const char *) i_buffer_get_data(parser->inbuf, &data_size);
+	data = (const char *) i_stream_get_data(parser->input, &data_size);
 
 	for (i = 0; i < data_size; i++) {
 		if (data[i] == ' ' || data[i] == '\r' || data[i] == '\n')
@@ -543,7 +542,7 @@
 	}
 
 	if (i < data_size) {
-		i_buffer_skip(parser->inbuf, i + (data[i] == ' ' ? 1 : 0));
+		i_stream_skip(parser->input, i + (data[i] == ' ' ? 1 : 0));
 		return p_strndup(parser->pool, data, i);
 	} else {
 		return NULL;
@@ -555,8 +554,7 @@
 	const char *data;
 	size_t i, data_size;
 
-	/* get the beginning of data in input buffer */
-	data = (const char *) i_buffer_get_data(parser->inbuf, &data_size);
+	data = (const char *) i_stream_get_data(parser->input, &data_size);
 
 	for (i = 0; i < data_size; i++) {
 		if (data[i] == '\r' || data[i] == '\n')
@@ -564,7 +562,7 @@
 	}
 
 	if (i < data_size) {
-		i_buffer_skip(parser->inbuf, i);
+		i_stream_skip(parser->input, i);
 		return p_strndup(parser->pool, data, i);
 	} else {
 		return NULL;

--- a/src/lib-imap/imap-parser.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-imap/imap-parser.h	Fri Dec 06 03:09:22 2002 +0200
@@ -41,18 +41,18 @@
 	ImapArg args[1]; /* variable size */
 };
 
-/* Create new IMAP argument parser. The max. size of inbuf limits the
+/* Create new IMAP argument parser. The max. size of input limits the
    maximum size of each argument. max_literal_size also limits sizes of
    literals which we even try to handle if FLAG_LITERAL_SIZE is not set.
-   outbuf is used for sending command continuation requests for literals. */
-ImapParser *imap_parser_create(IBuffer *inbuf, OBuffer *outbuf,
+   output is used for sending command continuation requests for literals. */
+ImapParser *imap_parser_create(IStream *input, OStream *output,
 			       size_t max_literal_size);
 void imap_parser_destroy(ImapParser *parser);
 
 /* Reset the parser to initial state. */
 void imap_parser_reset(ImapParser *parser);
 
-/* Read a number of arguments. This function doesn't call i_buffer_read(), you
+/* Read a number of arguments. This function doesn't call i_stream_read(), you
    need to do that. Returns number of arguments read (may be less than count
    in case of EOL), -2 if more data is needed or -1 if error occured.
 

--- a/src/lib-index/mail-index-update-cache.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mail-index-update-cache.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "mail-index.h"
 
 #include <unistd.h>
@@ -10,12 +10,12 @@
 			MailDataField cache_fields)
 {
 	MailIndexUpdate *update;
-	IBuffer *inbuf;
+	IStream *input;
 	time_t internal_date;
 	int failed, deleted;
 
-	inbuf = index->open_mail(index, rec, &internal_date, &deleted);
-	if (inbuf == NULL)
+	input = index->open_mail(index, rec, &internal_date, &deleted);
+	if (input == NULL)
 		return deleted;
 
 	cache_fields &= ~rec->data_fields;
@@ -23,10 +23,10 @@
 	update = index->update_begin(index, rec);
 	index->update_field_raw(update, DATA_HDR_INTERNAL_DATE,
 				&internal_date, sizeof(internal_date));
-	mail_index_update_headers(update, inbuf, cache_fields, NULL, NULL);
+	mail_index_update_headers(update, input, cache_fields, NULL, NULL);
 	failed = !index->update_end(update);
 
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 	return !failed;
 }
 

--- a/src/lib-index/mail-index-update.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mail-index-update.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "ioloop.h"
 #include "rfc822-date.h"
 #include "rfc822-tokenize.h"
@@ -410,7 +410,7 @@
 	}
 }
 
-void mail_index_update_headers(MailIndexUpdate *update, IBuffer *inbuf,
+void mail_index_update_headers(MailIndexUpdate *update, IStream *input,
                                MailDataField cache_fields,
 			       MessageHeaderFunc header_func, void *context)
 {
@@ -452,16 +452,16 @@
 			}
 		}
 
-		start_offset = inbuf->v_offset;
+		start_offset = input->v_offset;
 
 		if (part == NULL) {
-			part = message_parse(pool, inbuf,
+			part = message_parse(pool, input,
 					     update_header_func, &ctx);
 		} else {
 			/* cached, construct the bodystructure using it.
 			   also we need to parse the header.. */
-			i_buffer_seek(inbuf, start_offset);
-			message_parse_header(NULL, inbuf, NULL,
+			i_stream_seek(input, start_offset);
+			message_parse_header(NULL, input, NULL,
 					     update_header_func, &ctx);
 		}
 
@@ -476,9 +476,9 @@
 		    ((update->rec->data_fields | cache_fields) &
 		     DATA_FIELD_BODYSTRUCTURE) == 0) {
 			t_push();
-			i_buffer_seek(inbuf, start_offset);
+			i_stream_seek(input, start_offset);
 			value = imap_part_get_bodystructure(pool, &part,
-							    inbuf, FALSE);
+							    input, FALSE);
 			update->index->update_field(update, DATA_FIELD_BODY,
 						    value, 0);
 			t_pop();
@@ -486,9 +486,9 @@
 
 		if (cache_fields & DATA_FIELD_BODYSTRUCTURE) {
 			t_push();
-			i_buffer_seek(inbuf, start_offset);
+			i_stream_seek(input, start_offset);
 			value = imap_part_get_bodystructure(pool, &part,
-							    inbuf, TRUE);
+							    input, TRUE);
 			update->index->update_field(update,
 						    DATA_FIELD_BODYSTRUCTURE,
 						    value, 0);
@@ -506,10 +506,10 @@
 
 		pool_unref(pool);
 	} else {
-		message_parse_header(NULL, inbuf, &hdr_size,
+		message_parse_header(NULL, input, &hdr_size,
 				     update_header_func, &ctx);
 
-		body_size.physical_size = inbuf->v_limit - inbuf->v_offset;
+		body_size.physical_size = input->v_limit - input->v_offset;
 		if (body_size.physical_size == 0)
                         body_size.virtual_size = 0;
 		else if (update->data_hdr.virtual_size == 0)

--- a/src/lib-index/mail-index-util.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mail-index-util.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "hostpid.h"
 #include "file-lock.h"
 #include "message-size.h"

--- a/src/lib-index/mail-index.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mail-index.h	Fri Dec 06 03:09:22 2002 +0200
@@ -280,11 +280,11 @@
 	   index is opened. */
 	void (*cache_fields_later)(MailIndex *index, MailDataField field);
 
-	/* Open mail file and return it as mmap()ed IBuffer. If we fail,
+	/* Open mail file and return it as mmap()ed IStream. If we fail,
 	   we return NULL and set deleted = TRUE if failure was because the
 	   mail was just deleted (ie. not an error). internal_date is set
 	   if it's non-NULL. */
-	IBuffer *(*open_mail)(MailIndex *index, MailIndexRecord *rec,
+	IStream *(*open_mail)(MailIndex *index, MailIndexRecord *rec,
 			      time_t *internal_date, int *deleted);
 
 	/* Returns internal date of message, or (time_t)-1 if error occured. */
@@ -361,7 +361,7 @@
 
 	char *mbox_path; /* mbox-specific path to the actual mbox file */
 	int mbox_fd;
-	IBuffer *mbox_inbuf;
+	IStream *mbox_stream;
 	MailLockType mbox_lock_type;
 	dev_t mbox_dotlock_dev;
 	ino_t mbox_dotlock_ino;
@@ -470,7 +470,7 @@
 int mail_index_verify_hole_range(MailIndex *index);
 void mail_index_mark_flag_changes(MailIndex *index, MailIndexRecord *rec,
 				  MailFlags old_flags, MailFlags new_flags);
-void mail_index_update_headers(MailIndexUpdate *update, IBuffer *inbuf,
+void mail_index_update_headers(MailIndexUpdate *update, IStream *input,
                                MailDataField cache_fields,
 			       MessageHeaderFunc header_func, void *context);
 int mail_index_update_cache(MailIndex *index);

--- a/src/lib-index/maildir/maildir-index.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/maildir/maildir-index.h	Fri Dec 06 03:09:22 2002 +0200
@@ -20,7 +20,7 @@
 int maildir_index_build_dir(MailIndex *index, const char *source_dir,
 			    const char *dest_dir);
 
-IBuffer *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
+IStream *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
 			   time_t *internal_date, int *deleted);
 
 int maildir_record_update(MailIndex *index, MailIndexUpdate *update, int fd);

--- a/src/lib-index/maildir/maildir-open.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/maildir/maildir-open.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "maildir-index.h"
 #include "mail-index-data.h"
 #include "mail-index-util.h"
@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-IBuffer *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
+IStream *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
 			   time_t *internal_date, int *deleted)
 {
 	struct stat st;
@@ -54,10 +54,10 @@
 	}
 
 	if (index->mail_read_mmaped) {
-		return i_buffer_create_mmap(fd, default_pool,
+		return i_stream_create_mmap(fd, default_pool,
 					    MAIL_MMAP_BLOCK_SIZE, 0, 0, TRUE);
 	} else {
-		return i_buffer_create_file(fd, default_pool,
+		return i_stream_create_file(fd, default_pool,
 					    MAIL_READ_BLOCK_SIZE, TRUE);
 	}
 }

--- a/src/lib-index/maildir/maildir-update.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/maildir/maildir-update.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,12 +1,12 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "maildir-index.h"
 
 int maildir_record_update(MailIndex *index, MailIndexUpdate *update, int fd)
 {
-	IBuffer *inbuf;
+	IStream *input;
         MailDataField cache_fields;
 
 	/* don't even bother opening the file if we're not going to do
@@ -17,14 +17,14 @@
 
 	t_push();
 	if (index->mail_read_mmaped) {
-		inbuf = i_buffer_create_mmap(fd, data_stack_pool,
+		input = i_stream_create_mmap(fd, data_stack_pool,
 					     MAIL_MMAP_BLOCK_SIZE, 0, 0, FALSE);
 	} else {
-		inbuf = i_buffer_create_file(fd, data_stack_pool,
+		input = i_stream_create_file(fd, data_stack_pool,
 					     MAIL_READ_BLOCK_SIZE, FALSE);
 	}
-	mail_index_update_headers(update, inbuf, cache_fields, NULL, NULL);
-	i_buffer_unref(inbuf);
+	mail_index_update_headers(update, input, cache_fields, NULL, NULL);
+	i_stream_unref(input);
 	t_pop();
 	return TRUE;
 }

--- a/src/lib-index/mbox/mbox-append.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-append.c	Fri Dec 06 03:09:22 2002 +0200
@@ -2,13 +2,13 @@
 
 #include "lib.h"
 #include "ioloop.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "hex-binary.h"
 #include "md5.h"
 #include "mbox-index.h"
 #include "mail-index-util.h"
 
-static int mbox_index_append_next(MailIndex *index, IBuffer *inbuf)
+static int mbox_index_append_next(MailIndex *index, IStream *input)
 {
 	MailIndexRecord *rec;
 	MailIndexUpdate *update;
@@ -22,7 +22,7 @@
 
 	/* get the From-line */
 	pos = 0;
-	while (i_buffer_read_data(inbuf, &data, &size, pos) > 0) {
+	while (i_stream_read_data(input, &data, &size, pos) > 0) {
 		for (; pos < size; pos++) {
 			if (data[pos] == '\n')
 				break;
@@ -48,13 +48,13 @@
 	if (internal_date == (time_t)-1)
 		internal_date = ioloop_time;
 
-	i_buffer_skip(inbuf, pos+1);
-	abs_start_offset = inbuf->start_offset + inbuf->v_offset;
+	i_stream_skip(input, pos+1);
+	abs_start_offset = input->start_offset + input->v_offset;
 
 	/* now, find the end of header. also stops at "\nFrom " if it's
 	   found (broken messages) */
-	mbox_skip_header(inbuf);
-	eoh_offset = inbuf->v_offset;
+	mbox_skip_header(input);
+	eoh_offset = input->v_offset;
 
 	/* add message to index */
 	rec = index->append_begin(index);
@@ -71,22 +71,22 @@
 				&abs_start_offset, sizeof(uoff_t));
 
 	/* parse the header and cache wanted fields. get the message flags
-	   from Status and X-Status fields. temporarily limit the buffer size
+	   from Status and X-Status fields. temporarily limit the stream length
 	   so the message body is parsed properly.
 
-	   the buffer limit is raised again by mbox_header_func after reading
-	   the headers. it uses Content-Length if available or finds the next
-	   From-line. */
-	mbox_header_init_context(&ctx, index, inbuf);
+	   the stream length limit is raised again by mbox_header_func after
+	   reading the headers. it uses Content-Length if available or finds
+	   the next From-line. */
+	mbox_header_init_context(&ctx, index, input);
         ctx.set_read_limit = TRUE;
 
-	i_buffer_seek(inbuf, abs_start_offset - inbuf->start_offset);
+	i_stream_seek(input, abs_start_offset - input->start_offset);
 
-	i_buffer_set_read_limit(inbuf, eoh_offset);
-	mail_index_update_headers(update, inbuf, 0, mbox_header_func, &ctx);
+	i_stream_set_read_limit(input, eoh_offset);
+	mail_index_update_headers(update, input, 0, mbox_header_func, &ctx);
 
-	i_buffer_seek(inbuf, inbuf->v_limit);
-	i_buffer_set_read_limit(inbuf, 0);
+	i_stream_seek(input, input->v_limit);
+	i_stream_set_read_limit(input, 0);
 
 	/* save MD5 */
 	md5_final(&ctx.md5, md5_digest);
@@ -110,9 +110,9 @@
 	return !failed;
 }
 
-int mbox_index_append(MailIndex *index, IBuffer *inbuf)
+int mbox_index_append(MailIndex *index, IStream *input)
 {
-	if (inbuf->v_offset == inbuf->v_size) {
+	if (input->v_offset == input->v_size) {
 		/* no new data */
 		return TRUE;
 	}
@@ -121,10 +121,10 @@
 		return FALSE;
 
 	for (;;) {
-		if (inbuf->start_offset + inbuf->v_offset != 0) {
+		if (input->start_offset + input->v_offset != 0) {
 			/* we're at the [\r]\n before the From-line,
 			   skip it */
-			if (!mbox_skip_crlf(inbuf)) {
+			if (!mbox_skip_crlf(input)) {
 				index_set_error(index,
 						"Error indexing mbox file %s: "
 						"LF not found where expected",
@@ -135,10 +135,10 @@
 			}
 		}
 
-		if (inbuf->v_offset == inbuf->v_size)
+		if (input->v_offset == input->v_size)
 			break;
 
-		if (!mbox_index_append_next(index, inbuf))
+		if (!mbox_index_append_next(index, input))
 			return FALSE;
 	}
 

--- a/src/lib-index/mbox/mbox-index.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-index.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "rfc822-tokenize.h"
 #include "mbox-index.h"
 #include "mbox-lock.h"
@@ -49,7 +49,8 @@
 	return TRUE;
 }
 
-IBuffer *mbox_get_inbuf(MailIndex *index, uoff_t offset, MailLockType lock_type)
+IStream *mbox_get_stream(MailIndex *index, uoff_t offset,
+			 MailLockType lock_type)
 {
 	i_assert(offset < OFF_T_MAX);
 
@@ -70,11 +71,11 @@
 		break;
 	}
 
-	if (index->mbox_inbuf == NULL) {
+	if (index->mbox_stream == NULL) {
 		/* FIXME: breaks expunge */
 		/*if (index->mail_read_mmaped) {*/
-			index->mbox_inbuf =
-				i_buffer_create_mmap(index->mbox_fd,
+			index->mbox_stream =
+				i_stream_create_mmap(index->mbox_fd,
 						     default_pool,
 						     MAIL_MMAP_BLOCK_SIZE,
 						     0, 0, FALSE);
@@ -84,34 +85,34 @@
 				return NULL;
 			}
 
-			index->mbox_inbuf =
-				i_buffer_create_file(index->mbox_fd,
+			index->mbox_stream =
+				i_stream_create_file(index->mbox_fd,
 						     default_pool,
 						     MAIL_READ_BLOCK_SIZE,
 						     FALSE);
 		}*/
 	}
 
-	i_buffer_set_read_limit(index->mbox_inbuf, 0);
-	i_buffer_set_start_offset(index->mbox_inbuf, (uoff_t)offset);
-	i_buffer_seek(index->mbox_inbuf, 0);
+	i_stream_set_read_limit(index->mbox_stream, 0);
+	i_stream_set_start_offset(index->mbox_stream, (uoff_t)offset);
+	i_stream_seek(index->mbox_stream, 0);
 
-	i_buffer_ref(index->mbox_inbuf);
-	return index->mbox_inbuf;
+	i_stream_ref(index->mbox_stream);
+	return index->mbox_stream;
 }
 
-void mbox_file_close_inbuf(MailIndex *index)
+void mbox_file_close_stream(MailIndex *index)
 {
-	if (index->mbox_inbuf != NULL) {
-		i_buffer_close(index->mbox_inbuf);
-		i_buffer_unref(index->mbox_inbuf);
-		index->mbox_inbuf = NULL;
+	if (index->mbox_stream != NULL) {
+		i_stream_close(index->mbox_stream);
+		i_stream_unref(index->mbox_stream);
+		index->mbox_stream = NULL;
 	}
 }
 
 void mbox_file_close_fd(MailIndex *index)
 {
-	mbox_file_close_inbuf(index);
+	mbox_file_close_stream(index);
 
 	if (index->mbox_fd != -1) {
 		close(index->mbox_fd);
@@ -120,13 +121,13 @@
 }
 
 void mbox_header_init_context(MboxHeaderContext *ctx, MailIndex *index,
-			      IBuffer *inbuf)
+			      IStream *input)
 {
 	memset(ctx, 0, sizeof(MboxHeaderContext));
 	md5_init(&ctx->md5);
 
 	ctx->index = index;
-	ctx->inbuf = inbuf;
+	ctx->input = input;
 	ctx->custom_flags = mail_custom_flags_list_get(index->custom_flags);
 }
 
@@ -261,21 +262,21 @@
 			break;
 
 		/* a) use Content-Length, b) search for "From "-line */
-		start_offset = ctx->inbuf->v_offset;
-		i_buffer_set_read_limit(ctx->inbuf, 0);
+		start_offset = ctx->input->v_offset;
+		i_stream_set_read_limit(ctx->input, 0);
 
 		end_offset = start_offset + ctx->content_length;
 		if (ctx->content_length == 0 ||
-		    !mbox_verify_end_of_body(ctx->inbuf, end_offset)) {
+		    !mbox_verify_end_of_body(ctx->input, end_offset)) {
 			if (ctx->content_length != 0)
-				i_buffer_seek(ctx->inbuf, start_offset);
-			mbox_skip_message(ctx->inbuf);
-			end_offset = ctx->inbuf->v_offset;
+				i_stream_seek(ctx->input, start_offset);
+			mbox_skip_message(ctx->input);
+			end_offset = ctx->input->v_offset;
 			ctx->content_length = end_offset - start_offset;
 		}
 
-		i_buffer_seek(ctx->inbuf, start_offset);
-		i_buffer_set_read_limit(ctx->inbuf, end_offset);
+		i_stream_seek(ctx->input, start_offset);
+		i_stream_set_read_limit(ctx->input, end_offset);
 		break;
 
 	case 'R':
@@ -420,16 +421,16 @@
 	}
 }
 
-int mbox_skip_crlf(IBuffer *inbuf)
+int mbox_skip_crlf(IStream *input)
 {
 	const unsigned char *data;
 	size_t size, pos;
 
 	pos = 0;
-	while (i_buffer_read_data(inbuf, &data, &size, pos) > 0) {
+	while (i_stream_read_data(input, &data, &size, pos) > 0) {
 		if (pos == 0) {
 			if (data[0] == '\n') {
-				i_buffer_skip(inbuf, 1);
+				i_stream_skip(input, 1);
 				return TRUE;
 			}
 			if (data[0] != '\r')
@@ -442,7 +443,7 @@
 			if (data[1] != '\n')
 				return FALSE;
 
-			i_buffer_skip(inbuf, 2);
+			i_stream_skip(input, 2);
 			return TRUE;
 		}
 	}
@@ -451,32 +452,32 @@
 	return TRUE;
 }
 
-void mbox_skip_empty_lines(IBuffer *inbuf)
+void mbox_skip_empty_lines(IStream *input)
 {
 	const unsigned char *data;
 	size_t i, size;
 
 	/* skip empty lines at beginning */
-	while (i_buffer_read_data(inbuf, &data, &size, 0) > 0) {
+	while (i_stream_read_data(input, &data, &size, 0) > 0) {
 		for (i = 0; i < size; i++) {
 			if (data[i] != '\r' && data[i] != '\n')
 				break;
 		}
 
-		i_buffer_skip(inbuf, i);
+		i_stream_skip(input, i);
 
 		if (i < size)
 			break;
 	}
 }
 
-static int mbox_is_valid_from(IBuffer *inbuf, size_t startpos)
+static int mbox_is_valid_from(IStream *input, size_t startpos)
 {
 	const unsigned char *msg;
 	size_t i, size;
 
 	i = startpos;
-	while (i_buffer_read_data(inbuf, &msg, &size, i) > 0) {
+	while (i_stream_read_data(input, &msg, &size, i) > 0) {
 		for (; i < size; i++) {
 			if (msg[i] == '\n') {
 				msg += startpos;
@@ -490,7 +491,7 @@
 	return FALSE;
 }
 
-static void mbox_skip_forward(IBuffer *inbuf, int header)
+static void mbox_skip_forward(IStream *input, int header)
 {
 	const unsigned char *msg;
 	size_t i, size, startpos, eoh;
@@ -500,7 +501,7 @@
 	   buffer */
 	startpos = i = 0; eoh = 0; lastmsg = TRUE;
 	state = '\n';
-	while (i_buffer_read_data(inbuf, &msg, &size, startpos) > 0) {
+	while (i_stream_read_data(input, &msg, &size, startpos) > 0) {
 		for (i = startpos; i < size; i++) {
 			new_state = 0;
 			switch (state) {
@@ -544,7 +545,7 @@
 				break;
 			case 'm':
 				if (msg[i] == ' ') {
-					if (mbox_is_valid_from(inbuf, i+1)) {
+					if (mbox_is_valid_from(input, i+1)) {
 						/* Go back "From" */
 						i -= 4;
 
@@ -557,7 +558,7 @@
 						if (i > 0 && msg[i-1] == '\r')
 							i--;
 
-						i_buffer_skip(inbuf, i);
+						i_stream_skip(input, i);
 						return;
 					}
 				}
@@ -570,7 +571,7 @@
 				state = msg[i] == '\n' ? '\n' : 0;
 			else {
 				/* end of header position confirmed */
-				i_buffer_skip(inbuf, eoh);
+				i_stream_skip(input, eoh);
 				return;
 			}
 		}
@@ -585,20 +586,20 @@
 			eoh -= i;
 		}
 
-		i_buffer_skip(inbuf, i);
+		i_stream_skip(input, i);
 	}
 
 	if (eoh != 0) {
 		/* make sure we didn't end with \n\n or \n\r\n. In these
 		   cases the last [\r]\n doesn't belong to our message. */
 		if (eoh < size && (msg[eoh] != '\r' || eoh < size-1)) {
-			i_buffer_skip(inbuf, eoh);
+			i_stream_skip(input, eoh);
 			return;
 		}
 	}
 
 	/* end of file, leave the last [\r]\n */
-	msg = i_buffer_get_data(inbuf, &size);
+	msg = i_stream_get_data(input, &size);
 	if (size == startpos && startpos > 0) {
 		if (msg[startpos-1] == '\n')
 			startpos--;
@@ -606,39 +607,39 @@
 			startpos--;
 	}
 
-	i_buffer_skip(inbuf, startpos);
+	i_stream_skip(input, startpos);
 }
 
-void mbox_skip_header(IBuffer *inbuf)
+void mbox_skip_header(IStream *input)
 {
-	mbox_skip_forward(inbuf, TRUE);
+	mbox_skip_forward(input, TRUE);
 }
 
-void mbox_skip_message(IBuffer *inbuf)
+void mbox_skip_message(IStream *input)
 {
-	mbox_skip_forward(inbuf, FALSE);
+	mbox_skip_forward(input, FALSE);
 }
 
-int mbox_verify_end_of_body(IBuffer *inbuf, uoff_t end_offset)
+int mbox_verify_end_of_body(IStream *input, uoff_t end_offset)
 {
 	const unsigned char *data;
 	size_t size;
 
-	if (end_offset > inbuf->v_size) {
+	if (end_offset > input->v_size) {
 		/* missing data */
 		return FALSE;
 	}
 
-	i_buffer_seek(inbuf, end_offset);
+	i_stream_seek(input, end_offset);
 
-	if (inbuf->v_offset == inbuf->v_size) {
+	if (input->v_offset == input->v_size) {
 		/* end of file. a bit unexpected though,
 		   since \n is missing. */
 		return TRUE;
 	}
 
 	/* read forward a bit */
-	if (i_buffer_read_data(inbuf, &data, &size, 6) < 0)
+	if (i_stream_read_data(input, &data, &size, 6) < 0)
 		return FALSE;
 
 	/* either there should be the next From-line,

--- a/src/lib-index/mbox/mbox-index.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-index.h	Fri Dec 06 03:09:22 2002 +0200
@@ -11,7 +11,7 @@
 	MD5Context md5;
 	int received;
 
-	IBuffer *inbuf;
+	IStream *input;
 	uoff_t content_length;
 	int set_read_limit;
 } MboxHeaderContext;
@@ -22,13 +22,13 @@
    which is useful when you want to be sure you're not accessing a deleted
    mbox file. */
 int mbox_file_open(MailIndex *index);
-IBuffer *mbox_get_inbuf(MailIndex *index, uoff_t offset,
-			MailLockType lock_type);
-void mbox_file_close_inbuf(MailIndex *index);
+IStream *mbox_get_stream(MailIndex *index, uoff_t offset,
+			 MailLockType lock_type);
+void mbox_file_close_stream(MailIndex *index);
 void mbox_file_close_fd(MailIndex *index);
 
 void mbox_header_init_context(MboxHeaderContext *ctx, MailIndex *index,
-			      IBuffer *inbuf);
+			      IStream *input);
 void mbox_header_free_context(MboxHeaderContext *ctx);
 void mbox_header_func(MessagePart *part __attr_unused__,
 		      const char *name, size_t name_len,
@@ -38,11 +38,11 @@
 			 const char *custom_flags[MAIL_CUSTOM_FLAGS_COUNT],
 			 void (*func)(const char *, size_t, int, void *),
 			 void *context);
-int mbox_skip_crlf(IBuffer *inbuf);
-void mbox_skip_empty_lines(IBuffer *inbuf);
-void mbox_skip_header(IBuffer *inbuf);
-void mbox_skip_message(IBuffer *inbuf);
-int mbox_verify_end_of_body(IBuffer *inbuf, uoff_t end_offset);
+int mbox_skip_crlf(IStream *input);
+void mbox_skip_empty_lines(IStream *input);
+void mbox_skip_header(IStream *input);
+void mbox_skip_message(IStream *input);
+int mbox_verify_end_of_body(IStream *input, uoff_t end_offset);
 int mbox_mail_get_location(MailIndex *index, MailIndexRecord *rec,
 			   uoff_t *offset, uoff_t *hdr_size, uoff_t *body_size);
 
@@ -50,10 +50,10 @@
 int mbox_index_rebuild(MailIndex *index);
 int mbox_index_sync(MailIndex *index, MailLockType lock_type, int *changes);
 int mbox_sync_full(MailIndex *index);
-IBuffer *mbox_open_mail(MailIndex *index, MailIndexRecord *rec,
+IStream *mbox_open_mail(MailIndex *index, MailIndexRecord *rec,
 			time_t *internal_date, int *deleted);
 
-int mbox_index_append(MailIndex *index, IBuffer *inbuf);
+int mbox_index_append(MailIndex *index, IStream *input);
 
 time_t mbox_from_parse_date(const char *msg, size_t size);
 const char *mbox_from_create(const char *sender, time_t time);

--- a/src/lib-index/mbox/mbox-lock.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-lock.c	Fri Dec 06 03:09:22 2002 +0200
@@ -390,7 +390,7 @@
 	   been changes to file size which would break things. or actually
 	   it'd break only if file was shrinked+grown back to exact size,
 	   but still possible :) */
-	mbox_file_close_inbuf(index);
+	mbox_file_close_stream(index);
 
 	index->mbox_lock_type = MAIL_LOCK_UNLOCK;
 	return !failed;

--- a/src/lib-index/mbox/mbox-open.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-open.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "mbox-index.h"
 #include "mail-index-data.h"
 #include "mail-index-util.h"
@@ -10,10 +10,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-IBuffer *mbox_open_mail(MailIndex *index, MailIndexRecord *rec,
+IStream *mbox_open_mail(MailIndex *index, MailIndexRecord *rec,
 			time_t *internal_date, int *deleted)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	uoff_t offset, hdr_size, body_size;
 
 	i_assert(index->lock_type != MAIL_LOCK_UNLOCK);
@@ -27,8 +27,8 @@
 	if (!mbox_mail_get_location(index, rec, &offset, &hdr_size, &body_size))
 		return NULL;
 
-	inbuf = mbox_get_inbuf(index, offset, MAIL_LOCK_SHARED);
-	if (inbuf == NULL)
+	input = mbox_get_stream(index, offset, MAIL_LOCK_SHARED);
+	if (input == NULL)
 		return NULL;
 
 	if (internal_date != NULL)
@@ -36,6 +36,6 @@
 
 	i_assert(index->mbox_sync_counter == index->mbox_lock_counter);
 
-	i_buffer_set_read_limit(inbuf, hdr_size + body_size);
-	return inbuf;
+	i_stream_set_read_limit(input, hdr_size + body_size);
+	return input;
 }

--- a/src/lib-index/mbox/mbox-rebuild.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-rebuild.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "mbox-index.h"
 #include "mbox-lock.h"
 #include "mail-index-data.h"
@@ -14,7 +14,7 @@
 
 int mbox_index_rebuild(MailIndex *index)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	struct stat st;
 	int failed;
 
@@ -43,14 +43,14 @@
 	if (!mail_index_data_reset(index->data))
 		return FALSE;
 
-	inbuf = mbox_get_inbuf(index, 0, MAIL_LOCK_SHARED);
-	if (inbuf == NULL)
+	input = mbox_get_stream(index, 0, MAIL_LOCK_SHARED);
+	if (input == NULL)
 		return FALSE;
 
-	mbox_skip_empty_lines(inbuf);
-	failed = !mbox_index_append(index, inbuf);
+	mbox_skip_empty_lines(input);
+	failed = !mbox_index_append(index, input);
 
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 
 	if (failed)
 		return FALSE;

--- a/src/lib-index/mbox/mbox-rewrite.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-rewrite.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,8 +1,8 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "temp-string.h"
 #include "write-full.h"
 #include "mbox-index.h"
@@ -16,7 +16,7 @@
 #include <fcntl.h>
 
 typedef struct {
-	OBuffer *outbuf;
+	OStream *output;
 	int failed;
 
 	uoff_t content_length;
@@ -49,21 +49,22 @@
 				  MAIL_INDEX_FLAG_DIRTY_CUSTOMFLAGS);
 }
 
-static int mbox_write(MailIndex *index, IBuffer *inbuf, OBuffer *outbuf,
+static int mbox_write(MailIndex *index, IStream *input, OStream *output,
 		      uoff_t end_offset)
 {
 	uoff_t old_limit;
 	int failed;
 
-	i_assert(inbuf->v_offset <= end_offset);
+	i_assert(input->v_offset <= end_offset);
 
-	old_limit = inbuf->v_limit;
-	i_buffer_set_read_limit(inbuf, end_offset);
-	if (o_buffer_send_ibuffer(outbuf, inbuf) < 0) {
+	old_limit = input->v_limit;
+	i_stream_set_read_limit(input, end_offset);
+	if (o_stream_send_istream(output, input) < 0) {
 		index_set_error(index, "Error rewriting mbox file %s: %s",
-				index->mbox_path, strerror(outbuf->buf_errno));
+				index->mbox_path,
+				strerror(output->stream_errno));
 		failed = TRUE;
-	} else if (inbuf->v_offset < end_offset) {
+	} else if (input->v_offset < end_offset) {
 		/* fsck should have noticed it.. */
 		index_set_error(index, "Error rewriting mbox file %s: "
 				"Unexpected end of file", index->mbox_path);
@@ -72,7 +73,7 @@
 		failed = FALSE;
 	}
 
-	i_buffer_set_read_limit(inbuf, old_limit);
+	i_stream_set_read_limit(input, old_limit);
 	return !failed;
 }
 
@@ -83,21 +84,21 @@
 
 	str = t_strdup_printf("X-IMAPbase: %u %u",
 			      ctx->uid_validity, ctx->uid_last);
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 
 	for (i = 0; i < MAIL_CUSTOM_FLAGS_COUNT; i++) {
 		if (ctx->custom_flags[i] != NULL) {
-			if (o_buffer_send(ctx->outbuf, " ", 1) < 0)
+			if (o_stream_send(ctx->output, " ", 1) < 0)
 				return FALSE;
 
-			if (o_buffer_send(ctx->outbuf, ctx->custom_flags[i],
+			if (o_stream_send(ctx->output, ctx->custom_flags[i],
 					  strlen(ctx->custom_flags[i])) < 0)
 				return FALSE;
 		}
 	}
 
-	if (o_buffer_send(ctx->outbuf, "\n", 1) < 0)
+	if (o_stream_send(ctx->output, "\n", 1) < 0)
 		return FALSE;
 
 	return TRUE;
@@ -112,16 +113,16 @@
 	    x_keywords == NULL)
 		return TRUE;
 
-	if (o_buffer_send(ctx->outbuf, "X-Keywords:", 11) < 0)
+	if (o_stream_send(ctx->output, "X-Keywords:", 11) < 0)
 		return FALSE;
 
 	field = 1 << MAIL_CUSTOM_FLAG_1_BIT;
 	for (i = 0; i < MAIL_CUSTOM_FLAGS_COUNT; i++, field <<= 1) {
 		if ((ctx->msg_flags & field) && ctx->custom_flags[i] != NULL) {
-			if (o_buffer_send(ctx->outbuf, " ", 1) < 0)
+			if (o_stream_send(ctx->output, " ", 1) < 0)
 				return FALSE;
 
-			if (o_buffer_send(ctx->outbuf, ctx->custom_flags[i],
+			if (o_stream_send(ctx->output, ctx->custom_flags[i],
 					  strlen(ctx->custom_flags[i])) < 0)
 				return FALSE;
 		}
@@ -129,15 +130,15 @@
 
 	if (x_keywords != NULL) {
 		/* X-Keywords that aren't custom flags */
-		if (o_buffer_send(ctx->outbuf, " ", 1) < 0)
+		if (o_stream_send(ctx->output, " ", 1) < 0)
 			return FALSE;
 
-		if (o_buffer_send(ctx->outbuf, x_keywords,
+		if (o_stream_send(ctx->output, x_keywords,
 				  strlen(x_keywords)) < 0)
 			return FALSE;
 	}
 
-	if (o_buffer_send(ctx->outbuf, "\n", 1) < 0)
+	if (o_stream_send(ctx->output, "\n", 1) < 0)
 		return FALSE;
 
 	return TRUE;
@@ -151,9 +152,9 @@
 	if (status != NULL)
 		str = t_strconcat(str, status, NULL);
 
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
-	if (o_buffer_send(ctx->outbuf, "\n", 1) < 0)
+	if (o_stream_send(ctx->output, "\n", 1) < 0)
 		return FALSE;
 
 	return TRUE;
@@ -175,9 +176,9 @@
 			  (ctx->msg_flags & MAIL_DELETED) ? "T" : "",
 			  x_status, NULL);
 
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
-	if (o_buffer_send(ctx->outbuf, "\n", 1) < 0)
+	if (o_stream_send(ctx->output, "\n", 1) < 0)
 		return FALSE;
 
 	return TRUE;
@@ -190,7 +191,7 @@
 	i_snprintf(str, sizeof(str), "Content-Length: %"PRIuUOFF_T"\n",
 		   ctx->content_length);
 
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 	return TRUE;
 }
@@ -283,19 +284,19 @@
 		(void)mbox_write_content_length(ctx);
 	} else if (name_len > 0) {
 		/* save this header */
-		(void)o_buffer_send(ctx->outbuf, name, name_len);
-		(void)o_buffer_send(ctx->outbuf, ": ", 2);
-		(void)o_buffer_send(ctx->outbuf, value, value_len);
-		(void)o_buffer_send(ctx->outbuf, "\n", 1);
+		(void)o_stream_send(ctx->output, name, name_len);
+		(void)o_stream_send(ctx->output, ": ", 2);
+		(void)o_stream_send(ctx->output, value, value_len);
+		(void)o_stream_send(ctx->output, "\n", 1);
 	}
 
-	if (ctx->outbuf->closed)
+	if (ctx->output->closed)
 		ctx->failed = TRUE;
 }
 
 static int mbox_write_header(MailIndex *index,
 			     MailIndexRecord *rec, unsigned int seq,
-			     IBuffer *inbuf, OBuffer *outbuf, uoff_t end_offset,
+			     IStream *input, OStream *output, uoff_t end_offset,
 			     uoff_t hdr_size, uoff_t body_size)
 {
 	/* We need to update fields that define message flags. Standard fields
@@ -312,7 +313,7 @@
 	MboxRewriteContext ctx;
 	MessageSize hdr_parsed_size;
 
-	if (inbuf->v_offset >= end_offset) {
+	if (input->v_offset >= end_offset) {
 		/* fsck should have noticed it.. */
 		index_set_error(index, "Error rewriting mbox file %s: "
 				"Unexpected end of file", index->mbox_path);
@@ -323,16 +324,16 @@
 
 	/* parse the header, write the fields we don't want to change */
 	memset(&ctx, 0, sizeof(ctx));
-	ctx.outbuf = outbuf;
+	ctx.output = output;
 	ctx.seq = seq;
 	ctx.content_length = body_size;
 	ctx.msg_flags = rec->msg_flags;
 	ctx.uid_validity = index->header->uid_validity-1;
 	ctx.custom_flags = mail_custom_flags_list_get(index->custom_flags);
 
-	i_buffer_set_read_limit(inbuf, inbuf->v_offset + hdr_size);
-	message_parse_header(NULL, inbuf, &hdr_parsed_size, header_func, &ctx);
-	i_buffer_set_read_limit(inbuf, 0);
+	i_stream_set_read_limit(input, input->v_offset + hdr_size);
+	message_parse_header(NULL, input, &hdr_parsed_size, header_func, &ctx);
+	i_stream_set_read_limit(input, 0);
 
 	i_assert(hdr_parsed_size.physical_size == hdr_size);
 
@@ -354,15 +355,15 @@
 	t_pop();
 
 	/* empty line ends headers */
-	(void)o_buffer_send(outbuf, "\n", 1);
+	(void)o_stream_send(output, "\n", 1);
 
 	return TRUE;
 }
 
 static int fd_copy(int in_fd, int out_fd, uoff_t out_offset)
 {
-	IBuffer *inbuf;
-	OBuffer *outbuf;
+	IStream *input;
+	OStream *output;
 	int ret;
 
 	i_assert(out_offset <= OFF_T_MAX);
@@ -372,22 +373,22 @@
 
 	t_push();
 
-	inbuf = i_buffer_create_mmap(in_fd, data_stack_pool,
+	input = i_stream_create_mmap(in_fd, data_stack_pool,
 				     1024*256, 0, 0, FALSE);
-	outbuf = o_buffer_create_file(out_fd, data_stack_pool, 1024, 0, FALSE);
-	o_buffer_set_blocking(outbuf, 60000, NULL, NULL);
+	output = o_stream_create_file(out_fd, data_stack_pool, 1024, 0, FALSE);
+	o_stream_set_blocking(output, 60000, NULL, NULL);
 
-	ret = o_buffer_send_ibuffer(outbuf, inbuf);
+	ret = o_stream_send_istream(output, input);
 	if (ret < 0)
-		errno = outbuf->buf_errno;
+		errno = output->stream_errno;
 	else {
 		/* we may have shrinked the file */
-		i_assert(out_offset + inbuf->v_size <= OFF_T_MAX);
-		ret = ftruncate(out_fd, (off_t) (out_offset + inbuf->v_size));
+		i_assert(out_offset + input->v_size <= OFF_T_MAX);
+		ret = ftruncate(out_fd, (off_t) (out_offset + input->v_size));
 	}
 
-	o_buffer_unref(outbuf);
-	i_buffer_unref(inbuf);
+	o_stream_unref(output);
+	i_stream_unref(input);
 	t_pop();
 
 	return ret;
@@ -403,8 +404,8 @@
 	   interrupted (see below). This rewriting relies quite a lot on
 	   valid header/body sizes which fsck() should have ensured. */
 	MailIndexRecord *rec;
-	IBuffer *inbuf;
-	OBuffer *outbuf;
+	IStream *input;
+	OStream *output;
 	uoff_t offset, hdr_size, body_size, dirty_offset;
 	const char *path;
 	unsigned int seq;
@@ -426,7 +427,7 @@
 		return TRUE;
 	}
 
-	tmp_fd = -1; inbuf = NULL;
+	tmp_fd = -1; input = NULL;
 	failed = TRUE; rewrite = FALSE;
 	do {
 		if (!index->set_lock(index, MAIL_LOCK_EXCLUSIVE))
@@ -435,8 +436,8 @@
 		if (!index->sync_and_lock(index, MAIL_LOCK_EXCLUSIVE, NULL))
 			break;
 
-		inbuf = mbox_get_inbuf(index, 0, MAIL_LOCK_EXCLUSIVE);
-		if (inbuf == NULL)
+		input = mbox_get_stream(index, 0, MAIL_LOCK_EXCLUSIVE);
+		if (input == NULL)
 			break;
 
 		if ((index->header->flags & INDEX_DIRTY_FLAGS) == 0) {
@@ -456,8 +457,8 @@
 	if (!rewrite) {
 		if (!index->set_lock(index, MAIL_LOCK_UNLOCK))
 			failed = TRUE;
-		if (inbuf != NULL)
-			i_buffer_unref(inbuf);
+		if (input != NULL)
+			i_stream_unref(input);
 		return !failed;
 	}
 
@@ -469,10 +470,10 @@
 	}
 	dirty_offset = 0;
 
-	/* note: we can't use data_stack_pool with outbuf because it's
+	/* note: we can't use data_stack_pool with output stream because it's
 	   being written to inside t_push() .. t_pop() calls */
-	outbuf = o_buffer_create_file(tmp_fd, system_pool, 8192, 0, FALSE);
-	o_buffer_set_blocking(outbuf, 60000, NULL, NULL);
+	output = o_stream_create_file(tmp_fd, system_pool, 8192, 0, FALSE);
+	o_stream_set_blocking(output, 60000, NULL, NULL);
 
 	failed = FALSE; seq = 1;
 	rec = index->lookup(index, 1);
@@ -486,14 +487,14 @@
 				break;
 			}
 
-			if (offset < inbuf->v_offset) {
+			if (offset < input->v_offset) {
 				index_set_corrupted(index,
 						    "Invalid message offset");
 				failed = TRUE;
 				break;
 			}
 
-			if (offset + hdr_size + body_size > inbuf->v_size) {
+			if (offset + hdr_size + body_size > input->v_size) {
 				index_set_corrupted(index,
 						    "Invalid message size");
 				failed = TRUE;
@@ -507,19 +508,19 @@
 			dirty_found = TRUE;
 			dirty_offset = offset;
 
-			i_buffer_seek(inbuf, dirty_offset);
+			i_stream_seek(input, dirty_offset);
 		}
 
 		if (dirty_found) {
 			/* write the From-line */
-			if (!mbox_write(index, inbuf, outbuf, offset)) {
+			if (!mbox_write(index, input, output, offset)) {
 				failed = TRUE;
 				break;
 			}
 
 			/* write header, updating flag fields */
 			offset += hdr_size;
-			if (!mbox_write_header(index, rec, seq, inbuf, outbuf,
+			if (!mbox_write_header(index, rec, seq, input, output,
 					       offset, hdr_size, body_size)) {
 				failed = TRUE;
 				break;
@@ -527,7 +528,7 @@
 
 			/* write body */
 			offset += body_size;
-			if (!mbox_write(index, inbuf, outbuf, offset)) {
+			if (!mbox_write(index, input, output, offset)) {
 				failed = TRUE;
 				break;
 			}
@@ -545,17 +546,17 @@
 
 	if (!failed) {
 		/* always end with a \n */
-		(void)o_buffer_send(outbuf, "\n", 1);
+		(void)o_stream_send(output, "\n", 1);
 	}
 
-	if (outbuf->closed) {
-		errno = outbuf->buf_errno;
+	if (output->closed) {
+		errno = output->stream_errno;
 		mbox_set_syscall_error(index, "write()");
 		failed = TRUE;
 	}
 
-	i_buffer_unref(inbuf);
-	o_buffer_unref(outbuf);
+	i_stream_unref(input);
+	o_stream_unref(output);
 
 	if (!failed) {
 		/* POSSIBLE DATA LOSS HERE. We're writing to the mbox file,

--- a/src/lib-index/mbox/mbox-sync-full.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-sync-full.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "hex-binary.h"
 #include "message-parser.h"
 #include "message-part-serialize.h"
@@ -12,20 +12,20 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-static void skip_line(IBuffer *inbuf)
+static void skip_line(IStream *input)
 {
 	const unsigned char *msg;
 	size_t i, size;
 
-	while (i_buffer_read_data(inbuf, &msg, &size, 0) > 0) {
+	while (i_stream_read_data(input, &msg, &size, 0) > 0) {
 		for (i = 0; i < size; i++) {
 			if (msg[i] == '\n') {
-				i_buffer_skip(inbuf, i+1);
+				i_stream_skip(input, i+1);
 				return;
 			}
 		}
 
-		i_buffer_skip(inbuf, i);
+		i_stream_skip(input, i);
 	}
 }
 
@@ -90,7 +90,7 @@
 }
 
 static int match_next_record(MailIndex *index, MailIndexRecord *rec,
-			     unsigned int seq, IBuffer *inbuf,
+			     unsigned int seq, IStream *input,
 			     MailIndexRecord **next_rec, int *dirty)
 {
         MailIndexUpdate *update;
@@ -102,8 +102,8 @@
 	*next_rec = NULL;
 
 	/* skip the From-line */
-	skip_line(inbuf);
-	header_offset = inbuf->v_offset;
+	skip_line(input);
+	header_offset = input->v_offset;
 
 	if (!mbox_mail_get_location(index, rec, NULL, &hdr_size, &body_size))
 		return FALSE;
@@ -111,25 +111,25 @@
 	if (body_size == 0) {
 		/* possibly broken message, find the next From-line and make
 		   sure header parser won't pass it. */
-		mbox_skip_header(inbuf);
-		i_buffer_set_read_limit(inbuf, inbuf->v_offset);
-		i_buffer_seek(inbuf, header_offset);
+		mbox_skip_header(input);
+		i_stream_set_read_limit(input, input->v_offset);
+		i_stream_seek(input, header_offset);
 	}
 
 	/* get the MD5 sum of fixed headers and the current message flags
 	   in Status and X-Status fields */
-        mbox_header_init_context(&ctx, index, inbuf);
-	message_parse_header(NULL, inbuf, &hdr_parsed_size,
+        mbox_header_init_context(&ctx, index, input);
+	message_parse_header(NULL, input, &hdr_parsed_size,
 			     mbox_header_func, &ctx);
 	md5_final(&ctx.md5, current_digest);
 
 	mbox_header_free_context(&ctx);
-	i_buffer_set_read_limit(inbuf, 0);
+	i_stream_set_read_limit(input, 0);
 
-	body_offset = inbuf->v_offset;
+	body_offset = input->v_offset;
 	do {
 		if (verify_header_md5sum(index, rec, current_digest) &&
-		    mbox_verify_end_of_body(inbuf, body_offset + body_size)) {
+		    mbox_verify_end_of_body(input, body_offset + body_size)) {
 			/* valid message */
 			update = index->update_begin(index, rec);
 
@@ -179,7 +179,7 @@
 	return TRUE;
 }
 
-static int mbox_sync_buf(MailIndex *index, IBuffer *inbuf)
+static int mbox_sync_from_stream(MailIndex *index, IStream *input)
 {
 	MailIndexRecord *rec;
 	uoff_t from_offset;
@@ -188,11 +188,11 @@
 	unsigned int seq;
 	int dirty;
 
-	mbox_skip_empty_lines(inbuf);
+	mbox_skip_empty_lines(input);
 
 	/* first make sure we start with a "From " line. If file is too
 	   small, we'll just treat it as empty mbox file. */
-	if (i_buffer_read_data(inbuf, &data, &size, 5) > 0 &&
+	if (i_stream_read_data(input, &data, &size, 5) > 0 &&
 	    strncmp((const char *) data, "From ", 5) != 0) {
 		index_set_error(index, "File isn't in mbox format: %s",
 				index->mbox_path);
@@ -212,11 +212,11 @@
 
 	dirty = FALSE;
 	while (rec != NULL) {
-		from_offset = inbuf->v_offset;
-		if (inbuf->v_offset != 0) {
+		from_offset = input->v_offset;
+		if (input->v_offset != 0) {
 			/* we're at the [\r]\n before the From-line,
 			   skip it */
-			if (!mbox_skip_crlf(inbuf)) {
+			if (!mbox_skip_crlf(input)) {
 				/* they just went and broke it, even while
 				   we had it locked. */
 				index_set_error(index,
@@ -227,15 +227,15 @@
 			}
 		}
 
-		if (inbuf->v_offset == inbuf->v_size)
+		if (input->v_offset == input->v_size)
 			break;
 
-		if (!match_next_record(index, rec, seq, inbuf, &rec, &dirty))
+		if (!match_next_record(index, rec, seq, input, &rec, &dirty))
 			return FALSE;
 
 		if (rec == NULL) {
 			/* Get back to line before From */
-			i_buffer_seek(inbuf, from_offset);
+			i_stream_seek(input, from_offset);
 			break;
 		}
 
@@ -255,25 +255,25 @@
 		index->header->flags &= ~MAIL_INDEX_FLAG_DIRTY_MESSAGES;
 	}
 
-	if (inbuf->v_offset == inbuf->v_size)
+	if (input->v_offset == input->v_size)
 		return TRUE;
 	else
-		return mbox_index_append(index, inbuf);
+		return mbox_index_append(index, input);
 }
 
 int mbox_sync_full(MailIndex *index)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	int failed;
 
 	i_assert(index->lock_type == MAIL_LOCK_EXCLUSIVE);
 
-	inbuf = mbox_get_inbuf(index, 0, MAIL_LOCK_SHARED);
-	if (inbuf == NULL)
+	input = mbox_get_stream(index, 0, MAIL_LOCK_SHARED);
+	if (input == NULL)
 		return FALSE;
 
-	failed = !mbox_sync_buf(index, inbuf);
-	i_buffer_unref(inbuf);
+	failed = !mbox_sync_from_stream(index, input);
+	i_stream_unref(input);
 
 	return !failed;
 }

--- a/src/lib-index/mbox/mbox-sync.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-index/mbox/mbox-sync.c	Fri Dec 06 03:09:22 2002 +0200
@@ -119,7 +119,7 @@
 	}
 
 	if (index_mtime != st.st_mtime || index->mbox_size != filesize) {
-		mbox_file_close_inbuf(index);
+		mbox_file_close_stream(index);
 
 		index->mbox_size = get_indexed_mbox_size(index);
 		if (index->file_sync_stamp == 0 &&

--- a/src/lib-mail/message-body-search.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-body-search.c	Fri Dec 06 03:09:22 2002 +0200
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "base64.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "charset-utf8.h"
 #include "rfc822-tokenize.h"
 #include "quoted-printable.h"
@@ -134,7 +134,7 @@
 	}
 }
 
-static int message_search_header(PartSearchContext *ctx, IBuffer *inbuf)
+static int message_search_header(PartSearchContext *ctx, IStream *input)
 {
 	ctx->hdr_search_ctx = message_header_search_init(data_stack_pool,
 							 ctx->body_ctx->key,
@@ -143,7 +143,7 @@
 
 	/* we default to text content-type */
 	ctx->content_type_text = TRUE;
-	message_parse_header(NULL, inbuf, NULL, header_find, ctx);
+	message_parse_header(NULL, input, NULL, header_find, ctx);
 
 	return ctx->found;
 }
@@ -252,7 +252,7 @@
 	return 0;
 }
 
-static int message_search_body(PartSearchContext *ctx, IBuffer *inbuf,
+static int message_search_body(PartSearchContext *ctx, IStream *input,
 			       MessagePart *part)
 {
 	const unsigned char *data, *decoded;
@@ -280,15 +280,15 @@
 	ctx->match_count = 0;
 	ctx->matches = t_malloc(sizeof(size_t) * ctx->body_ctx->key_len);
 
-	i_buffer_skip(inbuf, part->physical_pos +
-		      part->header_size.physical_size - inbuf->v_offset);
+	i_stream_skip(input, part->physical_pos +
+		      part->header_size.physical_size - input->v_offset);
 
-	old_limit = inbuf->v_limit;
-	i_buffer_set_read_limit(inbuf, inbuf->v_offset +
+	old_limit = input->v_limit;
+	i_stream_set_read_limit(input, input->v_offset +
 				part->body_size.physical_size);
 
 	found = FALSE; pos = 0;
-	while (i_buffer_read_data(inbuf, &data, &data_size, pos) > 0) {
+	while (i_stream_read_data(input, &data, &data_size, pos) > 0) {
 		/* limit the size of t_malloc()s */
 		if (data_size > DECODE_BLOCK_SIZE)
 			data_size = DECODE_BLOCK_SIZE;
@@ -318,11 +318,11 @@
 		}
 
 		t_pop();
-		i_buffer_skip(inbuf, data_size);
+		i_stream_skip(input, data_size);
 		pos -= data_size;
 	}
 
-	i_buffer_set_read_limit(inbuf, old_limit);
+	i_stream_set_read_limit(input, old_limit);
 
 	if (ctx->translation != NULL)
 		charset_to_utf8_end(ctx->translation);
@@ -355,7 +355,7 @@
 	return TRUE;
 }
 
-static int message_body_search_ctx(BodySearchContext *ctx, IBuffer *inbuf,
+static int message_body_search_ctx(BodySearchContext *ctx, IStream *input,
 				   MessagePart *part)
 {
 	PartSearchContext part_ctx;
@@ -363,9 +363,9 @@
 
 	found = FALSE;
 	while (part != NULL && !found) {
-		i_assert(inbuf->v_offset <= part->physical_pos);
+		i_assert(input->v_offset <= part->physical_pos);
 
-		i_buffer_skip(inbuf, part->physical_pos - inbuf->v_offset);
+		i_stream_skip(input, part->physical_pos - input->v_offset);
 
 		memset(&part_ctx, 0, sizeof(part_ctx));
 		part_ctx.body_ctx = ctx;
@@ -374,14 +374,14 @@
 
 		t_push();
 
-		if (message_search_header(&part_ctx, inbuf)) {
+		if (message_search_header(&part_ctx, input)) {
 			found = TRUE;
 		} else if (part->children != NULL) {
 			/* multipart/xxx or message/rfc822 */
-			if (message_body_search_ctx(ctx, inbuf, part->children))
+			if (message_body_search_ctx(ctx, input, part->children))
 				found = TRUE;
 		} else {
-			if (message_search_body(&part_ctx, inbuf, part))
+			if (message_search_body(&part_ctx, input, part))
 				found = TRUE;
 		}
 
@@ -394,7 +394,7 @@
 }
 
 int message_body_search(const char *key, const char *charset,
-			int *unknown_charset, IBuffer *inbuf,
+			int *unknown_charset, IStream *input,
 			MessagePart *part, int search_header)
 {
         BodySearchContext ctx;
@@ -403,5 +403,5 @@
 				      search_header))
 		return -1;
 
-	return message_body_search_ctx(&ctx, inbuf, part);
+	return message_body_search_ctx(&ctx, input, part);
 }

--- a/src/lib-mail/message-body-search.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-body-search.h	Fri Dec 06 03:09:22 2002 +0200
@@ -6,7 +6,7 @@
    is invalid. If charset is NULL, the key isn't assumed to be in any
    specific charset but is compared to message data without any translation. */
 int message_body_search(const char *key, const char *charset,
-			int *unknown_charset, IBuffer *inbuf,
+			int *unknown_charset, IStream *input,
 			MessagePart *part, int search_header);
 
 #endif

--- a/src/lib-mail/message-parser.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-parser.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "rfc822-tokenize.h"
 #include "message-content-parser.h"
 #include "message-parser.h"
@@ -27,12 +27,12 @@
 	void *context;
 } MessageParseContext;
 
-static MessagePart *message_parse_part(IBuffer *inbuf,
+static MessagePart *message_parse_part(IStream *input,
 				       MessageParseContext *parse_ctx);
-static MessagePart *message_parse_body(IBuffer *inbuf,
+static MessagePart *message_parse_body(IStream *input,
 				       MessageBoundary *boundaries,
 				       MessageSize *body_size);
-static MessagePart *message_skip_boundary(IBuffer *inbuf,
+static MessagePart *message_skip_boundary(IStream *input,
 					  MessageBoundary *boundaries,
 					  MessageSize *boundary_size);
 
@@ -136,7 +136,7 @@
 	}
 }
 
-static MessagePart *message_parse_multipart(IBuffer *inbuf,
+static MessagePart *message_parse_multipart(IStream *input,
 					    MessageParseContext *parse_ctx)
 {
 	MessagePart *parent_part, *next_part, *part;
@@ -157,7 +157,7 @@
 
 	/* skip the data before the first boundary */
 	parent_part = parse_ctx->part;
-	next_part = message_skip_boundary(inbuf, parse_ctx->boundaries,
+	next_part = message_skip_boundary(input, parse_ctx->boundaries,
 					  &parent_part->body_size);
 
 	/* now, parse the parts */
@@ -166,7 +166,7 @@
 		part = message_part_append(parse_ctx->pool, parent_part);
 
                 parse_ctx->part = part;
-		next_part = message_parse_part(inbuf, parse_ctx);
+		next_part = message_parse_part(input, parse_ctx);
 
 		/* update our size */
 		message_size_add_part(&parent_part->body_size, part);
@@ -175,7 +175,7 @@
 			break;
 
 		/* skip the boundary */
-		next_part = message_skip_boundary(inbuf, parse_ctx->boundaries,
+		next_part = message_skip_boundary(input, parse_ctx->boundaries,
 						  &parent_part->body_size);
 	}
 
@@ -185,13 +185,13 @@
 	return next_part;
 }
 
-static MessagePart *message_parse_part(IBuffer *inbuf,
+static MessagePart *message_parse_part(IStream *input,
 				       MessageParseContext *parse_ctx)
 {
 	MessagePart *next_part, *part;
 	uoff_t hdr_size;
 
-	message_parse_header(parse_ctx->part, inbuf,
+	message_parse_header(parse_ctx->part, input,
 			     &parse_ctx->part->header_size,
 			     parse_header_field, parse_ctx);
 
@@ -199,7 +199,7 @@
 	hdr_size = parse_ctx->part->header_size.physical_size;
 
 	if (parse_ctx->last_boundary != NULL)
-		return message_parse_multipart(inbuf, parse_ctx);
+		return message_parse_multipart(input, parse_ctx);
 
 	if (parse_ctx->last_content_type == NULL) {
 		if (parse_ctx->part->parent != NULL &&
@@ -226,7 +226,7 @@
 		part = message_part_append(parse_ctx->pool, parse_ctx->part);
 
 		parse_ctx->part = part;
-		next_part = message_parse_part(inbuf, parse_ctx);
+		next_part = message_parse_part(input, parse_ctx);
 		parse_ctx->part = part->parent;
 
 		/* our body size is the size of header+body in message/rfc822 */
@@ -234,14 +234,14 @@
 	} else {
 		/* normal message, read until the next boundary */
 		part = parse_ctx->part;
-		next_part = message_parse_body(inbuf, parse_ctx->boundaries,
+		next_part = message_parse_body(input, parse_ctx->boundaries,
 					       &part->body_size);
 	}
 
 	return next_part;
 }
 
-MessagePart *message_parse(Pool pool, IBuffer *inbuf,
+MessagePart *message_parse(Pool pool, IStream *input,
 			   MessageHeaderFunc func, void *context)
 {
 	MessagePart *part;
@@ -254,20 +254,20 @@
 	parse_ctx.part = part = p_new(pool, MessagePart, 1);
 
 	t_push();
-	message_parse_part(inbuf, &parse_ctx);
+	message_parse_part(input, &parse_ctx);
 	t_pop();
 	return part;
 }
 
 /* skip over to next line increasing message size */
-static void message_skip_line(IBuffer *inbuf, MessageSize *msg_size)
+static void message_skip_line(IStream *input, MessageSize *msg_size)
 {
 	const unsigned char *msg;
 	size_t i, size, startpos;
 
 	startpos = 0;
 
-	while (i_buffer_read_data(inbuf, &msg, &size, startpos) > 0) {
+	while (i_stream_read_data(input, &msg, &size, startpos) > 0) {
 		for (i = startpos; i < size; i++) {
 			if (msg[i] == '\n') {
 				if (msg_size != NULL) {
@@ -285,7 +285,7 @@
 		}
 
 		/* leave the last character, it may be \r */
-		i_buffer_skip(inbuf, i - 1);
+		i_stream_skip(input, i - 1);
 		startpos = 1;
 
 		if (msg_size != NULL) {
@@ -294,7 +294,7 @@
 		}
 	}
 
-	i_buffer_skip(inbuf, startpos);
+	i_stream_skip(input, startpos);
 
 	if (msg_size != NULL) {
 		msg_size->physical_size += startpos;
@@ -302,7 +302,7 @@
 	}
 }
 
-void message_parse_header(MessagePart *part, IBuffer *inbuf,
+void message_parse_header(MessagePart *part, IStream *input,
 			  MessageSize *hdr_size,
 			  MessageHeaderFunc func, void *context)
 {
@@ -317,12 +317,12 @@
 	missing_cr_count = startpos = line_start = 0;
 	colon_pos = UINT_MAX;
 	for (;;) {
-		ret = i_buffer_read_data(inbuf, &msg, &size, startpos+1);
+		ret = i_stream_read_data(input, &msg, &size, startpos+1);
 		if (ret == -2) {
 			/* overflow, line is too long. just skip it. */
 			i_assert(size > 2);
 
-                        message_skip_line(inbuf, hdr_size);
+                        message_skip_line(input, hdr_size);
 			startpos = line_start = 0;
 			colon_pos = UINT_MAX;
 			continue;
@@ -412,13 +412,13 @@
 			colon_pos -= line_start;
 		if (hdr_size != NULL)
 			hdr_size->physical_size += line_start;
-		i_buffer_skip(inbuf, line_start);
+		i_stream_skip(input, line_start);
 
 		startpos = i-line_start;
 		line_start = 0;
 	}
 
-	i_buffer_skip(inbuf, startpos);
+	i_stream_skip(input, startpos);
 
 	if (hdr_size != NULL) {
 		hdr_size->physical_size += startpos;
@@ -451,7 +451,7 @@
    [\r]\n before the boundary, otherwise leave it right after the known
    boundary so the ending "--" can be checked. */
 static MessageBoundary *
-message_find_boundary(IBuffer *inbuf, MessageBoundary *boundaries,
+message_find_boundary(IStream *input, MessageBoundary *boundaries,
 		      MessageSize *msg_size, int skip_over)
 {
 	MessageBoundary *boundary;
@@ -461,7 +461,7 @@
 	boundary = NULL;
 	missing_cr_count = startpos = line_start = 0;
 
-	while (i_buffer_read_data(inbuf, &msg, &size, startpos) > 0) {
+	while (i_stream_read_data(input, &msg, &size, startpos) > 0) {
 		for (i = startpos; i < size; i++) {
 			if (msg[i] != '\n')
 				continue;
@@ -511,7 +511,7 @@
 			line_start -= i;
 		}
 
-		i_buffer_skip(inbuf, i);
+		i_stream_skip(input, i);
 		msg_size->physical_size += i;
 		msg_size->virtual_size += i;
 
@@ -535,7 +535,7 @@
 		startpos = line_start;
 	}
 
-	i_buffer_skip(inbuf, startpos);
+	i_stream_skip(input, startpos);
 	msg_size->physical_size += startpos;
 	msg_size->virtual_size += startpos + missing_cr_count;
 
@@ -544,17 +544,17 @@
 	return boundary;
 }
 
-static MessagePart *message_parse_body(IBuffer *inbuf,
+static MessagePart *message_parse_body(IStream *input,
 				       MessageBoundary *boundaries,
 				       MessageSize *body_size)
 {
 	MessageBoundary *boundary;
 
 	if (boundaries == NULL) {
-		message_get_body_size(inbuf, body_size, (uoff_t)-1);
+		message_get_body_size(input, body_size, (uoff_t)-1);
 		return NULL;
 	} else {
-		boundary = message_find_boundary(inbuf, boundaries,
+		boundary = message_find_boundary(input, boundaries,
 						 body_size, FALSE);
 		return boundary == NULL ? NULL : boundary->part;
 	}
@@ -562,7 +562,7 @@
 
 /* skip data until next boundary is found. if it's end boundary,
    skip the footer as well. */
-static MessagePart *message_skip_boundary(IBuffer *inbuf,
+static MessagePart *message_skip_boundary(IStream *input,
 					  MessageBoundary *boundaries,
 					  MessageSize *boundary_size)
 {
@@ -571,22 +571,22 @@
 	size_t size;
 	int end_boundary;
 
-	boundary = message_find_boundary(inbuf, boundaries,
+	boundary = message_find_boundary(input, boundaries,
 					 boundary_size, TRUE);
 	if (boundary == NULL)
 		return NULL;
 
 	/* now, see if it's end boundary */
 	end_boundary = FALSE;
-	if (i_buffer_read_data(inbuf, &msg, &size, 1) > 0)
+	if (i_stream_read_data(input, &msg, &size, 1) > 0)
 		end_boundary = msg[0] == '-' && msg[1] == '-';
 
 	/* skip the rest of the line */
-	message_skip_line(inbuf, boundary_size);
+	message_skip_line(input, boundary_size);
 
 	if (end_boundary) {
 		/* skip the footer */
-		return message_parse_body(inbuf, boundaries, boundary_size);
+		return message_parse_body(input, boundaries, boundary_size);
 	}
 
 	return boundary == NULL ? NULL : boundary->part;

--- a/src/lib-mail/message-parser.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-parser.h	Fri Dec 06 03:09:22 2002 +0200
@@ -44,15 +44,15 @@
 				  void *context);
 
 /* func is called for each field in message header. */
-MessagePart *message_parse(Pool pool, IBuffer *inbuf,
+MessagePart *message_parse(Pool pool, IStream *input,
 			   MessageHeaderFunc func, void *context);
 
 /* Call func for each field in message header. Fills the hdr_size.
    part can be NULL, just make sure your header function works with it.
    This function doesn't use data stack so your header function may save
-   values to it. When finished, inbuf will point to beginning of message
+   values to it. When finished, input will point to beginning of message
    body. */
-void message_parse_header(MessagePart *part, IBuffer *inbuf,
+void message_parse_header(MessagePart *part, IStream *input,
 			  MessageSize *hdr_size,
 			  MessageHeaderFunc func, void *context);
 

--- a/src/lib-mail/message-send.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-send.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,12 +1,12 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "message-send.h"
 #include "message-size.h"
 
-int message_send(OBuffer *outbuf, IBuffer *inbuf, MessageSize *msg_size,
+int message_send(OStream *output, IStream *input, MessageSize *msg_size,
 		 uoff_t virtual_skip, uoff_t max_virtual_size)
 {
 	const unsigned char *msg;
@@ -23,21 +23,21 @@
 
 	if (msg_size->physical_size == msg_size->virtual_size) {
 		/* no need to kludge with CRs, we can use sendfile() */
-		i_buffer_skip(inbuf, virtual_skip);
+		i_stream_skip(input, virtual_skip);
 
-		old_limit = inbuf->v_limit;
-		limit = inbuf->v_offset + max_virtual_size;
-		i_buffer_set_read_limit(inbuf, I_MIN(limit, old_limit));
-		ret = o_buffer_send_ibuffer(outbuf, inbuf) > 0;
-		i_buffer_set_read_limit(inbuf, old_limit);
+		old_limit = input->v_limit;
+		limit = input->v_offset + max_virtual_size;
+		i_stream_set_read_limit(input, I_MIN(limit, old_limit));
+		ret = o_stream_send_istream(output, input) > 0;
+		i_stream_set_read_limit(input, old_limit);
 
 		return ret;
 	}
 
-	message_skip_virtual(inbuf, virtual_skip, NULL, &cr_skipped);
+	message_skip_virtual(input, virtual_skip, NULL, &cr_skipped);
 
 	/* go through the message data and insert CRs where needed.  */
-	while (i_buffer_read_data(inbuf, &msg, &size, 0) > 0) {
+	while (i_stream_read_data(input, &msg, &size, 0) > 0) {
 		add_cr = FALSE;
 		for (i = 0; i < size; i++) {
 			if (msg[i] == '\n') {
@@ -60,11 +60,11 @@
 			}
 		}
 
-		if (o_buffer_send(outbuf, msg, i) < 0)
+		if (o_stream_send(output, msg, i) < 0)
 			return FALSE;
 
 		if (add_cr) {
-			if (o_buffer_send(outbuf, "\r", 1) < 0)
+			if (o_stream_send(output, "\r", 1) < 0)
 				return FALSE;
 			cr_skipped = TRUE;
 		} else {
@@ -75,7 +75,7 @@
 		if (max_virtual_size == 0)
 			break;
 
-		i_buffer_skip(inbuf, i);
+		i_stream_skip(input, i);
 	}
 
 	return TRUE;

--- a/src/lib-mail/message-send.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-send.h	Fri Dec 06 03:09:22 2002 +0200
@@ -5,9 +5,9 @@
 
 /* Send message to client inserting CRs if needed. Only max_virtual_size
    bytes if sent (relative to virtual_skip), if you want it unlimited,
-   use (uoff_t)-1. Remember that if inbuf begins with LF, CR is inserted
+   use (uoff_t)-1. Remember that if input begins with LF, CR is inserted
    before it unless virtual_skip = 1. Returns TRUE if successful. */
-int message_send(OBuffer *outbuf, IBuffer *inbuf, MessageSize *msg_size,
+int message_send(OStream *output, IStream *input, MessageSize *msg_size,
 		 uoff_t virtual_skip, uoff_t max_virtual_size);
 
 #endif

--- a/src/lib-mail/message-size.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-size.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,11 +1,11 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "message-parser.h"
 #include "message-size.h"
 
-void message_get_header_size(IBuffer *inbuf, MessageSize *hdr)
+void message_get_header_size(IStream *input, MessageSize *hdr)
 {
 	const unsigned char *msg;
 	size_t i, size, startpos, missing_cr_count;
@@ -13,7 +13,7 @@
 	memset(hdr, 0, sizeof(MessageSize));
 
 	missing_cr_count = 0; startpos = 0;
-	while (i_buffer_read_data(inbuf, &msg, &size, startpos) > 0) {
+	while (i_stream_read_data(input, &msg, &size, startpos) > 0) {
 		for (i = startpos; i < size; i++) {
 			if (msg[i] != '\n')
 				continue;
@@ -44,18 +44,18 @@
 
 		/* leave the last two characters, they may be \r\n */
 		startpos = size == 1 ? 1 : 2;
-		i_buffer_skip(inbuf, i - startpos);
+		i_stream_skip(input, i - startpos);
 
 		hdr->physical_size += i - startpos;
 	}
-	i_buffer_skip(inbuf, startpos);
+	i_stream_skip(input, startpos);
 	hdr->physical_size += startpos;
 
 	hdr->virtual_size = hdr->physical_size + missing_cr_count;
 	i_assert(hdr->virtual_size >= hdr->physical_size);
 }
 
-void message_get_body_size(IBuffer *inbuf, MessageSize *body,
+void message_get_body_size(IStream *input, MessageSize *body,
 			   uoff_t max_virtual_size)
 {
 	const unsigned char *msg;
@@ -65,7 +65,7 @@
 
 	missing_cr_count = 0; startpos = 0;
 	while (max_virtual_size != 0 &&
-	       i_buffer_read_data(inbuf, &msg, &size, startpos) > 0) {
+	       i_stream_read_data(input, &msg, &size, startpos) > 0) {
 		for (i = startpos; i < size && max_virtual_size != 0; i++) {
 			if (max_virtual_size > 0)
 				max_virtual_size--;
@@ -91,19 +91,19 @@
 		}
 
 		/* leave the last character, it may be \r */
-		i_buffer_skip(inbuf, i - 1);
+		i_stream_skip(input, i - 1);
 		startpos = 1;
 
 		body->physical_size += i - 1;
 	}
-	i_buffer_skip(inbuf, startpos);
+	i_stream_skip(input, startpos);
 	body->physical_size += startpos;
 
 	body->virtual_size = body->physical_size + missing_cr_count;
 	i_assert(body->virtual_size >= body->physical_size);
 }
 
-void message_skip_virtual(IBuffer *inbuf, uoff_t virtual_skip,
+void message_skip_virtual(IStream *input, uoff_t virtual_skip,
 			  MessageSize *msg_size, int *cr_skipped)
 {
 	const unsigned char *msg;
@@ -114,7 +114,7 @@
 		return;
 
 	startpos = 0;
-	while (i_buffer_read_data(inbuf, &msg, &size, startpos) > 0) {
+	while (i_stream_read_data(input, &msg, &size, startpos) > 0) {
 		for (i = startpos; i < size && virtual_skip > 0; i++) {
 			virtual_skip--;
 
@@ -151,12 +151,12 @@
 		}
 
 		if (i < size) {
-			i_buffer_skip(inbuf, i);
+			i_stream_skip(input, i);
 			break;
 		}
 
 		/* leave the last character, it may be \r */
-		i_buffer_skip(inbuf, i - 1);
+		i_stream_skip(input, i - 1);
 		startpos = 1;
 	}
 }

--- a/src/lib-mail/message-size.h	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-mail/message-size.h	Fri Dec 06 03:09:22 2002 +0200
@@ -3,18 +3,18 @@
 
 #include "message-parser.h"
 
-/* Calculate size of message header. Leave the inbuf point to first
+/* Calculate size of message header. Leave the input point to first
    character in body. */
-void message_get_header_size(IBuffer *inbuf, MessageSize *hdr);
+void message_get_header_size(IStream *input, MessageSize *hdr);
 /* Calculate size of message body. Read only max_virtual_size virtual bytes,
    if you want it unlimited, use (uoff_t)-1. */
-void message_get_body_size(IBuffer *inbuf, MessageSize *body,
+void message_get_body_size(IStream *input, MessageSize *body,
 			   uoff_t max_virtual_size);
 
-/* Skip number of virtual bytes from buffer. If first character is \n, and
+/* Skip number of virtual bytes from putfer. If first character is \n, and
    cr_skipped is FALSE, \r must be sent before it. msg_size is updated if
    it's not NULL. */
-void message_skip_virtual(IBuffer *inbuf, uoff_t virtual_skip,
+void message_skip_virtual(IStream *input, uoff_t virtual_skip,
 			  MessageSize *msg_size, int *cr_skipped);
 
 /* Sum contents of src into dest. */

--- a/src/lib-storage/index/index-copy.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-storage/index/index-copy.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "ibuffer.h"
+#include "istream.h"
 #include "mail-custom-flags.h"
 #include "index-storage.h"
 #include "index-messageset.h"
@@ -20,12 +20,12 @@
 {
 	CopyContext *ctx = context;
 	IndexMailbox *dest_ibox = NULL;
-	IBuffer *inbuf;
+	IStream *input;
 	time_t internal_date;
 	int failed, deleted;
 
-	inbuf = index->open_mail(index, rec, &internal_date, &deleted);
-	if (inbuf == NULL)
+	input = index->open_mail(index, rec, &internal_date, &deleted);
+	if (input == NULL)
 		return FALSE;
 
 	if (ctx->copy_inside_mailbox) {
@@ -37,12 +37,12 @@
 	/* save it in destination mailbox */
 	failed = !ctx->dest->save(ctx->dest, rec->msg_flags,
 				  ctx->custom_flags, internal_date, 0,
-				  inbuf, inbuf->v_limit);
+				  input, input->v_limit);
 
 	if (ctx->copy_inside_mailbox)
 		dest_ibox->delay_save_unlocking = FALSE;
 
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 	return !failed;
 }
 

--- a/src/lib-storage/index/index-fetch-section.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-storage/index/index-fetch-section.c	Fri Dec 06 03:09:22 2002 +0200
@@ -2,8 +2,8 @@
 
 #include "lib.h"
 #include "temp-string.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "rfc822-tokenize.h"
 #include "message-send.h"
 #include "index-storage.h"
@@ -43,13 +43,13 @@
 		      FetchContext *ctx, const char *prefix, int fetch_header)
 {
 	MessageSize size;
-	IBuffer *inbuf;
+	IStream *input;
 	const char *str;
 	int cr_skipped;
 
 	if (!imap_msgcache_get_rfc822_partial(ctx->cache, sect->skip,
 					      sect->max_size, fetch_header,
-					      &size, &inbuf, &cr_skipped)) {
+					      &size, &input, &cr_skipped)) {
 		i_error("Couldn't get BODY[] for UID %u (index %s)",
 			rec->uid, ctx->index->filepath);
 		return FALSE;
@@ -57,13 +57,13 @@
 
 	str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n",
 			      prefix, size.virtual_size);
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 
 	if (cr_skipped)
 		size.virtual_size++;
 
-	return message_send(ctx->outbuf, inbuf, &size,
+	return message_send(ctx->output, input, &size,
 			    cr_skipped ? 1 : 0, sect->max_size);
 }
 
@@ -139,7 +139,7 @@
 
 typedef struct {
 	TempString *dest;
-	OBuffer *outbuf;
+	OStream *output;
 	uoff_t dest_size;
 
 	uoff_t skip, max_size;
@@ -170,8 +170,8 @@
 		t_string_append_n(ctx->dest, str, size);
 	ctx->dest_size += size;
 
-	if (ctx->outbuf != NULL) {
-		if (o_buffer_send(ctx->outbuf, str, size) < 0)
+	if (ctx->output != NULL) {
+		if (o_stream_send(ctx->output, str, size) < 0)
 			return FALSE;
 	}
 	return ctx->dest_size < ctx->max_size;
@@ -220,7 +220,7 @@
 	(void)fetch_header_append(ctx, "\r\n", 2);
 }
 
-static int fetch_header_fields(IBuffer *inbuf, const char *section,
+static int fetch_header_fields(IStream *input, const char *section,
 			       FetchHeaderFieldContext *ctx)
 {
 	if (strncasecmp(section, "HEADER.FIELDS ", 14) == 0) {
@@ -238,7 +238,7 @@
 	}
 
 	ctx->dest_size = 0;
-	message_parse_header(NULL, inbuf, NULL, fetch_header_field, ctx);
+	message_parse_header(NULL, input, NULL, fetch_header_field, ctx);
 
 	i_assert(ctx->dest_size <= ctx->max_size);
 	i_assert(ctx->dest == NULL || ctx->dest->len == ctx->dest_size);
@@ -246,7 +246,7 @@
 }
 
 /* fetch wanted headers from given data */
-static int fetch_header_from(IBuffer *inbuf, OBuffer *outbuf,
+static int fetch_header_from(IStream *input, OStream *output,
 			     const char *prefix, MessageSize *size,
 			     const char *section, MailFetchBodyData *sect)
 {
@@ -261,61 +261,61 @@
 		/* all headers */
 		str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n",
 				      prefix, size->virtual_size);
-		if (o_buffer_send(outbuf, str, strlen(str)) < 0)
+		if (o_stream_send(output, str, strlen(str)) < 0)
 			return FALSE;
-		return message_send(outbuf, inbuf, size,
+		return message_send(output, input, size,
 				    sect->skip, sect->max_size);
 	}
 
 	/* partial headers - copy the wanted fields into memory, inserting
 	   missing CRs on the way. If the header is too large, calculate 
-	   the size first and then send the data directly to output buffer. */
+	   the size first and then send the data directly to output stream. */
 
 	memset(&ctx, 0, sizeof(ctx));
 	ctx.skip = sect->skip;
 	ctx.max_size = sect->max_size;
 
 	failed = FALSE;
-	start_offset = inbuf->v_offset;
+	start_offset = input->v_offset;
 
 	t_push();
 
 	/* first pass, we need at least the size */
 	if (size->virtual_size > MAX_HEADER_BUFFER_SIZE &&
 	    sect->max_size > MAX_HEADER_BUFFER_SIZE) {
-		if (!fetch_header_fields(inbuf, section, &ctx))
+		if (!fetch_header_fields(input, section, &ctx))
 			failed = TRUE;
 
 		i_assert(ctx.dest_size <= size->virtual_size);
 	} else {
 		ctx.dest = t_string_new(size->virtual_size < 4096 ?
 					size->virtual_size : 4096);
-		if (!fetch_header_fields(inbuf, section, &ctx))
+		if (!fetch_header_fields(input, section, &ctx))
 			failed = TRUE;
 	}
 
 	if (!failed) {
 		str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n",
 				      prefix, ctx.dest_size);
-		if (o_buffer_send(outbuf, str, strlen(str)) < 0)
+		if (o_stream_send(output, str, strlen(str)) < 0)
 			failed = TRUE;
 	}
 
 	if (!failed) {
 		if (ctx.dest == NULL) {
-			/* second pass, write the data to output buffer */
+			/* second pass, write the data to output stream */
 			uoff_t first_size = ctx.dest_size;
 
-			ctx.outbuf = outbuf;
-			i_buffer_seek(inbuf, start_offset);
+			ctx.output = output;
+			i_stream_seek(input, start_offset);
 
 			if (!failed &&
-			    !fetch_header_fields(inbuf, section, &ctx))
+			    !fetch_header_fields(input, section, &ctx))
 				failed = TRUE;
 
 			i_assert(first_size == ctx.dest_size);
 		} else {
-			if (o_buffer_send(outbuf, ctx.dest->str,
+			if (o_stream_send(output, ctx.dest->str,
 					  ctx.dest->len) < 0)
 				failed = TRUE;
 		}
@@ -330,12 +330,12 @@
 			const char *prefix)
 {
 	MessageSize hdr_size;
-	IBuffer *inbuf;
+	IStream *input;
 
-	if (!imap_msgcache_get_rfc822(ctx->cache, &inbuf, &hdr_size, NULL))
+	if (!imap_msgcache_get_rfc822(ctx->cache, &input, &hdr_size, NULL))
 		return FALSE;
 
-	return fetch_header_from(inbuf, ctx->outbuf, prefix, &hdr_size,
+	return fetch_header_from(input, ctx->output, prefix, &hdr_size,
 				 sect->section, sect);
 }
 
@@ -389,25 +389,25 @@
 static int fetch_part_body(MessagePart *part, MailFetchBodyData *sect,
 			   FetchContext *ctx, const char *prefix)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	const char *str;
 	uoff_t skip_pos;
 
-	if (!imap_msgcache_get_data(ctx->cache, &inbuf))
+	if (!imap_msgcache_get_data(ctx->cache, &input))
 		return FALSE;
 
 	/* jump to beginning of wanted data */
 	skip_pos = part->physical_pos + part->header_size.physical_size;
-	i_buffer_skip(inbuf, skip_pos);
+	i_stream_skip(input, skip_pos);
 
 	str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n",
 			      prefix, part->body_size.virtual_size);
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 
 	/* FIXME: potential performance problem with big messages:
 	   FETCH BODY[1]<100000..1024>, hopefully no clients do this */
-	return message_send(ctx->outbuf, inbuf, &part->body_size,
+	return message_send(ctx->output, input, &part->body_size,
 			    sect->skip, sect->max_size);
 }
 
@@ -416,13 +416,13 @@
 			     MailFetchBodyData *sect, FetchContext *ctx,
 			     const char *prefix)
 {
-	IBuffer *inbuf;
+	IStream *input;
 
-	if (!imap_msgcache_get_data(ctx->cache, &inbuf))
+	if (!imap_msgcache_get_data(ctx->cache, &input))
 		return FALSE;
 
-	i_buffer_skip(inbuf, part->physical_pos);
-	return fetch_header_from(inbuf, ctx->outbuf, prefix, &part->header_size,
+	i_stream_skip(input, part->physical_pos);
+	return fetch_header_from(input, ctx->output, prefix, &part->header_size,
 				 section, sect);
 }
 

--- a/src/lib-storage/index/index-fetch.c	Fri Dec 06 00:37:33 2002 +0200
+++ b/src/lib-storage/index/index-fetch.c	Fri Dec 06 03:09:22 2002 +0200
@@ -1,7 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
-#include "obuffer.h"
+#include "ostream.h"
 #include "temp-string.h"
 #include "mail-custom-flags.h"
 #include "index-storage.h"
@@ -119,10 +119,10 @@
 static int index_fetch_send_rfc822(MailIndexRecord *rec, FetchContext *ctx)
 {
 	MessageSize hdr_size, body_size;
-	IBuffer *inbuf;
+	IStream *input;
 	const char *str;
 
-	if (!imap_msgcache_get_rfc822(ctx->cache, &inbuf,
+	if (!imap_msgcache_get_rfc822(ctx->cache, &input,
 				      &hdr_size, &body_size)) {
 		mail_storage_set_critical(ctx->storage,
 			"Couldn't get RFC822 for UID %u (index %s)",
@@ -135,22 +135,22 @@
 	if (ctx->first) {
 		str++; ctx->first = FALSE;
 	}
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 
 	body_size.physical_size += hdr_size.physical_size;
 	body_size.virtual_size += hdr_size.virtual_size;
-	return message_send(ctx->outbuf, inbuf, &body_size, 0, (uoff_t)-1);
+	return message_send(ctx->output, input, &body_size, 0, (uoff_t)-1);
 }
 
 static int index_fetch_send_rfc822_header(MailIndexRecord *rec,
 					  FetchContext *ctx)
 {
 	MessageSize hdr_size;
-	IBuffer *inbuf;
+	IStream *input;
 	const char *str;
 
-	if (!imap_msgcache_get_rfc822(ctx->cache, &inbuf, &hdr_size, NULL)) {
+	if (!imap_msgcache_get_rfc822(ctx->cache, &input, &hdr_size, NULL)) {
 		mail_storage_set_critical(ctx->storage,
 			"Couldn't get RFC822.HEADER for UID %u (index %s)",
 			rec->uid, ctx->index->filepath);
@@ -162,19 +162,19 @@
 	if (ctx->first) {
 		str++; ctx->first = FALSE;
 	}
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 
-	return message_send(ctx->outbuf, inbuf, &hdr_size, 0, (uoff_t)-1);
+	return message_send(ctx->output, input, &hdr_size, 0, (uoff_t)-1);
 }
 
 static int index_fetch_send_rfc822_text(MailIndexRecord *rec, FetchContext *ctx)
 {
 	MessageSize body_size;
-	IBuffer *inbuf;
+	IStream *input;
 	const char *str;
 
-	if (!imap_msgcache_get_rfc822(ctx->cache, &inbuf, NULL, &body_size)) {
+	if (!imap_msgcache_get_rfc822(ctx->cache, &input, NULL, &body_size)) {
 		mail_storage_set_critical(ctx->storage,
 			"Couldn't get RFC822.TEXT for UID %u (index %s)",
 			rec->uid, ctx->index->filepath);
@@ -186,10 +186,10 @@
 	if (ctx->first) {
 		str++; ctx->first = FALSE;
 	}
-	if (o_buffer_send(ctx->outbuf, str, strlen(str)) < 0)
+	if (o_stream_send(ctx->output, str, strlen(str)) < 0)
 		return FALSE;
 
-	return message_send(ctx->outbuf, inbuf, &body_size, 0, (uoff_t)-1);
+	return message_send(ctx->output, input, &body_size, 0, (uoff_t)-1);
 }
 
 static ImapCacheField index_get_cache(MailFetchData *fetch_data)
@@ -303,7 +303,7 @@
 			if (!ctx->first)
 				ctx->str->len--;
 
-			if (o_buffer_send(ctx->outbuf, ctx->str->str,
+			if (o_stream_send(ctx->output, ctx->str->str,
 					  ctx->str->len) < 0)
 				break;
 		}
@@ -331,7 +331,7 @@
 	} while (0);
 
 	if (data_written) {
-		if (o_buffer_send(ctx->outbuf, ")\r\n", 3) < 0)
+		if (o_stream_send(ctx->output, ")\r\n", 3) < 0)
 			failed = TRUE;
 	}
 
@@ -340,7 +340,7 @@
 }
 
 int index_storage_fetch(Mailbox *box, MailFetchData *fetch_data,
-			OBuffer *outbuf, int *all_found)
+			OStream *output, int *all_found)
 {
 	IndexMailbox *ibox = (IndexMailbox *) box;
 	FetchContext ctx;
@@ -391,7 +391,7 @@
         ctx.custom_flags_count = MAIL_CUSTOM_FLAGS_COUNT;
 
 	ctx.fetch_data = fetch_data;
-	ctx.outbuf = outbuf;
+	ctx.output = output;
 
 	ret = index_messageset_foreach(ibox, fetch_data->messageset,
 				       fetch_data->uidset,