aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-05-09 06:27:59 +0800
committerDan Winship <danw@src.gnome.org>2000-05-09 06:27:59 +0800
commit65ec43cb553420890c8d14b6c76ce2606674d893 (patch)
tree227b1c2aa3be87901a1d971578b79cdde5ab557c /camel/providers
parent3050b3ba056b047a8a1c44c32df5c5eb8558ea58 (diff)
downloadgsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar
gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.gz
gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.bz2
gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.lz
gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.xz
gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.zst
gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.zip
Use CamelException to signal failure. (camel_stream_write_strings):
* camel-stream.c (camel_stream_read, camel_stream_write, camel_stream_flush, camel_stream_reset, camel_stream_printf, camel_stream_write_to_stream): Use CamelException to signal failure. (camel_stream_write_strings): Remove. camel_stream_printf is more useful in most of the places that used this. (camel_stream_write_string): Change from macro to function to prevent problems with double-evaluation. * camel-seekable-stream.c (camel_seekable_stream_seek, camel_seekable_stream_set_bounds): Use CamelException. (reset): Update. * camel-seekable-substream.c, camel-stream-buffer.c, camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c: Update. * camel-stream-fs.c: Remove the virtual init functions and move the code into the creator functions. Add CamelExceptions to creation functions that could fail. * camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use CamelException. * camel-mime-message.c, camel-mime-part.c, camel-multipart.c (write_to_stream): Update. * camel-mime-parser.c: add an exception to the mime parser private data and pass that to stream functions as needed. * gmime-content-field.c, md5-utils.c: Update (badly) for stream changes. * camel-exception.h (camel_exception_is_set): convenience macro. * providers/Makefile.am: disable SMTP for now * providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass CamelException to the functions that now need it. Check the exception after calling camel_stream_flush, and fail if it fails. (mbox_get_message_by_uid): More updates. * providers/pop/camel-pop3-folder.c, providers/pop/camel-pop3-store.c, providers/sendmail/camel-sendmail/transport.c: Update. svn path=/trunk/; revision=2924
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/Makefile.am4
-rw-r--r--camel/providers/mbox/camel-mbox-folder.c46
-rw-r--r--camel/providers/pop3/camel-pop3-folder.c5
-rw-r--r--camel/providers/pop3/camel-pop3-store.c34
-rw-r--r--camel/providers/pop3/camel-pop3-store.h3
-rw-r--r--camel/providers/sendmail/camel-sendmail-transport.c12
6 files changed, 69 insertions, 35 deletions
diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
index 7c520a8b8b..a1af905e6b 100644
--- a/camel/providers/Makefile.am
+++ b/camel/providers/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = mbox pop3 sendmail smtp
+SUBDIRS = mbox pop3 sendmail
# these ones are disabled for the moment.
-# MH maildir imap smtp
+# MH maildir nntp smtp
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c
index 255753b140..5cc4cb3efd 100644
--- a/camel/providers/mbox/camel-mbox-folder.c
+++ b/camel/providers/mbox/camel-mbox-folder.c
@@ -721,11 +721,11 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept
if (stat(mbox_folder->folder_file_path, &st) != 0)
goto fail;
- output_stream = camel_stream_fs_new_with_name (mbox_folder->folder_file_path, O_RDWR, 0600);
+ output_stream = camel_stream_fs_new_with_name (mbox_folder->folder_file_path, O_RDWR, 0600, ex);
if (output_stream == NULL)
goto fail;
- seek = camel_seekable_stream_seek((CamelSeekableStream *)output_stream, st.st_size, SEEK_SET);
+ seek = camel_seekable_stream_seek((CamelSeekableStream *)output_stream, st.st_size, SEEK_SET, ex);
if (seek != st.st_size)
goto fail;
@@ -737,23 +737,21 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept
g_free(xev);
/* we must write this to the non-filtered stream ... */
- if (camel_stream_write_string (output_stream, "From - \n") == -1)
+ if (camel_stream_write_string (output_stream, "From - \n", ex) == -1)
goto fail;
/* and write the content to the filtering stream, that translated '\nFrom' into '\n>From' */
filter_stream = (CamelStream *)camel_stream_filter_new_with_stream(output_stream);
filter_from = (CamelMimeFilter *)camel_mime_filter_from_new();
camel_stream_filter_add((CamelStreamFilter *)filter_stream, filter_from);
- if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), filter_stream) == -1)
- goto fail;
+ camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
+ filter_stream, ex);
+ if (!camel_exception_is_set (ex))
+ camel_stream_flush (filter_stream, ex);
-#warning WE NEED A STREAM CLOSE OR THIS WILL FAIL TO WORK
-#warning WE NEED A STREAM CLOSE OR THIS WILL FAIL TO WORK
-#warning WE NEED A STREAM CLOSE OR THIS WILL FAIL TO WORK
-#warning WE NEED A STREAM CLOSE OR THIS WILL FAIL TO WORK
+ if (camel_exception_is_set (ex))
+ goto fail;
- /* FIXME: stream_close doesn't return anything */
-/* camel_stream_close (filter_stream);*/
gtk_object_unref (GTK_OBJECT (filter_stream));
/* force a summary update - will only update from the new position, if it can */
@@ -761,9 +759,15 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept
return;
fail:
- camel_exception_setv (ex,
- CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION, /* FIXME: what code? */
- "Cannot append to mbox file: %s", strerror (errno));
+ if (camel_exception_is_set (ex)) {
+ camel_exception_setv (ex, camel_exception_get_id (ex),
+ "Cannot append message to mbox file: %s",
+ camel_exception_get_description (ex));
+ } else {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "Cannot append message to mbox file: %s",
+ g_strerror (errno));
+ }
if (filter_stream) {
/*camel_stream_close (filter_stream);*/
gtk_object_unref ((GtkObject *)filter_stream);
@@ -861,7 +865,7 @@ mbox_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *
g_assert(info->frompos != -1);
/* where we read from */
- message_stream = camel_stream_fs_new_with_name (mbox_folder->folder_file_path, O_RDONLY, 0);
+ message_stream = camel_stream_fs_new_with_name (mbox_folder->folder_file_path, O_RDONLY, 0, ex);
if (message_stream == NULL)
goto fail;
@@ -900,9 +904,15 @@ mbox_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *
return message;
fail:
- camel_exception_setv (ex,
- CAMEL_EXCEPTION_FOLDER_INVALID_UID,
- "Cannot get message: %s", strerror(errno));
+ if (camel_exception_is_set (ex)) {
+ camel_exception_setv (ex, camel_exception_get_id (ex),
+ "Cannot get message: %s",
+ camel_exception_get_description (ex));
+ } else {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
+ "Cannot get message: %s",
+ g_strerror(errno));
+ }
if (parser)
gtk_object_unref((GtkObject *)parser);
if (message_stream)
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index bb2c7de6e1..838f247ac6 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -196,12 +196,13 @@ get_message_by_number (CamelFolder *folder, gint number, CamelException *ex)
}
g_free (result);
- body = camel_pop3_command_get_additional_data (CAMEL_POP3_STORE (folder->parent_store));
+ body = camel_pop3_command_get_additional_data (CAMEL_POP3_STORE (folder->parent_store), ex);
if (!body) {
CamelService *service = CAMEL_SERVICE (folder->parent_store);
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
"Could not retrieve message from POP "
- "server %s.", service->url->host);
+ "server %s: %s", service->url->host,
+ camel_exception_get_description (ex));
return NULL;
}
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 9ae87ad420..ddddf9f59f 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -376,14 +376,15 @@ pop3_connect (CamelService *service, CamelException *ex)
CAMEL_STREAM_BUFFER_READ);
/* Read the greeting, note APOP timestamp, if any. */
- buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store->istream));
+ buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store->istream), ex);
if (!buf) {
- camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
- "Could not read greeting from POP "
- "server.");
- return FALSE;
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
+ "Could not read greeting from POP "
+ "server: %s",
+ camel_exception_get_description (ex));
gtk_object_unref (GTK_OBJECT (store->ostream));
gtk_object_unref (GTK_OBJECT (store->istream));
+ return FALSE;
}
apoptime = strchr (buf, '<');
apopend = apoptime ? strchr (apoptime, '>') : NULL;
@@ -512,18 +513,30 @@ camel_pop3_command (CamelPop3Store *store, char **ret, char *fmt, ...)
char *cmdbuf, *respbuf;
va_list ap;
int status;
+ CamelException *ex = camel_exception_new ();
va_start (ap, fmt);
cmdbuf = g_strdup_vprintf (fmt, ap);
va_end (ap);
/* Send the command */
- camel_stream_write (store->ostream, cmdbuf, strlen (cmdbuf));
+ camel_stream_printf (store->ostream, ex, "%s\r\n", cmdbuf);
g_free (cmdbuf);
- camel_stream_write (store->ostream, "\r\n", 2);
+ if (camel_exception_is_set (ex)) {
+ if (*ret)
+ *ret = g_strdup (camel_exception_get_description (ex));
+ camel_exception_free (ex);
+ return CAMEL_POP3_FAIL;
+ }
/* Read the response */
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store->istream));
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store->istream), ex);
+ if (camel_exception_is_set (ex)) {
+ if (*ret)
+ *ret = g_strdup (camel_exception_get_description (ex));
+ camel_exception_free (ex);
+ return CAMEL_POP3_FAIL;
+ }
if (!strncmp (respbuf, "+OK", 3))
status = CAMEL_POP3_OK;
else if (!strncmp (respbuf, "-ERR", 4))
@@ -559,7 +572,8 @@ camel_pop3_command (CamelPop3Store *store, char **ret, char *fmt, ...)
* Return value: the data, which the caller must free.
**/
char *
-camel_pop3_command_get_additional_data (CamelPop3Store *store)
+camel_pop3_command_get_additional_data (CamelPop3Store *store,
+ CamelException *ex)
{
CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store->istream);
GPtrArray *data;
@@ -568,7 +582,7 @@ camel_pop3_command_get_additional_data (CamelPop3Store *store)
data = g_ptr_array_new ();
while (1) {
- buf = camel_stream_buffer_read_line (stream);
+ buf = camel_stream_buffer_read_line (stream, ex);
if (!buf) {
status = CAMEL_POP3_FAIL;
break;
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index a4373a884a..e68f0fd142 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -66,7 +66,8 @@ void camel_pop3_store_close (CamelPop3Store *store, gboolean expunge,
/* support functions */
enum { CAMEL_POP3_OK, CAMEL_POP3_ERR, CAMEL_POP3_FAIL };
int camel_pop3_command (CamelPop3Store *store, char **ret, char *fmt, ...);
-char *camel_pop3_command_get_additional_data (CamelPop3Store *store);
+char *camel_pop3_command_get_additional_data (CamelPop3Store *store,
+ CamelException *ex);
/* Standard Gtk function */
GtkType camel_pop3_store_get_type (void);
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index fad9d9681d..1352d652a7 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -139,9 +139,17 @@ _send_internal (CamelMedium *message, char **argv, CamelException *ex)
/* Parent process. Write the message out. */
close (fd[0]);
out = camel_stream_fs_new_with_fd (fd[1]);
- camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), out);
- camel_stream_flush (out);
+ camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
+ out, ex);
+ if (!camel_exception_is_set (ex))
+ camel_stream_flush (out, ex);
gtk_object_unref (GTK_OBJECT (out));
+ if (camel_exception_is_set (ex)) {
+ camel_exception_setv (ex, camel_exception_get_id (ex),
+ "Could not send message: %s",
+ camel_exception_get_description (ex));
+ return FALSE;
+ }
/* Wait for sendmail to exit. */
while (waitpid (pid, &wstat, 0) == -1 && errno == EINTR)