aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-11-21 10:21:03 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-11-21 10:21:03 +0800
commit2cf986c43b05072cdcacf05aef0c5ddd595c1f18 (patch)
tree8879fea9f0bdf1478ac533408062472a9ef6d78d /camel/providers
parent484334eaec8c6bd0c9118c318ceb3a503b7ac824 (diff)
downloadgsoc2013-evolution-2cf986c43b05072cdcacf05aef0c5ddd595c1f18.tar.gz
gsoc2013-evolution-2cf986c43b05072cdcacf05aef0c5ddd595c1f18.tar.zst
gsoc2013-evolution-2cf986c43b05072cdcacf05aef0c5ddd595c1f18.zip
Fixed to return the correct bytecount in all cases which is the real fix
2000-11-20 Jeffrey Stedfast <fejj@helixcode.com> * camel-remote-store.c (remote_recv_line): Fixed to return the correct bytecount in all cases which is the real fix to imap_parse_nstring. * providers/imap/camel-imap-command.c (imap_read_untagged): Again, don't use strlen for the post-data, use 'n'. * providers/imap/camel-imap-utils.c (imap_parse_nstring): Undo my previous temp-fix. svn path=/trunk/; revision=6621
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/camel-imap-command.c6
-rw-r--r--camel/providers/imap/camel-imap-utils.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index f1be74b4a9..e615453198 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -276,10 +276,10 @@ imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)
*/
length--;
}
-
+
/* Add the length of the post-literal line. */
- fulllen += strlen (line);
-
+ fulllen += n;
+
/* p points to the "{" in the line that starts the literal.
* The length of the CR-less response must be less than or
* equal to the length of the response with CRs, therefore
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 584cd1e754..0b947e07da 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -638,9 +638,6 @@ imap_parse_nstring (char **str_p, int *len)
return NULL;
}
- /* capture up until the end of the line - byte count may be a little off */
- for ( ; *(str + *len) && *(str + *len) != '\n'; (*len)++);
-
out = g_strndup (str, *len);
*str_p = str + *len;
return out;