* imap_fetch.c: removed a spurious ')' character from the output

  of the 'charset' field.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ec4d50dce0c1f0a5279dd38767b14c26979c2973..5ea61877a462c6dae4b8772852a4d629dc2b988e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 653.17  2005/08/04 04:22:09  ajc
+* imap_fetch.c: removed a spurious ')' character from the output
+  of the 'charset' field.
+
 Revision 653.16  2005/08/02 03:40:15  ajc
 * Removed instances of hard-coded CTDLDIR; this breaks -h
 
@@ -6977,4 +6981,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 606453293f7cb7c9114b9b9a59cc7863b8f03cd8..1ec73351f5600deeec41ef798db329c89e933570 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -768,7 +768,6 @@ void imap_fetch_bodystructure_part(
        else {
                cprintf("(\"CHARSET\" ");
                imap_strout(cbcharset);
-               cprintf(")");
        }
 
        if (name != NULL) if (strlen(name)>0) {

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 32d2bd1c978c7adc6d2d3fc995602881b356053a..0a1711ed89b3274327eb0305c7c9b0a2f03187bd 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -503,7 +503,9 @@ void the_mime_parser(char *partnum,
                else {
                        name = content_type_name;
                }
-               
+       
+               lprintf(CTDL_DEBUG, "mime_decode part=%s, len=%d, type=%s, charset=%s, encoding=%s\n",
+                       partnum, length, content_type, charset, encoding);
                mime_decode(partnum,
                            part_start, length,
                            content_type, charset, encoding, disposition,