aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-05-25 04:14:59 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-05-25 04:14:59 +0800
commitf1e6e913a674ce5deb47611a3d1d2ed3047a644c (patch)
tree53dd77717a25a3a68f28b150b7b7185f7bd26bb2 /camel/providers
parentbe5f3c160c66c42592bbb5e3697231f2ba9a40c3 (diff)
downloadgsoc2013-evolution-f1e6e913a674ce5deb47611a3d1d2ed3047a644c.tar.gz
gsoc2013-evolution-f1e6e913a674ce5deb47611a3d1d2ed3047a644c.tar.zst
gsoc2013-evolution-f1e6e913a674ce5deb47611a3d1d2ed3047a644c.zip
Use the new readline function.
2002-05-24 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-command.c (imap_read_untagged): Use the new readline function. * providers/imap/camel-imap-store.c (connect_to_server): Use the new camel_imap_store_readline() function which doesn't suck quite as bad as the original camel_remote_store_recv_line() function. (camel_imap_store_readline): New function to replace camel_remote_store_recv_line(). This function is at least safe with embedded nul chars. Not that any of our callers use it *sigh*. svn path=/trunk/; revision=17012
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/camel-imap-command.c8
-rw-r--r--camel/providers/imap/camel-imap-store.c42
-rw-r--r--camel/providers/imap/camel-imap-store.h2
3 files changed, 34 insertions, 18 deletions
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index b0df0deefc..4309e18ddd 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -290,7 +290,7 @@ camel_imap_command_response (CamelImapStore *store, char **response,
CamelImapResponseType type;
char *respbuf;
- if (camel_imap_store_recv_line (store, &respbuf, ex) < 0) {
+ if (camel_imap_store_readline (store, &respbuf, ex) < 0) {
CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
return CAMEL_IMAP_RESPONSE_ERROR;
}
@@ -457,10 +457,6 @@ imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)
* against any completely correct server.
* - WU-imapd 12.264 (at least) will cheerily pass
* NULs along if they are embedded in the message
- * - The only cause of embedded NULs we've seen is an
- * Evolution base64-encoder bug that sometimes
- * inserts a NUL into the last line when it
- * shouldn't.
*/
s = d = str->str + 1;
@@ -493,7 +489,7 @@ imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)
g_ptr_array_add (data, str);
/* Read the next line. */
- if (camel_imap_store_recv_line (store, &line, ex) < 0)
+ if (camel_imap_store_readline (store, &line, ex) < 0)
goto lose;
}
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 312f6c2fb6..b97f8c0f1a 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -556,7 +556,7 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls, CamelE
store->command = 0;
/* Read the greeting, if any. FIXME: deal with PREAUTH */
- if (camel_imap_store_recv_line (store, &buf, ex) < 0) {
+ if (camel_imap_store_readline (store, &buf, ex) < 0) {
if (store->istream) {
camel_object_unref (CAMEL_OBJECT (store->istream));
store->istream = NULL;
@@ -2223,11 +2223,13 @@ camel_imap_store_connected (CamelImapStore *store, CamelException *ex)
/* FIXME: please god, when will the hurting stop? Thus function is so
fucking broken it's not even funny. */
-int
-camel_imap_store_recv_line (CamelImapStore *store, char **dest, CamelException *ex)
+ssize_t
+camel_imap_store_readline (CamelImapStore *store, char **dest, CamelException *ex)
{
CamelStreamBuffer *stream;
- char *buf;
+ char linebuf[1024];
+ GByteArray *ba;
+ ssize_t nread;
g_return_val_if_fail (CAMEL_IS_IMAP_STORE (store), -1);
g_return_val_if_fail (dest, -1);
@@ -2244,11 +2246,17 @@ camel_imap_store_recv_line (CamelImapStore *store, char **dest, CamelException *
g_strerror (errno));
return -1;
}
+
stream = CAMEL_STREAM_BUFFER (store->istream);
- buf = camel_stream_buffer_read_line (stream);
+ ba = g_byte_array_new ();
+ while ((nread = camel_stream_buffer_gets (stream, linebuf, sizeof (linebuf))) > 0) {
+ g_byte_array_append (ba, linebuf, nread);
+ if (linebuf[nread - 1] == '\n')
+ break;
+ }
- if (buf == NULL) {
+ if (nread <= 0) {
if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
else
@@ -2260,12 +2268,24 @@ camel_imap_store_recv_line (CamelImapStore *store, char **dest, CamelException *
return -1;
}
- *dest = buf;
-
#if d(!)0
- if (camel_verbose_debug)
- fprintf (stderr, "received: %s\n", *dest);
+ if (camel_verbose_debug) {
+ fprintf (stderr, "received: ");
+ fwrite (*dest, 1, nread, stderr);
+ }
#endif
- return strlen (*dest);
+ /* camel-imap-command.c:imap_read_untagged expects the CRLFs
+ to be stripped off and be nul-terminated *sigh* */
+ nread = ba->len - 1;
+ ba->data[nread] = '\0';
+ if (ba->data[nread - 1] == '\r') {
+ ba->data[nread - 1] = '\0';
+ nread--;
+ }
+
+ *dest = ba->data;
+ g_byte_array_free (ba, FALSE);
+
+ return nread;
}
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index 36e6e3c032..9ebbc31ad7 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -131,7 +131,7 @@ CamelType camel_imap_store_get_type (void);
gboolean camel_imap_store_connected (CamelImapStore *store, CamelException *ex);
-int camel_imap_store_recv_line (CamelImapStore *store, char **dest, CamelException *ex);
+ssize_t camel_imap_store_readline (CamelImapStore *store, char **dest, CamelException *ex);
#ifdef __cplusplus
}