Created ctdl_iconv_open() wrapper around iconv_open()

[citadel.git] / webcit / html2html.c

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 31531f3a01c1b0767ea13c1ec24178c38ecb04d9..05bc77a935f1ae189f98f7a1cce0037a6755bf14 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -216,7 +216,7 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
           && (strcasecmp(charset, ""))
        ) {
                lprintf(9, "Converting %s to UTF-8\n", charset);
-               ic = iconv_open("UTF-8", charset);
+               ic = ctdl_iconv_open("UTF-8", charset);
                if (ic == (iconv_t)(-1) ) {
                        lprintf(5, "%s:%d iconv_open() failed: %s\n",
                                __FILE__, __LINE__, strerror(errno));
@@ -249,7 +249,9 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
        converted_msg = malloc(content_length);
        strcpy(converted_msg, "");
        ptr = msg;
+       msgend = strchr(msg, 0);
        while (ptr < msgend) {
+
                /**
                 * Change mailto: links to WebCit mail, by replacing the
                 * link with one that points back to our mail room.  Due to
@@ -280,7 +282,6 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
                                ptr = &ptr[8];
                        }
                        else if ( (treat_as_wiki) && (strncasecmp(ptr, "<a href=\"wiki?", 14)) ) {
-                               lprintf(9, "converting wiki link\n");
                                content_length += 64;
                                converted_msg = realloc(converted_msg, content_length);
                                sprintf(&converted_msg[output_length], "<a href=\"wiki?page=");