From d23ef479891080fd65e88c21f4fbc5d85e9a560d Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 3 Oct 2000 22:49:42 +0000 Subject: Quote the mailbox name when sending a SELECT request otherwise mailboxes 2000-10-03 Jeffrey Stedfast * providers/imap/camel-imap-command.c (camel_imap_command): Quote the mailbox name when sending a SELECT request otherwise mailboxes with spaces in their names will cause problems. * camel-mime-message.c (camel_mime_message_set_reply_to): encode before setting. (camel_mime_message_set_from): Same. svn path=/trunk/; revision=5697 --- camel/ChangeLog | 10 +++ camel/camel-mime-message.c | 133 +++++++++++++++++------------- camel/camel-remote-store.h | 2 - camel/providers/imap/camel-imap-command.c | 2 +- 4 files changed, 87 insertions(+), 60 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 9dc9eb00cc..b656d163fb 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,13 @@ +2000-10-03 Jeffrey Stedfast + + * providers/imap/camel-imap-command.c (camel_imap_command): Quote + the mailbox name when sending a SELECT request otherwise mailboxes + with spaces in their names will cause problems. + + * camel-mime-message.c (camel_mime_message_set_reply_to): encode + before setting. + (camel_mime_message_set_from): Same. + 2000-10-03 Dan Winship * providers/imap/camel-imap-command.c: New file containing diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 2cb6fed5a7..e8845ba263 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -66,7 +66,7 @@ static void add_header (CamelMedium *medium, const char *header_name, const void static void set_header (CamelMedium *medium, const char *header_name, const void *header_value); static void remove_header (CamelMedium *medium, const char *header_name); static int construct_from_parser (CamelMimePart *, CamelMimeParser *); -static void g_lib_is_uber_crappy_shit(gpointer whocares, gpointer getlost, gpointer blah); +static void unref_recipient (gpointer key, gpointer value, gpointer user_data); /* Returns the class for a CamelMimeMessage */ #define CMM_CLASS(so) CAMEL_MIME_MESSAGE_CLASS (CAMEL_OBJECT_GET_CLASS(so)) @@ -98,8 +98,6 @@ camel_mime_message_class_init (CamelMimeMessageClass *camel_mime_message_class) } - - static void camel_mime_message_init (gpointer object, gpointer klass) { @@ -131,8 +129,8 @@ camel_mime_message_finalize (CamelObject *object) g_free (message->reply_to); g_free (message->from); - g_hash_table_foreach (message->recipients, g_lib_is_uber_crappy_shit, NULL); - g_hash_table_destroy(message->recipients); + g_hash_table_foreach (message->recipients, unref_recipient, NULL); + g_hash_table_destroy (message->recipients); } @@ -154,12 +152,9 @@ camel_mime_message_get_type (void) return camel_mime_message_type; } -/* annoying way to free objects in a hashtable, i mean, its not like anyone - would want to store them in a hashtable, really */ -/* peterw: somebody's not bitter :-) */ -static void g_lib_is_uber_crappy_shit(gpointer whocares, gpointer getlost, gpointer blah) +static void unref_recipient (gpointer key, gpointer value, gpointer user_data) { - camel_object_unref((CamelObject *)getlost); + camel_object_unref (CAMEL_OBJECT (value)); } @@ -244,13 +239,23 @@ camel_mime_message_get_sent_date (CamelMimeMessage *message) void camel_mime_message_set_reply_to (CamelMimeMessage *mime_message, const gchar *reply_to) { + CamelInternetAddress *addr; + char *text; + g_assert (mime_message); - + /* FIXME: check format of string, handle it nicer ... */ - - g_free(mime_message->reply_to); - mime_message->reply_to = g_strdup(reply_to); - CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)mime_message, "Reply-To", reply_to); + + g_free (mime_message->reply_to); + mime_message->reply_to = g_strstrip (g_strdup (reply_to)); + + addr = camel_internet_address_new (); + camel_address_decode (CAMEL_ADDRESS (addr), reply_to); + + text = camel_address_encode (CAMEL_ADDRESS (addr)); + camel_object_unref (CAMEL_OBJECT (addr)); + CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "Reply-To", text); + g_free (text); } const gchar * @@ -266,13 +271,14 @@ camel_mime_message_set_subject (CamelMimeMessage *mime_message, const gchar *subject) { char *text; + g_assert (mime_message); - - g_free(mime_message->subject); + + g_free (mime_message->subject); mime_message->subject = g_strstrip (g_strdup (subject)); - text = header_encode_string(subject); - CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)mime_message, "Subject", text); - g_free(text); + text = header_encode_string ((unsigned char *) mime_message->subject); + CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "Subject", text); + g_free (text); } const gchar * @@ -287,11 +293,23 @@ camel_mime_message_get_subject (CamelMimeMessage *mime_message) void camel_mime_message_set_from (CamelMimeMessage *mime_message, const gchar *from) { + CamelInternetAddress *addr; + char *text; + g_assert (mime_message); - - g_free(mime_message->from); - mime_message->from = g_strdup(from); - CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)mime_message, "From", from); + + /* FIXME: check format of string, handle it nicer ... */ + + g_free (mime_message->from); + mime_message->from = g_strstrip (g_strdup (from)); + + addr = camel_internet_address_new (); + camel_address_decode (CAMEL_ADDRESS (addr), from); + + text = camel_address_encode (CAMEL_ADDRESS (addr)); + camel_object_unref (CAMEL_OBJECT (addr)); + CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "From", text); + g_free (text); } const gchar * @@ -314,18 +332,18 @@ camel_mime_message_add_recipient (CamelMimeMessage *mime_message, g_assert (mime_message); - addr = g_hash_table_lookup(mime_message->recipients, type); + addr = g_hash_table_lookup (mime_message->recipients, type); if (addr == NULL) { - g_warning("trying to add a non-valid receipient type: %s = %s %s", type, name, address); + g_warning ("trying to add a non-valid receipient type: %s = %s %s", type, name, address); return; } - camel_internet_address_add(addr, name, address); + camel_internet_address_add (addr, name, address); /* FIXME: maybe this should be delayed till we're ready to write out? */ - text = camel_address_encode((CamelAddress*)addr); - CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)mime_message, type, text); - g_free(text); + text = camel_address_encode (CAMEL_ADDRESS (addr)); + CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), type, text); + g_free (text); } void @@ -337,7 +355,6 @@ camel_mime_message_remove_recipient_address (CamelMimeMessage *mime_message, int index; char *text; - g_assert (mime_message); addr = g_hash_table_lookup(mime_message->recipients, type); @@ -345,18 +362,19 @@ camel_mime_message_remove_recipient_address (CamelMimeMessage *mime_message, g_warning("trying to remove a non-valid receipient type: %s = %s", type, address); return; } + index = camel_internet_address_find_address(addr, address, NULL); if (index == -1) { g_warning("trying to remove address for nonexistand address: %s", address); return; } - camel_address_remove((CamelAddress *)addr, index); + camel_address_remove (CAMEL_ADDRESS (addr), index); /* FIXME: maybe this should be delayed till we're ready to write out? */ - text = camel_address_encode((CamelAddress *)addr); - CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)mime_message, type, text); - g_free(text); + text = camel_address_encode (CAMEL_ADDRESS (addr)); + CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), type, text); + g_free (text); } void @@ -381,12 +399,12 @@ camel_mime_message_remove_recipient_name (CamelMimeMessage *mime_message, return; } - camel_address_remove((CamelAddress *)addr, index); + camel_address_remove (CAMEL_ADDRESS (addr), index); /* FIXME: maybe this should be delayed till we're ready to write out? */ - text = camel_address_encode((CamelAddress *)addr); - CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)mime_message, type, text); - g_free(text); + text = camel_address_encode (CAMEL_ADDRESS (addr)); + CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), type, text); + g_free (text); } const CamelInternetAddress * @@ -471,20 +489,21 @@ format_address(const char *text) { struct _header_address *addr; char *ret; - - addr = header_address_decode(text); + + addr = header_address_decode (text); if (addr) { - ret = header_address_list_format(addr); - header_address_list_clear(&addr); + ret = header_address_list_format (addr); + header_address_list_clear (&addr); } else { - ret = g_strdup(text); + ret = g_strdup (text); } + return ret; } /* FIXME: check format of fields. */ static gboolean -process_header(CamelMedium *medium, const char *header_name, const char *header_value) +process_header (CamelMedium *medium, const char *header_name, const char *header_value) { CamelHeaderType header_type; CamelMimeMessage *message = CAMEL_MIME_MESSAGE (medium); @@ -493,31 +512,31 @@ process_header(CamelMedium *medium, const char *header_name, const char *header_ header_type = (CamelHeaderType) g_hash_table_lookup (header_name_table, header_name); switch (header_type) { case HEADER_FROM: - g_free(message->from); - message->from = format_address(header_value); + g_free (message->from); + message->from = format_address (header_value); break; case HEADER_REPLY_TO: - g_free(message->reply_to); - message->reply_to = format_address(header_value); + g_free (message->reply_to); + message->reply_to = format_address (header_value); break; case HEADER_SUBJECT: - g_free(message->subject); - message->subject = g_strstrip (header_decode_string(header_value)); + g_free (message->subject); + message->subject = g_strstrip (header_decode_string (header_value)); break; case HEADER_TO: case HEADER_CC: case HEADER_BCC: - addr = g_hash_table_lookup(message->recipients, header_name); + addr = g_hash_table_lookup (message->recipients, header_name); if (header_value) - camel_address_decode((CamelAddress *)addr, header_value); + camel_address_decode (CAMEL_ADDRESS (addr), header_value); else - camel_address_remove((CamelAddress *)addr, -1); + camel_address_remove (CAMEL_ADDRESS (addr), -1); break; case HEADER_DATE: - g_free(message->date_str); - message->date_str = g_strdup(header_value); + g_free (message->date_str); + message->date_str = g_strdup (header_value); if (header_value) { - message->date = header_decode_date(header_value, &message->date_offset); + message->date = header_decode_date (header_value, &message->date_offset); } else { message->date = CAMEL_MESSAGE_DATE_CURRENT; } diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h index 4a91f7a3e7..2d6bc829c2 100644 --- a/camel/camel-remote-store.h +++ b/camel/camel-remote-store.h @@ -76,5 +76,3 @@ void camel_remote_store_refresh_folders (CamelRemoteStore *store, #endif /* __cplusplus */ #endif /* CAMEL_REMOTE_STORE_H */ - - diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c index e06de34db4..70b6ea8149 100644 --- a/camel/providers/imap/camel-imap-command.c +++ b/camel/providers/imap/camel-imap-command.c @@ -71,7 +71,7 @@ camel_imap_command (CamelImapStore *store, CamelFolder *folder, folder_path = camel_imap_store_folder_path (store, folder->full_name); response = camel_imap_command (store, NULL, ex, - "SELECT %s", folder_path); + "SELECT \"%s\"", folder_path); g_free (folder_path); if (!response) { -- cgit v1.2.3