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

1 files changed, 20 insertions, 6 deletions

diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index ef4434e97a..3db6adfe83 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -41,6 +41,7 @@
 #include "camel-mime-filter.h"
 #include "camel-stream.h"
 #include "camel-seekable-stream.h"
+#include "camel-exception.h"
 
 #define r(x)
 #define h(x)
@@ -208,6 +209,7 @@ struct _header_scan_state {
 
 	int fd;			/* input for a fd input */
 	CamelStream *stream;	/* or for a stream */
+	CamelException *ex;	/* exception for the stream */
 
 	/* for scanning input buffers */
 	char *realbuf;		/* the real buffer, SCAN_HEAD*2 + SCAN_BUF bytes */
@@ -824,7 +826,8 @@ folder_read(struct _header_scan_state *s)
 		memcpy(s->inbuf, s->inptr, inoffset);
 	}
 	if (s->stream) {
-		len = camel_stream_read(s->stream, s->inbuf+inoffset, SCAN_BUF-inoffset);
+		len = camel_stream_read(s->stream, s->inbuf+inoffset,
+					SCAN_BUF-inoffset, s->ex);
 	} else {
 		len = read(s->fd, s->inbuf+inoffset, SCAN_BUF-inoffset);
 	}
@@ -869,7 +872,7 @@ folder_seek(struct _header_scan_state *s, off_t offset, int whence)
 		if (CAMEL_IS_SEEKABLE_STREAM(s->stream)) {
 			/* NOTE: assumes whence seekable stream == whence libc, which is probably
 			   the case (or bloody well should've been) */
-			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s->stream, offset, whence);
+			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s->stream, offset, whence, s->ex);
 		} else {
 			newoffset = -1;
 			errno = EINVAL;
@@ -886,7 +889,7 @@ folder_seek(struct _header_scan_state *s, off_t offset, int whence)
 		s->inptr = s->inbuf;
 		s->inend = s->inbuf;
 		if (s->stream)
-			len = camel_stream_read(s->stream, s->inbuf, SCAN_BUF);
+			len = camel_stream_read(s->stream, s->inbuf, SCAN_BUF, s->ex);
 		else
 			len = read(s->fd, s->inbuf, SCAN_BUF);
 		if (len>=0) {
@@ -1353,8 +1356,10 @@ folder_scan_close(struct _header_scan_state *s)
 		folder_pull_part(s);
 	if (s->fd != -1)
 		close(s->fd);
-	if (s->stream)
+	if (s->stream) {
 		gtk_object_unref((GtkObject *)s->stream);
+		camel_exception_free(s->ex);
+	}
 	g_free(s);
 }
 
@@ -1368,6 +1373,7 @@ folder_scan_init(void)
 
 	s->fd = -1;
 	s->stream = NULL;
+	s->ex = NULL;
 
 	s->outbuf = g_malloc(1024);
 	s->outptr = s->outbuf;
@@ -1415,6 +1421,8 @@ folder_scan_init_with_fd(struct _header_scan_state *s, int fd)
 		if (s->stream) {
 			gtk_object_unref((GtkObject *)s->stream);
 			s->stream = NULL;
+			camel_exception_free(s->ex);
+			s->ex = NULL;
 		}
 		return 0;
 	} else {
@@ -1426,9 +1434,11 @@ static int
 folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
 {
 	int len;
+	CamelException *ex;
 
-	len = camel_stream_read(stream, s->inbuf, SCAN_BUF);
-	if (len>=0) {
+	ex = camel_exception_new();
+	len = camel_stream_read(stream, s->inbuf, SCAN_BUF, ex);
+	if (!camel_exception_is_set (ex)) {
 		s->inend = s->inbuf+len;
 		s->inptr = s->inbuf;
 		s->inend[0] = '\n';
@@ -1436,12 +1446,16 @@ folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
 			gtk_object_unref((GtkObject *)s->stream);
 		s->stream = stream;
 		gtk_object_ref((GtkObject *)stream);
+		if (s->ex)
+			camel_exception_free(s->ex);
+		s->ex = ex;
 		if (s->fd != -1) {
 			close(s->fd);
 			s->fd = -1;
 		}
 		return 0;
 	} else {
+		camel_exception_free (ex);
 		return -1;
 	}
 }