aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Loper <mloper@src.gnome.org>2000-02-08 06:42:41 +0800
committerMatthew Loper <mloper@src.gnome.org>2000-02-08 06:42:41 +0800
commit1779bc381707699d1ef5842708ee71fd24e867d8 (patch)
treece33df7b937b0c37a11e90985c38219da7654843
parent831bc265cc6903991facbb910a205fd6e3c96c69 (diff)
downloadgsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.tar
gsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.tar.gz
gsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.tar.bz2
gsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.tar.lz
gsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.tar.xz
gsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.tar.zst
gsoc2013-evolution-1779bc381707699d1ef5842708ee71fd24e867d8.zip
+ * tests/test-formatter.c (print_usage_and_quit): New function,
+ which gives usage information. + + * camel/camel-formatter.c: made the 'stream' a member of the + CamelFormatter class, so that streams don't have to be explicitly + sent as a param where a CamelFormatter is also sent.. + (handle_text_plain): Use 'encode_entities' to change '<' to + '&gt;', etc. svn path=/trunk/; revision=1687
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--camel/camel-formatter.c149
-rw-r--r--tests/test-formatter.c15
3 files changed, 115 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog
index 94b3670995..3c12067479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-02-07 Matt Loper <matt.loper@splashtech.com>
+
+ * tests/test-formatter.c (print_usage_and_quit): New function,
+ which gives usage information.
+
+ * camel/camel-formatter.c: made the 'stream' a member of the
+ CamelFormatter class, so that streams don't have to be explicitly
+ sent as a param where a CamelFormatter is also sent..
+ (handle_text_plain): Use 'encode_entities' to change '<' to
+ '&gt;', etc.
+
2000-02-07 Damon Chaplin <damon@helixcode.com>
* widgets/shortcut-bar/e-group-bar.c (e_group_bar_draw): finished.
diff --git a/camel/camel-formatter.c b/camel/camel-formatter.c
index 737a3b78c6..08e911f03c 100644
--- a/camel/camel-formatter.c
+++ b/camel/camel-formatter.c
@@ -1,4 +1,4 @@
-
+
/*--------------------------------*-C-*---------------------------------*
*
* Author :
@@ -27,7 +27,8 @@
#include "camel-log.h"
#include <libgnome/libgnome.h>
-
+#include <ctype.h> // for isprint
+
/*
* The CamelFormatter takes a mime message, and produces html from it,
* through the single function camel_formatter_mime_message_to_html().
@@ -48,37 +49,29 @@
*/
static void handle_text_plain (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_text_html (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_image (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_mime_message (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_multipart_mixed (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_multipart_related (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_multipart_alternate(CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
static void handle_unknown_type (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream);
+ CamelDataWrapper *wrapper);
/* encodes some characters into their 'escaped' version;
* so '<' turns into '&lt;', and '"' turns into '&quot;' */
static gchar* encode_entities (const guchar *input,
- guint len,
- guint *encoded_len_return);
+ guint len,
+ guint *encoded_len_return);
static GtkObjectClass *parent_class = NULL;
@@ -87,13 +80,13 @@ static void _finalize (GtkObject *object);
struct _CamelFormatterPrivate {
CamelMimeMessage *current_root;
+ CamelStream *stream;
};
static GHashTable *mime_function_table = NULL;
-void
-debug (const gchar *format,
- ...)
+static void
+debug (const gchar *format, ...)
{
va_list args;
gchar *string;
@@ -128,20 +121,20 @@ camel_formatter_mime_message_to_html (CamelFormatter* formatter,
camel_stream_write_string (stream, "<html><body>\n");
formatter->priv->current_root = mime_message;
+ formatter->priv->stream = stream;
handle_mime_message (
formatter,
- CAMEL_DATA_WRAPPER (mime_message),
- stream);
+ CAMEL_DATA_WRAPPER (mime_message));
- camel_stream_write_string (stream, "\n</body></html>\n");
+ camel_stream_write_string (formatter->priv->stream,
+ "\n</body></html>\n");
}
/* we're maintaining a hashtable of mimetypes -> functions;
* those functions have the following signature...*/
typedef void (*mime_handler_fn) (CamelFormatter *formatter,
- CamelDataWrapper *data_wrapper,
- CamelStream *stream);
+ CamelDataWrapper *data_wrapper);
static gchar*
lookup_unique_id (CamelMimeMessage* root, CamelDataWrapper* child)
@@ -154,7 +147,7 @@ lookup_unique_id (CamelMimeMessage* root, CamelDataWrapper* child)
static void
call_handler_function (CamelFormatter* formatter,
CamelDataWrapper* wrapper,
- gchar* mimetype, CamelStream* stream)
+ gchar* mimetype)
{
mime_handler_fn handler_function;
@@ -178,7 +171,8 @@ call_handler_function (CamelFormatter* formatter,
"<object classid=\"%s\" uid=\"%s\">",
goad_id, uid);
- camel_stream_write_string (stream, tag);
+ camel_stream_write_string (formatter->priv->stream,
+ tag);
}
/* we don't know how to show something of this
mimetype; punt */
@@ -189,7 +183,7 @@ call_handler_function (CamelFormatter* formatter,
}
}
else {
- (*handler_function)(formatter, wrapper, stream);
+ (*handler_function)(formatter, wrapper);
}
}
@@ -398,26 +392,29 @@ strcase_equal (gconstpointer v, gconstpointer v2)
*----------------------------------------------------------------------*/
static void
-handle_text_plain (CamelFormatter *formatter, CamelDataWrapper *wrapper,
- CamelStream *stream)
+handle_text_plain (CamelFormatter *formatter, CamelDataWrapper *wrapper)
{
CamelSimpleDataWrapper* simple_data_wrapper;
gchar* text;
debug ("handle_text_plain: entered\n");
-
+
+ /* Plain text is embodied in a CamelSimpleDataWrapper */
g_assert (CAMEL_IS_SIMPLE_DATA_WRAPPER (wrapper));
simple_data_wrapper = CAMEL_SIMPLE_DATA_WRAPPER (wrapper);
-// camel_simple_data_wrapper_set_text (
-// simple_data_wrapper, "hello world");
+ /* If there's any text, write it to the stream */
if (simple_data_wrapper->byte_array->len != 0) {
+ int returned_strlen;
debug ("yay, simple_data_wrapper->byte_array->len != 0\n");
g_assert (simple_data_wrapper->byte_array->data);
- text = g_strndup (simple_data_wrapper->byte_array->data,
- simple_data_wrapper->byte_array->len);
- camel_stream_write_string (stream, text);
+ /* replace '<' with '&lt;', etc. */
+ text = encode_entities (simple_data_wrapper->byte_array->data,
+ simple_data_wrapper->byte_array->len,
+ &returned_strlen);
+
+ camel_stream_write_string (formatter->priv->stream, text);
g_free (text);
}
else {
@@ -428,8 +425,7 @@ handle_text_plain (CamelFormatter *formatter, CamelDataWrapper *wrapper,
}
static void
-handle_text_html (CamelFormatter *formatter, CamelDataWrapper *wrapper,
- CamelStream *stream)
+handle_text_html (CamelFormatter *formatter, CamelDataWrapper *wrapper)
{
debug ("handle_text_html: entered\n");
@@ -440,20 +436,28 @@ handle_text_html (CamelFormatter *formatter, CamelDataWrapper *wrapper,
}
static void
-handle_image (CamelFormatter *formatter, CamelDataWrapper *wrapper,
- CamelStream *stream)
+handle_image (CamelFormatter *formatter, CamelDataWrapper *wrapper)
{
+ gchar* uuid;
+ gchar* tag;
+
debug ("handle_image: entered\n");
+ uuid = lookup_unique_id (formatter->priv->current_root, wrapper);
+ g_assert (uuid);
-
+ tag = g_strdup_printf ("<img src=\"%s\">\n", uuid);
+ camel_stream_write_string (formatter->priv->stream, tag);
+
+ g_free (uuid);
+ g_free (tag);
+
debug ("handle_image: exiting\n");
}
static void
handle_mime_message (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream)
+ CamelDataWrapper *wrapper)
{
CamelMimeMessage* mime_message =
CAMEL_MIME_MESSAGE (wrapper);
@@ -462,17 +466,21 @@ handle_mime_message (CamelFormatter *formatter,
camel_medium_get_content_object (CAMEL_MEDIUM (mime_message));
debug ("handle_mime_message: entered\n");
- camel_stream_write_string (stream, "<table width=95% border=1><tr><td>\n\n");
+ camel_stream_write_string (formatter->priv->stream,
+ "<table width=95% border=1><tr><td>\n\n");
/* write the subj:, to:, from: etc. fields out as html */
- write_header_info_to_stream (mime_message, stream);
+ write_header_info_to_stream (mime_message,
+ formatter->priv->stream);
/* dispatch the correct handler function for the mime type */
call_handler_function (formatter, message_contents,
- MIME_TYPE_WHOLE (mime_message), stream);
+ MIME_TYPE_WHOLE (mime_message));
/* close up the table we opened */
- camel_stream_write_string (stream, "\n\n</td></tr></table>\n\n");
+ camel_stream_write_string (formatter->priv->stream,
+ "\n\n</td></tr></table>\n\n");
+
debug ("handle_mime_message: exiting\n");
}
@@ -494,7 +502,6 @@ find_preferred_displayable_body_part_in_multipart_alternative (
/* TODO: DO LEAF-LOOKUP HERE FOR OTHER MIME-TYPES!!! */
- /* ...and write each one, as html, into the stream. */
for (i = 0; i < max_multiparts; i++) {
CamelMimeBodyPart* body_part = camel_multipart_get_part (multipart, i);
if (strcase_equal (MIME_TYPE_SUB (body_part), "plain")) {
@@ -515,40 +522,58 @@ find_preferred_displayable_body_part_in_multipart_alternative (
static void
handle_multipart_mixed (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream)
+ CamelDataWrapper *wrapper)
{
CamelMultipart* mp = CAMEL_MULTIPART (wrapper);
debug ("handle_multipart_mixed: entered\n");
+
+ /* TODO: serialize items in CamelMultipart */
+
debug ("handle_multipart_mixed: exiting\n");
}
static void
handle_multipart_related (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream)
+ CamelDataWrapper *wrapper)
{
CamelMultipart* mp = CAMEL_MULTIPART (wrapper);
debug ("handle_multipart_related: entered\n");
+
+ /* TODO: read RFC, in terms of how a one message
+ may refer to another object */
+
debug ("handle_multipart_related: exiting\n");
}
static void
handle_multipart_alternate (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream)
+ CamelDataWrapper *wrapper)
{
CamelMultipart* mp = CAMEL_MULTIPART (wrapper);
debug ("handle_multipart_alternate: entered\n");
+
+ /* TODO:
+ find_preferred_displayable_body_part_in_multipart_alternate */
+
debug ("handle_multipart_alternate: exiting\n");
}
static void
handle_unknown_type (CamelFormatter *formatter,
- CamelDataWrapper *wrapper,
- CamelStream *stream)
+ CamelDataWrapper *wrapper)
{
+ gchar* tag;
+ CamelMimeMessage* root = formatter->priv->current_root;
+ char* uid = lookup_unique_id (root, wrapper);
+
debug ("handle_unknown_type: entered\n");
+ g_assert (uid);
+
+ tag = g_strdup_printf ("<a href=\"camel://%s\">click-me-to-save</a>\n",
+ uid);
+
+ camel_stream_write_string (formatter->priv->stream, tag);
+
debug ("handle_unknown_type: exiting\n");
}
@@ -582,7 +607,8 @@ camel_formatter_class_init (CamelFormatterClass *camel_formatter_class)
ADD_HANDLER ("multipart/alternate", handle_multipart_alternate);
ADD_HANDLER ("multipart/related", handle_multipart_related);
ADD_HANDLER ("multipart/related", handle_multipart_mixed);
- ADD_HANDLER ("message/rfc822", handle_mime_message);
+ ADD_HANDLER ("message/rfc822", handle_mime_message);
+ ADD_HANDLER ("image/", handle_image);
/* virtual method overload */
gtk_object_class->finalize = _finalize;
@@ -635,6 +661,8 @@ _finalize (GtkObject* object)
}
+<<<<<<< camel-formatter.c
+=======
/* GARBAGE GARBAGE GARBAGE GARBAGE GARBAGE GARBAGE */
/* GARBAGE GARBAGE GARBAGE GARBAGE GARBAGE GARBAGE */
/* GARBAGE GARBAGE GARBAGE GARBAGE GARBAGE GARBAGE */
@@ -709,3 +737,4 @@ mime_part_to_html (CamelFormatter* formatter, CamelMimePart* part,
}
}
}
+>>>>>>> 1.6
diff --git a/tests/test-formatter.c b/tests/test-formatter.c
index 9c9c6eed7b..32148be11b 100644
--- a/tests/test-formatter.c
+++ b/tests/test-formatter.c
@@ -21,6 +21,17 @@ convert_to_html_and_print (CamelMimeMessage *msg)
(CAMEL_STREAM_MEM(stream))->buffer->data);
}
+static void
+print_usage_and_quit()
+{
+ g_print ("\nUsage: test-formatter [MIME-MESSAGE-FILE]\n\n");
+ g_print ("Where MIME-MESSAGE-FILE is in the \"message/rfc822\"\n");
+ g_print ("mime format.\n\n");
+
+ exit(0);
+}
+
+
int
main (int argc, char**argv)
{
@@ -28,8 +39,12 @@ main (int argc, char**argv)
CamelMimeMessage *message;
CamelStream *input_stream;
+// CamelStream *foo = CAMEL_STREAM(NULL);
gtk_init (&argc, &argv);
+ if (argc == 1 || argc > 2)
+ print_usage_and_quit();
+
camel_init ();
camel_debug_level = CAMEL_LOG_LEVEL_FULL_DEBUG;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 10:40:03 +0800