From 4fccab6c1968979c691a941f767fa5d6b6f09208 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@helixcode.com>
Date: Thu, 28 Sep 2000 20:20:56 +0000
Subject: When getting a literal string response, don't include the \r\n after
 the

2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>

	* providers/imap/camel-imap-folder.c (imap_get_message): When
	getting a literal string response, don't include the \r\n after
	the closing } (as in: "... {798}\r\n...")

	* providers/imap/camel-imap-stream.c (stream_read): Same.

svn path=/trunk/; revision=5621
---
 camel/providers/imap/camel-imap-folder.c | 6 ++++++
 camel/providers/imap/camel-imap-store.c  | 2 +-
 camel/providers/imap/camel-imap-stream.c | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'camel/providers')

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 96236d2374..63ef5b31d1 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -626,6 +626,9 @@ imap_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 			return NULL;
 		}
 		
+		/* advance to the beginning of the actual data */
+		p++;
+		
 		/* calculate the new part-length */
 		for (q = p; *q && (q - p) <= part_len; q++) {
 			if (*q == '\n')
@@ -681,6 +684,9 @@ imap_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 			return NULL;
 		}
 		
+		/* advance to the beginning of the actual data */
+		p++;
+		
 		/* calculate the new part-length */
 		for (q = p; *q && (q - p) <= part_len; q++) {
 			if (*q == '\n')
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 698b2ed732..d5fc59b33e 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -640,7 +640,7 @@ gint
 camel_imap_command_extended (CamelImapStore *store, CamelFolder *folder, GPtrArray **ret, CamelException *ex, char *fmt, ...)
 {
 	gint status = CAMEL_IMAP_OK;
-	GPtrArray *data;
+	GPtrArray *data = NULL;
 	GArray *expunged;
 	gchar *respbuf, *cmdid;
 	gint recent = 0;
diff --git a/camel/providers/imap/camel-imap-stream.c b/camel/providers/imap/camel-imap-stream.c
index 8c04b75ec9..4e9ee046d7 100644
--- a/camel/providers/imap/camel-imap-stream.c
+++ b/camel/providers/imap/camel-imap-stream.c
@@ -162,6 +162,9 @@ stream_read (CamelStream *stream, char *buffer, size_t n)
 				return -1;
 			}
 			
+			/* advance to the beginning of the actual data */
+			p++;
+			
 			/* calculate the new part-length */
 			for (q = p; *q && (q - p) <= part_len; q++) {
 				if (*q == '\n')
-- 
cgit v1.2.3