diff options
Diffstat (limited to 'camel/camel-data-wrapper.c')
| -rw-r--r-- | camel/camel-data-wrapper.c | 107 |
1 files changed, 95 insertions, 12 deletions
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c index 1f2066aa7a..f950c5d919 100644 --- a/camel/camel-data-wrapper.c +++ b/camel/camel-data-wrapper.c @@ -28,8 +28,10 @@ #include <errno.h> #include "camel-data-wrapper.h" -#include "camel-mime-utils.h" #include "camel-stream.h" +#include "camel-stream-filter.h" +#include "camel-mime-filter-basic.h" +#include "camel-mime-filter-crlf.h" #include "camel-exception.h" #include "camel-private.h" @@ -40,8 +42,9 @@ static CamelObjectClass *parent_class = NULL; /* Returns the class for a CamelDataWrapper */ #define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so)) -static int construct_from_stream (CamelDataWrapper *, CamelStream *); +static int construct_from_stream(CamelDataWrapper *, CamelStream *); static ssize_t write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream); +static ssize_t decode_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream); static void set_mime_type (CamelDataWrapper *data_wrapper, const char *mime_type); static gchar *get_mime_type (CamelDataWrapper *data_wrapper); static CamelContentType *get_mime_type_field (CamelDataWrapper *data_wrapper); @@ -55,6 +58,7 @@ camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class) /* virtual method definition */ camel_data_wrapper_class->write_to_stream = write_to_stream; + camel_data_wrapper_class->decode_to_stream = decode_to_stream; camel_data_wrapper_class->set_mime_type = set_mime_type; camel_data_wrapper_class->get_mime_type = get_mime_type; camel_data_wrapper_class->get_mime_type_field = get_mime_type_field; @@ -72,8 +76,8 @@ camel_data_wrapper_init (gpointer object, gpointer klass) pthread_mutex_init (&camel_data_wrapper->priv->stream_lock, NULL); camel_data_wrapper->mime_type = header_content_type_new ("application", "octet-stream"); + camel_data_wrapper->encoding = CAMEL_MIME_PART_ENCODING_DEFAULT; camel_data_wrapper->offline = FALSE; - camel_data_wrapper->rawtext = TRUE; } static void @@ -111,6 +115,13 @@ camel_data_wrapper_get_type (void) return type; } + +CamelDataWrapper * +camel_data_wrapper_new (void) +{ + return (CamelDataWrapper *) camel_object_new (CAMEL_DATA_WRAPPER_TYPE); +} + static ssize_t write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) { @@ -133,12 +144,6 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) return ret; } -CamelDataWrapper * -camel_data_wrapper_new(void) -{ - return (CamelDataWrapper *)camel_object_new(camel_data_wrapper_get_type()); -} - /** * camel_data_wrapper_write_to_stream: * @data_wrapper: a data wrapper @@ -148,11 +153,12 @@ camel_data_wrapper_new(void) * Writes the data content to @stream in a machine-independent format * appropriate for the data. It should be possible to construct an * equivalent data wrapper object later by passing this stream to - * camel_data_construct_from_stream(). + * camel_data_wrapper_construct_from_stream(). * - * Return value: the number of bytes written, or -1 if an error occurs. + * Return value: the number of bytes written, or -1 if an error + * occurs. **/ -int +ssize_t camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) { @@ -162,6 +168,83 @@ camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper, return CDW_CLASS (data_wrapper)->write_to_stream (data_wrapper, stream); } + +static ssize_t +decode_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) +{ + CamelMimeFilter *filter; + CamelStream *fstream; + ssize_t ret; + + if (data_wrapper->stream == NULL) { + return -1; + } + + CAMEL_DATA_WRAPPER_LOCK (data_wrapper, stream_lock); + if (camel_stream_reset (data_wrapper->stream) == -1) { + CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock); + return -1; + } + + fstream = (CamelStream *) camel_stream_filter_new_with_stream (data_wrapper->stream); + + switch (data_wrapper->encoding) { + case CAMEL_MIME_PART_ENCODING_BASE64: + filter = (CamelMimeFilter *) camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_BASE64_DEC); + camel_stream_filter_add (CAMEL_STREAM_FILTER (fstream), filter); + camel_object_unref (filter); + break; + case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE: + filter = (CamelMimeFilter *) camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_QP_DEC); + camel_stream_filter_add (CAMEL_STREAM_FILTER (fstream), filter); + camel_object_unref (filter); + break; + case CAMEL_MIME_PART_ENCODING_UUENCODE: + filter = (CamelMimeFilter *) camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_UU_DEC); + camel_stream_filter_add (CAMEL_STREAM_FILTER (fstream), filter); + camel_object_unref (filter); + break; + default: + break; + } + + if (header_content_type_is (data_wrapper->mime_type, "text", "*")) { + filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, + CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY); + camel_stream_filter_add (CAMEL_STREAM_FILTER (fstream), filter); + camel_object_unref (filter); + } + + ret = camel_stream_write_to_stream (fstream, stream); + camel_object_unref (fstream); + + CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock); + + return ret; +} + +/** + * camel_data_wrapper_decode_to_stream: + * @data_wrapper: a data wrapper + * @stream: stream for decoded data to be written to + * @ex: a CamelException + * + * Writes the decoded data content to @stream. + * + * Return value: the number of bytes written, or -1 if an error + * occurs. + **/ +ssize_t +camel_data_wrapper_decode_to_stream (CamelDataWrapper *data_wrapper, + CamelStream *stream) +{ + g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1); + g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1); + + return CDW_CLASS (data_wrapper)->decode_to_stream (data_wrapper, stream); +} + + static int construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) { |