
and fixed at least one problem (end of stream never happening in certain cases). Things that can fail now have a way of saying they failed too. So much for taking ANZAC day off to get drunk! 2000-04-26 NotZed <NotZed@HelixCode.com> * camel-seekable-substream.c (stream_seek): Changed to have absolute seek semantics, not relative to the bounds. * camel-seekable-stream.c (reset): When we reset, seek to the start of the bound, if there is one. (stream_tell): Make tell virtual. * camel-stream-filter.c (do_available): Removed. * camel-stream-buffer.c: Remove leading _'s from static functions. (stream_read): Renamed from read(). Fancy that conflicting! (my boo!) Others too. * providers/pop3/camel-pop3-folder.c (get_message_by_number): Changed to stream_mem interface. * providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed for streamfs interface changes, and implement a failure case. (_append_message): Changed for fs stream interface change. * camel-multipart.c (print_part): Iterate rahter than callback. I hate glists's interface (hence, move this to write_to_stream). (write_to_stream): Return an error (yuck, this is a royal PITA to do with the stream write interface). * camel-mime-message.c: Removed leading _ from static names. * camel-mime-part.h: construct_from_parser() now returns an error code. * camel-mime-part-utils.c (camel_mime_part_construct_content_from_parser): Changed to use a camel-data-wrapper instead of a camel-simple-data-wrapper (no change needed elsewhere?). (simple_data_wrapper_construct_from_parser): Fixes for stream-mem interface changes. * camel-simple-data-wrapper.[ch], camel-simple-data-wrapper-stream.[ch], camel-stream-data-wrapper.[ch], removed. Fixed including of these files. * camel-mime-part.c (camel_mime_part_set_text): Remove the use of the camel-simple-data-wrapper-stream, just use a mem stream. (write_to_stream): Renamed from my_* (construct_from_stream): Return an error on error. * camel-stream-mem.c (camel_stream_mem_new*): Remove mode parameter. * camel-stream-mem.h (enum CamelStreamMemMode): Removed. It wasn't used at all. * camel-data-wrapper.h: Add camel_data_wrapper_new() to create these. (write_to_stream, construct_from_stream): Return an error indicator for success. Fixed all methods to match (ICK). * Makefile.am (libcamel_la_SOURCES): Remove camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c, camel-stream-data-wrapper.c. Obsoleted by code re-use! * camel-data-wrapper.c (construct_from_stream): Change the default implementation to just set the output stream == construction stream. Well, this lets me get rid of both simple-data-wrapper and stream-data-wrapper (unused anyway), and simple-data-wrapper-stream in one hit. CamelDataWrapper is now also a concrete class. (write_to_stream): Use camel_stream_write_to_stream() to calculate/return values (and save code). Include <errno.h> for obvious reasons. * camel-stream.c (eos): Provide a default implementation of .eos(). (camel_stream_write_to_stream): Make it return an error code on error. (camel_stream_printf): Changed to return the number of bytes written/error. (camel_stream_available): Removed. * camel-stream-fs.h (enum CamelStreamFsMode): Removed. Changed to use unix modes and so forth (wasn't used for anything but new file creation and didn't work well either). * camel-stream-fs.c: Removed leading _'s for names. And removed some virtual method 'documentation'. (destroy): Dont try and close a closed/error fd. Only report error if close returns -1. Moved all the code to finalise(), and killed this function. (init_with_fd): Properly setup the seek offset, if it is a valid and seekable file descriptor. (init_with_fd_and_bounds): Use off_t for bounds, set bounds on the seekable stream. (init_with_name): Return error codes. (init_with_name_and_bounds): Ditto. (camel_stream_fs_new_with_name): REturn NULL object if it failed. (camel_stream_fs_new_with_name_and_bounds): Return NULL object on failure. Changed with_name* api's to take unix open style args and flags. (read): The bounded stream bounds checking seemed off, simplified code a bit. (write): Implement bounds checking for writing, the comment was wrong, it could make sense to bound writing. Cleaned up a little. (available): Gone. (eos): Removed. Use CamelStream's implementation now. (close): Reset the fd to -1, provide a warning for bad usage. (seek): Cleaned up. Changed the behaviour a little, the returned offset is the absolute position in the file, even in bounded streams. (seek): Seek from end mirrors lseek() behaviour (reverse seeking). 2000-04-25 NotZed <NotZed@HelixCode.com> * camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof indicator to other parent classes. * camel-stream.c (camel_stream_printf): New utility function. Obvious use. * camel-stream-mem.c: Removed leading _'s from static func's. (camel_stream_mem_new_with_byte_array): Fixed for api changes, set the owner for the byte array to us. : Removed A bunch of gtk doc stuff for static (implementation) functions. (available): Removed. (write): Fixed the write implementation so that seek() works on a seekable memory stream, as expected. Seeking past the end of the buffer has unix semantics (filling with 0). (available): Removed. (write): Implement seekable stream bounded stream. (read): Implement seekable stream bounded stream. (close): Dont free the stream_mem if we're not the owner. (seek): Allow to seek beyond the end of memory area, implement bounds checking. (seek): Set errno on bad policy. * camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t. (new_with_buffer): Changed len to be a size_t. (set_buffer, set_byte_array): New interface functions. (struct _CamelStreamMem): Removed position, it is stored in the superclass. * camel-stream.h: Removed some of the seemingly random whitespace. Removed the available method (its not impelemented/useful enough). * camel-seekable-substream.c (init_with_seekable_stream_and_bounds): Remove the data_available stuff, it hasn't been properly implemented/finished, and may never work (unfortunately *sigh). (reemit_parent_signal): Removed part of the above change. (set_bounds): Removed (moved to seekable-stream). : Fixed up some of the generally unreadable indenting (sorry, wrapping at 80 characters with camels_really_long_function_names() just_doesnt_work_very_well_does_it(). (available): Removed. (stream_seek): Fixup for object changes. Make sure we return -1 if the parent stream can't seek. * camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New function to bound any seekable stream. : Removed _'s. (camel_seekable_stream_class_init): Implement an init function, to setup the stream bounds to unbound. * camel-seekable-stream.h (CamelSeekableStreamClass): New virtual method set_bounds for seekable streams. (CAMEL_STREAM_UNBOUND): New define for no bound. * camel-seekable-substream.h (struct _CamelSeekableSubstream): Removed sup_bound and inf_bound, moved to CamelSeekableStream (and renamed, and changed to off_t's). (new_with_seekable_stream_and_bounds): Use off_t as the bounds. (CamelSeekableSubstreamClass): Uh, why was the intialiser virtual? Removed. * camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek to accept an off_t as the offset. (struct _CamelSeekableStream): Renamed cur_pos to position and changed it to an off_t type. (enum CamelStreamSeekPolicy): Set to match the SEEK_* constants from lseek(). (get_current_position): Renamed to tell(). * camel-stream-buffer.h: Commented out set_vbuf - never implemented. svn path=/trunk/; revision=2624
377 lines
11 KiB
C
377 lines
11 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/* camel-data-wrapper.c : Abstract class for a data_wrapper */
|
|
|
|
/*
|
|
*
|
|
* Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
|
|
*
|
|
* Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* 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
|
|
*/
|
|
#include <config.h>
|
|
#include "camel-data-wrapper.h"
|
|
|
|
#include <errno.h>
|
|
|
|
#define d(x)
|
|
|
|
static GtkObjectClass *parent_class = NULL;
|
|
|
|
/* Returns the class for a CamelDataWrapper */
|
|
#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (GTK_OBJECT (so)->klass)
|
|
|
|
|
|
static void set_output_stream (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
static CamelStream *get_output_stream (CamelDataWrapper *data_wrapper);
|
|
|
|
static int construct_from_stream(CamelDataWrapper *, CamelStream *);
|
|
static int write_to_stream (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
static void set_mime_type (CamelDataWrapper *data_wrapper,
|
|
const gchar *mime_type);
|
|
static gchar *get_mime_type (CamelDataWrapper *data_wrapper);
|
|
static GMimeContentField *get_mime_type_field (CamelDataWrapper *data_wrapper);
|
|
static void set_mime_type_field (CamelDataWrapper *data_wrapper,
|
|
GMimeContentField *mime_type);
|
|
static void finalize (GtkObject *object);
|
|
|
|
static void
|
|
camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
|
|
{
|
|
GtkObjectClass *gtk_object_class =
|
|
GTK_OBJECT_CLASS (camel_data_wrapper_class);
|
|
|
|
parent_class = gtk_type_class (gtk_object_get_type ());
|
|
|
|
/* virtual method definition */
|
|
camel_data_wrapper_class->write_to_stream = write_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->set_output_stream = set_output_stream;
|
|
camel_data_wrapper_class->get_output_stream = get_output_stream;
|
|
|
|
camel_data_wrapper_class->construct_from_stream = construct_from_stream;
|
|
|
|
/* virtual method overload */
|
|
gtk_object_class->finalize = finalize;
|
|
}
|
|
|
|
static void
|
|
camel_data_wrapper_init (gpointer object, gpointer klass)
|
|
{
|
|
CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
|
|
|
|
camel_data_wrapper->mime_type = gmime_content_field_new (NULL, NULL);
|
|
}
|
|
|
|
|
|
|
|
GtkType
|
|
camel_data_wrapper_get_type (void)
|
|
{
|
|
static GtkType camel_data_wrapper_type = 0;
|
|
|
|
if (!camel_data_wrapper_type) {
|
|
GtkTypeInfo camel_data_wrapper_info =
|
|
{
|
|
"CamelDataWrapper",
|
|
sizeof (CamelDataWrapper),
|
|
sizeof (CamelDataWrapperClass),
|
|
(GtkClassInitFunc) camel_data_wrapper_class_init,
|
|
(GtkObjectInitFunc) camel_data_wrapper_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL,
|
|
(GtkClassInitFunc) NULL,
|
|
};
|
|
|
|
camel_data_wrapper_type = gtk_type_unique (gtk_object_get_type (), &camel_data_wrapper_info);
|
|
}
|
|
|
|
return camel_data_wrapper_type;
|
|
}
|
|
|
|
|
|
static void
|
|
finalize (GtkObject *object)
|
|
{
|
|
CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
|
|
|
|
if (camel_data_wrapper->mime_type)
|
|
gmime_content_field_unref (camel_data_wrapper->mime_type);
|
|
|
|
if (camel_data_wrapper->input_stream)
|
|
gtk_object_unref (GTK_OBJECT (camel_data_wrapper->input_stream));
|
|
|
|
if (camel_data_wrapper->output_stream)
|
|
gtk_object_unref (GTK_OBJECT (camel_data_wrapper->output_stream));
|
|
|
|
parent_class->finalize (object);
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_new:
|
|
*
|
|
* Create a new camel data wrapper object.
|
|
*
|
|
* Return value:
|
|
**/
|
|
CamelDataWrapper *
|
|
camel_data_wrapper_new(void)
|
|
{
|
|
return gtk_type_new(camel_data_wrapper_get_type());
|
|
}
|
|
|
|
|
|
static void
|
|
set_output_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
|
|
{
|
|
if (data_wrapper->output_stream)
|
|
gtk_object_unref (GTK_OBJECT (data_wrapper->output_stream));
|
|
|
|
data_wrapper->output_stream = stream;
|
|
if (stream) {
|
|
gtk_object_ref (GTK_OBJECT (stream));
|
|
gtk_object_sink (GTK_OBJECT (stream));
|
|
}
|
|
d(printf("data_wrapper:: set_output_stream(%p)\n", stream));
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_set_output_stream:
|
|
* @data_wrapper: a data wrapper
|
|
* @stream: a stream that can be read from
|
|
*
|
|
* This is an internal function to be used by implementors of
|
|
* the camel-data-wrapper to set their contents as a stream.
|
|
*
|
|
* The output stream should theoretically be a stream that, if read
|
|
* from, produces the data wrapper's contents. However, while certain
|
|
* pieces of code assume this, nothing enforces it.
|
|
*
|
|
**/
|
|
void
|
|
camel_data_wrapper_set_output_stream (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream)
|
|
{
|
|
g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
|
|
g_return_if_fail (CAMEL_IS_STREAM (stream));
|
|
|
|
CDW_CLASS (data_wrapper)->set_output_stream (data_wrapper, stream);
|
|
}
|
|
|
|
|
|
static CamelStream *
|
|
get_output_stream (CamelDataWrapper *data_wrapper)
|
|
{
|
|
d(printf("data_wrapper:: get_output_stream(%p) = %p\n", data_wrapper, data_wrapper->output_stream));
|
|
return data_wrapper->output_stream;
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_get_output_stream:
|
|
* @data_wrapper: a data wrapper
|
|
*
|
|
* If the data wrapper has contents, this will return a stream representing
|
|
* the data wrappers contents. Currently only the body of a simple
|
|
* mime part may be read in this way, although conceivably a whole
|
|
* mime message or partial mime message could be processed this way.
|
|
*
|
|
* Return value: @data_wrapper's output stream
|
|
**/
|
|
CamelStream *
|
|
camel_data_wrapper_get_output_stream (CamelDataWrapper *data_wrapper)
|
|
{
|
|
g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
|
|
|
|
return CDW_CLASS (data_wrapper)->get_output_stream (data_wrapper);
|
|
}
|
|
|
|
|
|
static int
|
|
write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
|
|
{
|
|
CamelStream *output_stream;
|
|
|
|
d(printf("data_wrapper::write_to_stream\n"));
|
|
|
|
output_stream = camel_data_wrapper_get_output_stream (data_wrapper);
|
|
if (!output_stream) {
|
|
g_warning("write to stream with no stream");
|
|
errno = EBADF;
|
|
return -1;
|
|
}
|
|
|
|
camel_stream_reset (output_stream);
|
|
|
|
return camel_stream_write_to_stream(output_stream, stream);
|
|
}
|
|
|
|
/**
|
|
* camel_data_wrapper_write_to_stream:
|
|
* @data_wrapper: a data wrapper
|
|
* @stream: stream for data to be written to
|
|
*
|
|
* 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().
|
|
*
|
|
* Returns the number of bytes written, and -1 for error.
|
|
**/
|
|
int
|
|
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 int
|
|
construct_from_stream(CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream)
|
|
{
|
|
camel_data_wrapper_set_output_stream (data_wrapper, 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.
|
|
*
|
|
* This could fail, but you can't know if it did.
|
|
**/
|
|
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 gchar *mime_type)
|
|
{
|
|
gmime_content_field_construct_from_string (data_wrapper->mime_type,
|
|
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 gchar *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 gchar *
|
|
get_mime_type (CamelDataWrapper *data_wrapper)
|
|
{
|
|
return gmime_content_field_get_mime_type (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
|
|
**/
|
|
gchar *
|
|
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 GMimeContentField *
|
|
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
|
|
**/
|
|
GMimeContentField *
|
|
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,
|
|
GMimeContentField *mime_type)
|
|
{
|
|
g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
|
|
g_return_if_fail (mime_type != NULL);
|
|
|
|
if (data_wrapper->mime_type)
|
|
gmime_content_field_unref (data_wrapper->mime_type);
|
|
data_wrapper->mime_type = mime_type;
|
|
if (mime_type)
|
|
gmime_content_field_ref (data_wrapper->mime_type);
|
|
}
|
|
|
|
void
|
|
camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
|
|
GMimeContentField *mime_type)
|
|
{
|
|
CDW_CLASS (data_wrapper)->set_mime_type_field (data_wrapper,
|
|
mime_type);
|
|
}
|