dovecot-2.2: lib-mail: Added istream-nonuls for converting NUL b...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3a267dec53ca
changeset: 14620:3a267dec53ca
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jun 21 21:44:28 2012 +0300
description:
lib-mail: Added istream-nonuls for converting NUL bytes to something else.

diffstat:

 src/lib-mail/Makefile.am      |   3 +
 src/lib-mail/istream-nonuls.c |  88 +++++++++++++++++++++++++++++++++++++++++++
 src/lib-mail/istream-nonuls.h |   7 +++
 3 files changed, 98 insertions(+), 0 deletions(-)

diffs (130 lines):

diff -r 73ee8d00888d -r 3a267dec53ca src/lib-mail/Makefile.am
--- a/src/lib-mail/Makefile.am	Thu Jun 21 14:51:36 2012 +0300
+++ b/src/lib-mail/Makefile.am	Thu Jun 21 21:44:28 2012 +0300
@@ -9,6 +9,7 @@
 	istream-binary-converter.c \
 	istream-dot.c \
 	istream-header-filter.c \
+	istream-nonuls.c \
 	mail-user-hash.c \
 	mbox-from.c \
 	message-address.c \
@@ -31,6 +32,7 @@
 	istream-binary-converter.h \
 	istream-dot.h \
 	istream-header-filter.h \
+	istream-nonuls.h \
 	mail-user-hash.h \
 	mbox-from.h \
 	mail-types.h \
@@ -43,6 +45,7 @@
 	message-id.h \
 	message-parser.h \
 	message-part-serialize.h \
+	message-binary-part.h \
 	message-search.h \
 	message-send.h \
 	message-size.h \
diff -r 73ee8d00888d -r 3a267dec53ca src/lib-mail/istream-nonuls.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-mail/istream-nonuls.c	Thu Jun 21 21:44:28 2012 +0300
@@ -0,0 +1,88 @@
+/* Copyright (c) 2007-2012 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "istream-private.h"
+#include "istream-nonuls.h"
+
+struct nonuls_istream {
+	struct istream_private istream;
+	char replace_chr;
+};
+
+static int i_stream_read_parent(struct istream_private *stream)
+{
+	size_t size;
+	ssize_t ret;
+
+	(void)i_stream_get_data(stream->parent, &size);
+	if (size > 0)
+		return 1;
+
+	ret = i_stream_read(stream->parent);
+	if (ret <= 0) {
+		stream->istream.stream_errno = stream->parent->stream_errno;
+		stream->istream.eof = stream->parent->eof;
+		return ret;
+	}
+	(void)i_stream_get_data(stream->parent, &size);
+	i_assert(size != 0);
+	return 1;
+}
+
+static ssize_t i_stream_nonuls_read(struct istream_private *stream)
+{
+	struct nonuls_istream *nstream = (struct nonuls_istream *)stream;
+	const unsigned char *data, *p;
+	size_t i, size, avail_size;
+	int ret;
+
+	if ((ret = i_stream_read_parent(stream)) <= 0)
+		return ret;
+
+	data = i_stream_get_data(stream->parent, &size);
+	if (!i_stream_get_buffer_space(stream, size, &avail_size))
+		return -2;
+	if (size > avail_size)
+		size = avail_size;
+	i_assert(size > 0);
+
+	p = memchr(data, '\0', size);
+	if (p == NULL) {
+		/* no NULs in this block */
+		memcpy(stream->w_buffer+stream->pos, data, size);
+	} else {
+		i = p-data;
+		memcpy(stream->w_buffer+stream->pos, data, i);
+		for (; i < size; i++) {
+			stream->w_buffer[stream->pos+i] = data[i] == '\0' ?
+				nstream->replace_chr : data[i];
+		}
+	}
+	stream->pos += size;
+	i_stream_skip(stream->parent, size);
+	return size;
+}
+
+static const struct stat *
+i_stream_nonuls_stat(struct istream_private *stream, bool exact)
+{
+	return i_stream_stat(stream->parent, exact);
+}
+
+struct istream *i_stream_create_nonuls(struct istream *input, char replace_chr)
+{
+	struct nonuls_istream *nstream;
+
+	nstream = i_new(struct nonuls_istream, 1);
+	nstream->istream.max_buffer_size = input->real_stream->max_buffer_size;
+
+	nstream->istream.read = i_stream_nonuls_read;
+	nstream->istream.stat = i_stream_nonuls_stat;
+
+	nstream->istream.istream.readable_fd = FALSE;
+	nstream->istream.istream.blocking = input->blocking;
+	nstream->istream.istream.seekable = FALSE;
+	nstream->replace_chr = replace_chr;
+	return i_stream_create(&nstream->istream, input,
+			       i_stream_get_fd(input));
+}
diff -r 73ee8d00888d -r 3a267dec53ca src/lib-mail/istream-nonuls.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-mail/istream-nonuls.h	Thu Jun 21 21:44:28 2012 +0300
@@ -0,0 +1,7 @@
+#ifndef ISTREAM_DOT_H
+#define ISTREAM_DOT_H
+
+/* Translate all NUL characters to the specified replace_chr. */
+struct istream *i_stream_create_nonuls(struct istream *input, char replace_chr);
+
+#endif