
* tests/message/test4.c: New test suite for the mime parser (which is where the below 2 fixes were noticed). * camel-mime-parser.c (folder_boundary_check): Calculate 'len' by subtracting the boundary start from inend rather than 'atleast'. (folder_scan_content): Calculate 'inend' differently depending on the EOF state. 2003-08-08 Jeffrey Stedfast <fejj@ximian.com> * camel-mime-filter-tohtml.c (html_convert): Rather than checking *inptr == '\n', check inptr >= inend - this gets rid of an Invalid Read report from valgrind. * camel-mime-part.c (write_to_stream): Don't necessarily re-encode just because the encodings differ. Need to look into making it so that message/rfc822 and multipart parts ignore the Content-Transfer-Encoding header and just keep their 'encoding' bits set to DEFAULT. 2003-08-05 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-folder.c (get_content): Updated. * camel-mime-message.c (camel_mime_message_init): Don't override the mime_type here. (process_header): Updated to use CamelDataWrapper's mime_type field. (find_best_encoding): Same. (best_encoding): Here too. * camel-digest-folder.c (camel_digest_folder_new): Updated for CamelMimePart::content_type change. * camel-mime-part.c (camel_mime_part_init): Override our parent class's default mime_type. (camel_mime_part_finalize): Don't need to unref the content_type anymore. (process_header): Updated to use CamelDataWrapper's mime_type field. (camel_mime_part_set_filename): Same. (camel_mime_part_get_filename): Same. (camel_mime_part_get_content_type): Same. (set_content_object): Here too. (write_to_stream): Updated. (construct_from_parser): Updated. * camel-mime-part.h: Remove the content_type field. 2003-07-31 Jeffrey Stedfast <fejj@ximian.com> * tests/lib/messages.c (test_message_compare_content): If the chunks differ, perform a hexdump on the data being compared so that we may analyse it easier. * camel-multipart-signed.c (write_to_stream): Return ssize_t. * camel-mime-utils.h: Added the CamelMimePartEncodingType enum here. * camel-mime-part.h: Removed the CamelMimePartEncodingType enum from here. * camel-mime-part.c (write_to_stream): Updated to return ssize_t. Also minor changes to only re-encode the content stream if the charset or encoding changed (this way we write it out in the original raw form if nothing changed). * camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): Drastically simplify. We no longer scan html content to try and find the charset, nor do we care about converting the content to UTF-8 and handling broken windows charsets. * camel-mime-message.c (find_best_encoding): Use decode_to_stream() here. Also updated to not assume the content charset is UTF-8 since it is very likely not the case anymore since data-wrappers no longer are converted to UTF-8 at parse time. * camel-folder-summary.c (summary_build_content_info_message): Use decode_to_stream instead here too. * camel-folder-search.c (match_words_1message): Use decode_to_stream instead of write_to_stream so we can search the contents. * camel-data-wrapper.c (camel_data_wrapper_init): Set the default encoding to DEFAULT. (write_to_stream): Updated to return ssize_t (camel_data_wrapper_decode_to_stream): New virtual function to decode a data wrapper to a stream (results in nearly identical behaviour to the old write_to_stream method). (decode_to_stream): Default implementation of above virtual method. Decodes base64/qp/etc streams. * camel-data-wrapper.h: Removed the rawtext bit and added an encoding member. svn path=/trunk/; revision=22171
401 lines
12 KiB
C
401 lines
12 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */
|
|
/*
|
|
*
|
|
* Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
|
|
*
|
|
* Copyright 1999-2003 Ximian, Inc. (www.ximian.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
* License as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*/
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
|
|
#include "camel-data-wrapper.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"
|
|
|
|
#define d(x)
|
|
|
|
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 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);
|
|
static void set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type);
|
|
static gboolean is_offline (CamelDataWrapper *data_wrapper);
|
|
|
|
static void
|
|
camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
|
|
{
|
|
parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
|
|
|
|
/* 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;
|
|
camel_data_wrapper_class->set_mime_type_field = set_mime_type_field;
|
|
camel_data_wrapper_class->construct_from_stream = construct_from_stream;
|
|
camel_data_wrapper_class->is_offline = is_offline;
|
|
}
|
|
|
|
static void
|
|
camel_data_wrapper_init (gpointer object, gpointer klass)
|
|
{
|
|
CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
|
|
|
|
camel_data_wrapper->priv = g_malloc (sizeof (struct _CamelDataWrapperPrivate));
|
|
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;
|
|
}
|
|
|
|
static void
|
|
camel_data_wrapper_finalize (CamelObject *object)
|
|
{
|
|
CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
|
|
|
|
pthread_mutex_destroy (&camel_data_wrapper->priv->stream_lock);
|
|
|
|
g_free (camel_data_wrapper->priv);
|
|
|
|
if (camel_data_wrapper->mime_type)
|
|
header_content_type_unref (camel_data_wrapper->mime_type);
|
|
|
|
if (camel_data_wrapper->stream)
|
|
camel_object_unref (camel_data_wrapper->stream);
|
|
}
|
|
|
|
CamelType
|
|
camel_data_wrapper_get_type (void)
|
|
{
|
|
static CamelType type = CAMEL_INVALID_TYPE;
|
|
|
|
if (type == CAMEL_INVALID_TYPE) {
|
|
type = camel_type_register (CAMEL_OBJECT_TYPE,
|
|
"CamelDataWrapper",
|
|
sizeof (CamelDataWrapper),
|
|
sizeof (CamelDataWrapperClass),
|
|
(CamelObjectClassInitFunc) camel_data_wrapper_class_init,
|
|
NULL,
|
|
(CamelObjectInitFunc) camel_data_wrapper_init,
|
|
(CamelObjectFinalizeFunc) camel_data_wrapper_finalize);
|
|
}
|
|
|
|
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)
|
|
{
|
|
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;
|
|
}
|
|
|
|
ret = camel_stream_write_to_stream (data_wrapper->stream, stream);
|
|
|
|
CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_write_to_stream:
|
|
* @data_wrapper: a data wrapper
|
|
* @stream: stream for data to be written to
|
|
* @ex: a CamelException
|
|
*
|
|
* 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_wrapper_construct_from_stream().
|
|
*
|
|
* Return value: the number of bytes written, or -1 if an error
|
|
* occurs.
|
|
**/
|
|
ssize_t
|
|
camel_data_wrapper_write_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)->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)
|
|
{
|
|
if (data_wrapper->stream)
|
|
camel_object_unref (data_wrapper->stream);
|
|
|
|
data_wrapper->stream = stream;
|
|
camel_object_ref (stream);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_construct_from_stream:
|
|
* @data_wrapper: a data wrapper
|
|
* @stream: A stream that can be read from.
|
|
*
|
|
* Constructs the content of the data wrapper from the
|
|
* supplied @stream.
|
|
*
|
|
* Return value: -1 on error.
|
|
**/
|
|
int
|
|
camel_data_wrapper_construct_from_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)->construct_from_stream (data_wrapper, stream);
|
|
}
|
|
|
|
|
|
static void
|
|
set_mime_type (CamelDataWrapper *data_wrapper, const char *mime_type)
|
|
{
|
|
if (data_wrapper->mime_type)
|
|
header_content_type_unref (data_wrapper->mime_type);
|
|
data_wrapper->mime_type = header_content_type_decode (mime_type);
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_set_mime_type:
|
|
* @data_wrapper: a data wrapper
|
|
* @mime_type: the text representation of a MIME type
|
|
*
|
|
* This sets the data wrapper's MIME type.
|
|
* It might fail, but you won't know. It will allow you to set
|
|
* Content-Type parameters on the data wrapper, which are meaningless.
|
|
* You should not be allowed to change the MIME type of a data wrapper
|
|
* that contains data, or at least, if you do, it should invalidate the
|
|
* data.
|
|
**/
|
|
void
|
|
camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper,
|
|
const char *mime_type)
|
|
{
|
|
g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
|
|
g_return_if_fail (mime_type != NULL);
|
|
|
|
CDW_CLASS (data_wrapper)->set_mime_type (data_wrapper, mime_type);
|
|
}
|
|
|
|
static char *
|
|
get_mime_type (CamelDataWrapper *data_wrapper)
|
|
{
|
|
return header_content_type_simple (data_wrapper->mime_type);
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_get_mime_type:
|
|
* @data_wrapper: a data wrapper
|
|
*
|
|
* Return value: the text form of the data wrapper's MIME type,
|
|
* which the caller must free.
|
|
**/
|
|
char *
|
|
camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)
|
|
{
|
|
g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
|
|
|
|
return CDW_CLASS (data_wrapper)->get_mime_type (data_wrapper);
|
|
}
|
|
|
|
|
|
static CamelContentType *
|
|
get_mime_type_field (CamelDataWrapper *data_wrapper)
|
|
{
|
|
return data_wrapper->mime_type;
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_get_mime_type_field:
|
|
* @data_wrapper: a data wrapper
|
|
*
|
|
* Return value: the parsed form of the data wrapper's MIME type
|
|
**/
|
|
CamelContentType *
|
|
camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper)
|
|
{
|
|
g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
|
|
|
|
return CDW_CLASS (data_wrapper)->get_mime_type_field (data_wrapper);
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_set_mime_type_field:
|
|
* @data_wrapper: a data wrapper
|
|
* @mime_type: the parsed representation of a MIME type
|
|
*
|
|
* This sets the data wrapper's MIME type. It suffers from the same
|
|
* flaws as camel_data_wrapper_set_mime_type.
|
|
**/
|
|
static void
|
|
set_mime_type_field (CamelDataWrapper *data_wrapper,
|
|
CamelContentType *mime_type)
|
|
{
|
|
g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
|
|
g_return_if_fail (mime_type != NULL);
|
|
|
|
if (data_wrapper->mime_type)
|
|
header_content_type_unref (data_wrapper->mime_type);
|
|
data_wrapper->mime_type = mime_type;
|
|
if (mime_type)
|
|
header_content_type_ref (data_wrapper->mime_type);
|
|
}
|
|
|
|
void
|
|
camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
|
|
CamelContentType *mime_type)
|
|
{
|
|
CDW_CLASS (data_wrapper)->set_mime_type_field (data_wrapper, mime_type);
|
|
}
|
|
|
|
|
|
static gboolean
|
|
is_offline (CamelDataWrapper *data_wrapper)
|
|
{
|
|
return data_wrapper->offline;
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_is_offline:
|
|
* @data_wrapper: a data wrapper
|
|
*
|
|
* Return value: whether @data_wrapper is "offline" (data stored
|
|
* remotely) or not. Some optional code paths may choose to not
|
|
* operate on offline data.
|
|
**/
|
|
gboolean
|
|
camel_data_wrapper_is_offline (CamelDataWrapper *data_wrapper)
|
|
{
|
|
return CDW_CLASS (data_wrapper)->is_offline (data_wrapper);
|
|
}
|