* citadel_ipc.c: when performing a MSG4 command, don't return the

  charset as part of the content-type string.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b092ba99c47e253263fe5105e31de74da3d4e3c2..f1791ce39baeda90cc796c69513d46245f5eff47 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 653.8  2005/07/25 17:37:36  ajc
+* citadel_ipc.c: when performing a MSG4 command, don't return the
+  charset as part of the content-type string.
+
 Revision 653.7  2005/07/21 17:20:55  ajc
 * <.R>ead <U>ser-list now takes advantage of the server-side string match
   if available.  It still filters on the client side as well, in case the
@@ -6946,3 +6950,4 @@ 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/citadel_ipc.c b/citadel/citadel_ipc.c
index 62b7d92dd5ba99a0b94a049810e1d827e718ef25..a9114889e1b972ff4036e971ee3427b59ce7d608 100644 (file)
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -579,6 +579,15 @@ int CtdlIPCGetSingleMessage(CtdlIPC *ipc, long msgnum, int headers, int as_mime,
                                                strcpy(mret[0]->content_type,
                                                        &mret[0]->content_type[14]);
                                                striplt(mret[0]->content_type);
+
+                                               /* strip out ";charset=" portion.  FIXME do something with
+                                                * the charset (like... convert it) instead of just throwing
+                                                * it away
+                                                */
+                                               if (strstr(mret[0]->content_type, ";") != NULL) {
+                                                       strcpy(strstr(mret[0]->content_type, ";"), "");
+                                               }
+
                                        }
                                        remove_token(bbb, 0, '\n');
                                } while ((bbb[0] != 0) && (bbb[0] != '\n'));