From: Art Cancro Date: Sat, 4 Feb 2006 17:50:05 +0000 (+0000) Subject: Reorganized portions of html2html.c X-Git-Tag: v7.86~4234 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6224ced976b170ebbf764f01e36f5e0841a6bc18 Reorganized portions of html2html.c --- diff --git a/webcit/html2html.c b/webcit/html2html.c index 00a2adcbb..31531f3a0 100644 --- a/webcit/html2html.c +++ b/webcit/html2html.c @@ -237,14 +237,18 @@ void output_html(char *supplied_charset, int treat_as_wiki) { } #endif - /** FIXME At this point, shigerugo's messages are still clean. - * Figure out what is mangling them below. + /** + * At this point, the message has been stripped down to + * only the content inside the tags, and has + * been converted to UTF-8 if it was originally in a foreign + * character set. The text is also guaranteed to be null + * terminated now. */ /** Now go through the message, parsing tags as necessary. */ converted_msg = malloc(content_length); strcpy(converted_msg, ""); - ptr = msgstart; + ptr = msg; while (ptr < msgend) { /** * Change mailto: links to WebCit mail, by replacing the @@ -346,6 +350,10 @@ void output_html(char *supplied_charset, int treat_as_wiki) { } } + /** uncomment these two lines to override conversion */ + /** memcpy(converted_msg, msg, content_length); */ + /** output_length = content_length; */ + /** Output our big pile of markup */ client_write(converted_msg, output_length);