aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-multipart.c
diff options
context:
space:
mode:
authorNotZed <NotZed@HelixCode.com>2000-04-24 14:05:41 +0800
committerMichael Zucci <zucchi@src.gnome.org>2000-04-24 14:05:41 +0800
commit8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07 (patch)
tree9667ffd1192096e68ebeaf1183c5d0a8d818d2e5 /camel/camel-multipart.c
parent7455842584ee656cb375b52064ff8c23560c568b (diff)
downloadgsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.gz
gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.zst
gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.zip
No longer call data_wrapper_repository_init.
2000-04-24 NotZed <NotZed@HelixCode.com> * camel.c (camel_init): No longer call data_wrapper_repository_init. * camel-medium.c (write_to_stream): Moved (back) to camel-mime-part. (add_header): (set_header): (remove_header): (get_header): Make all these abstract, and spit warnings if called. I guess it could manage the list, but well, it doesn't. * camel-medium.h (struct _CamelMedium): Dont store headers here, the implementor is the only one who knows their format. (CamelMediumClass): Changed header values to be void *'s. They need not be strings? * camel-simple-data-wrapper.c (construct_from_stream): And we're back. Set the output stream. (construct_from_parser): Moved to camel-mime-part-utils. * camel-mime-part-utils.c (camel_mime_part_construct_content_from_parser): Create the contents of multipart and simple messages. * camel-multipart.c (construct_from_parser): Moved to camel-mime-part-utils. (separate_part): Removed. * camel-mime-part.c (construct_from_stream): Back again! This now switches over to using a mime parser for any mime parts, only. (my_write_to_stream): Write our headers and so forth here. (add_header): Add header directly, parent class is abstract. (remove_header): Ditto. (set_header): Ditto. * camel-data-wrapper.c (camel_data_wrapper_construct_from_stream): Remade abstract. (camel_data_wrapper_construct_from_parser): Moved to camel_mime_part. * camel-data-wrapper.h: Put back construct_from_stream. * camel-mime-part.h: Put construct_from_parser in here, the data-wrapper shouldn't know about mime. Ok, so now to undo half of the last hours changes ... duh. 2a51,93 * providers/pop3/camel-pop3-folder.c (get_message_by_number): Use construct_from_stream instead of set_input_stream(). * camel-simple-data-wrapper-stream.c (camel_simple_data_wrapper_stream_construct): REmoved the destroy callback code. (wrapper_destroy_cb): Removed. * camel-simple-data-wrapper.h: Add prototype for _construct() method. * camel.c: Include unicode.h to kill a warning. * camel-data-wrapper.h (CameldataWrapperClass): Removed construct_from_stream virtual method. Removed get/set input stream. * data-wrapper-repository.[ch]: Removed&from build. Obsoleted? The justification as is follows: It is mixing storage protocol/format with message architecture. It really just doesn't serve any purpose, as each medium implementor will have to have its own type->handler mapping, and the only current implementor, mimepart has a very simple structure and no need for this. * camel-medium.c (write_to_stream): Moved here from most of the stuff in camel-mime-part. Well, the MEDIUM is the one that knows what the headers are, and the content is, let it write it out. * camel-mime-part-utils.c (camel_mime_part_construct_content): Copied from camel-mime-part.c, removed handling of message followon state (moved to camel-mime-message). (camel_mime_part_construct_content_from_parser): Renamed from construct_content. (camel_mime_part_construct_headers_from_stream): (camel_mime_part_construct_content_from_stream): (camel_mime_part_store_stream_in_buffer): Removed. Replaced by the new construct from parser stuff. * camel-mime-message.c (construct_from_parser): Do construct_from_parser for mime-message. (_write_to_stream): Set the mime-version header for medium to write out, rather than writing it out ourselves. 4a96,102 (construct_from_stream): Removed. (camel_data_wrapper_construct_from_stream): Changed to a helper function, creates a mime_parser, and constructs from that. (set_input_stream): Removed. (camel_data_wrapper_set_input_stream): Removed. (get_input_stream): Removed. (camel_data_wrapper_get_input_stream): Removed. 11a110,111 (_get_message_by_uid): Use construct_from_stream() instead of creating our own parser. 16a117,131 (camel_mime_part_construct_content): Removed to camel-mime-part-utils.c (my_get_output_stream): Removed. The streeam is in the data-wrapper. (my_get_content_object): Removed. The content object is stored in the medium. If none is there, the object wasn't created properly. (my_write_content_to_stream): Removed. The content object is the one that knows how to write itself out!!!!!!!! (my_write_to_stream): Remove the base header writing stuff - has been moved to camel-medium, where it belongs. This can just be used to check for mandatory headers. (my_construct_from_stream): Removed. (my_set_input_stream): What the hell, i'll remove this too. Nobody seems to understand how it differs from create from stream, and they both seem to serve the same purpose ... 19a135,136 (construct_from_stream): Removed! Job taken over by construct_from_parser. 24a142 (set_input_stream): REmoved. Replaced by construct_from_parser. svn path=/trunk/; revision=2577
Diffstat (limited to 'camel/camel-multipart.c')
-rw-r--r--camel/camel-multipart.c161
1 files changed, 1 insertions, 160 deletions
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 94ec8a4dbf..1ebeed4f8f 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* camel-multipart.c : Abstract class for a multipart */
+#warning This should be a mostly abstract class, but it is not!
/*
*
@@ -55,11 +56,7 @@ static void set_boundary (CamelMultipart *multipart,
static const gchar * get_boundary (CamelMultipart *multipart);
static void write_to_stream (CamelDataWrapper *data_wrapper,
CamelStream *stream);
-static void set_input_stream (CamelDataWrapper *data_wrapper,
- CamelStream *stream);
static void finalize (GtkObject *object);
-static void construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp);
-
static CamelDataWrapperClass *parent_class = NULL;
@@ -96,9 +93,6 @@ camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)
/* virtual method overload */
camel_data_wrapper_class->write_to_stream = write_to_stream;
- camel_data_wrapper_class->set_input_stream = set_input_stream;
-
- camel_data_wrapper_class->construct_from_parser = construct_from_parser;
gtk_object_class->finalize = finalize;
}
@@ -523,156 +517,3 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
if (multipart->postface)
camel_stream_write_strings (stream, multipart->postface, NULL);
}
-
-
-/**
- * separate_part: separate one part in a multipart environement.
- * @stream: the stream to read the lines from.
- * @normal_boundary: end of part bundary.
- * @end_boundary: end of multipart boundary.
- * @end_position: end position of the mime part
- *
- * This routine is a bit special: RFC 2046 says that, in a multipart
- * environment, the last CRLF before a boundary belongs to the boundary.
- * Thus, if there is no blank line before the boundary, the last CRLF
- * of the last line of the part is removed.
- *
- * Return value: %TRUE if the last boundary element has been found or
- * if no more data was available from the stream, %FALSE otherwise
- **/
-static gboolean
-separate_part (CamelStream *stream, gchar *normal_boundary,
- gchar *end_boundary, guint32 *end_position)
-{
- gchar *new_line = NULL;
- gboolean end_of_part = FALSE;
- gboolean last_part = FALSE;
- guint32 last_position;
-
- /* Note for future enhancements */
- /* RFC 2046 specifies that when parsing the content of a
- * multipart element, the program should not assume it will
- * find the last boundary, and in particular, if the message
- * is damaged during transport, the parsing should still be
- * OK.
- */
-
- last_position = camel_seekable_stream_get_current_position (
- CAMEL_SEEKABLE_STREAM (stream));
- new_line = gmime_read_line_from_stream (stream);
-
- while (new_line && !end_of_part && !last_part) {
- end_of_part = (strcmp (new_line, normal_boundary) == 0);
- last_part = (strcmp (new_line, end_boundary) == 0);
- if (!end_of_part && !last_part) {
- g_free (new_line);
-
- last_position =
- camel_seekable_stream_get_current_position (
- CAMEL_SEEKABLE_STREAM (stream));
-
- new_line = gmime_read_line_from_stream (stream);
- }
- }
-
- if (new_line)
- g_free (new_line);
- else
- last_part = TRUE;
-
- *end_position = last_position;
-
- return last_part;
-}
-
-
-static void
-set_input_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
- CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);
- CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
- const gchar *boundary;
- gchar *real_boundary_line;
- gchar *end_boundary_line;
- gboolean end_of_multipart;
- CamelMimeBodyPart *body_part;
- guint32 part_begining, part_end;
- CamelSeekableSubstream *body_part_input_stream;
- guint32 saved_stream_pos;
-
- /* Call parent class implementation. */
- parent_class->set_input_stream (data_wrapper, stream);
-
- boundary = camel_multipart_get_boundary (multipart);
- g_return_if_fail (boundary);
-
- real_boundary_line = g_strdup_printf ("--%s", boundary);
- end_boundary_line = g_strdup_printf ("--%s--", boundary);
-
- /* Read the prefix, if any. */
- end_of_multipart = separate_part (stream, real_boundary_line,
- end_boundary_line, &part_end);
- if (multipart->preface)
- g_free (multipart->preface);
-
- /* Read all the real parts. */
- while (!end_of_multipart) {
- /* Determine the position of the begining of the part. */
- part_begining = camel_seekable_stream_get_current_position (seekable_stream);
-
- body_part = camel_mime_body_part_new ();
-
- end_of_multipart = separate_part (stream, real_boundary_line,
- end_boundary_line,
- &part_end);
- body_part_input_stream = CAMEL_SEEKABLE_SUBSTREAM (
- camel_seekable_substream_new_with_seekable_stream_and_bounds (seekable_stream,
- part_begining,
- part_end));
-
- /* The seekable substream may change the position of
- * the stream so we must save it before calling
- * set_input_stream.
- */
- saved_stream_pos = camel_seekable_stream_get_current_position (seekable_stream);
- camel_data_wrapper_set_input_stream (CAMEL_DATA_WRAPPER (body_part),
- CAMEL_STREAM (body_part_input_stream));
-
- /* restore the stream position */
- camel_seekable_stream_seek (seekable_stream, saved_stream_pos, CAMEL_STREAM_SET);
-
- /* add the body part to the multipart object */
- camel_multipart_add_part (multipart, body_part);
- }
-
- /* g_string_assign (new_part, ""); */
- /* my_localize_part (new_part, stream, real_boundary_line, end_boundary_line); */
-
- if (multipart->postface) g_free (multipart->postface);
- /* if ( (new_part->str)[0] != '\0') multipart->postface = g_strdup (new_part->str); */
-
- /* g_string_free (new_part, TRUE); */
-
- g_free (real_boundary_line);
- g_free (end_boundary_line);
-}
-
-/* multi_part */
-static void
-construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp)
-{
- CamelDataWrapper *bodypart;
- char *buf;
- int len;
-
- d(printf("constructing multipart\n"));
-
- /* get/set boundary? */
-
- while (camel_mime_parser_step(mp, &buf, &len) != HSCAN_MULTIPART_END) {
- camel_mime_parser_unstep(mp);
- bodypart = (CamelDataWrapper *)camel_mime_body_part_new();
- camel_data_wrapper_construct_from_parser(bodypart, mp);
- camel_multipart_add_part((CamelMultipart *)dw, (CamelMimeBodyPart *)bodypart);
- }
-}