From 65ec43cb553420890c8d14b6c76ce2606674d893 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 8 May 2000 22:27:59 +0000 Subject: 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 --- camel/providers/pop3/camel-pop3-store.c | 34 +++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'camel/providers/pop3/camel-pop3-store.c') 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; -- cgit v1.2.3