html2html.c: when converting links, don't add quotes to URL's

[citadel.git] / webcit / html2html.c
diff --git a/webcit/html2html.c b/webcit/html2html.c

index 00a2adcbb9301260c93462cac4515b6ea11dd3b2..ca8804c1aa6d707699863bbf91785d12c9ad984e 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -103,15 +103,20 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
         while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                 line_length = strlen(buf);
                 buffer_length = content_length + line_length + 2;
-               msg = realloc(msg, buffer_length);
-               if (msg == NULL) {
+               ptr = realloc(msg, buffer_length);
+               if (ptr == NULL) {
                         wprintf("<b>");
                         wprintf(_("realloc() error! couldn't get %d bytes: %s"),
                                 buffer_length + 1,
                                 strerror(errno));
                         wprintf("</b><br /><br />\n");
+                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               /** flush */
+                       }
+                       free(msg);
                         return;
                 }
+               msg = ptr;
                 strcpy(&msg[content_length], buf);
                 content_length += line_length;
                 strcpy(&msg[content_length], "\n");
@@ -216,7 +221,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));
@@ -237,15 +242,21 @@ 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 <BODY></BODY> 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;
+       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
@@ -263,7 +274,7 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
                         ++alevel;
                 }
                 /** Make external links open in a separate window */
-               else if (!strncasecmp(ptr, "<a href=", 8)) {
+               else if (!strncasecmp(ptr, "<a href=\"", 9)) {
                         ++alevel;
                         if ( ((strchr(ptr, ':') < strchr(ptr, '/')))
                              &&  ((strchr(ptr, '/') < strchr(ptr, '>'))) 
@@ -276,7 +287,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=");
@@ -284,9 +294,9 @@ void output_html(char *supplied_charset, int treat_as_wiki) {
                                 ptr = &ptr[9];
                         }
                         else {
-                               sprintf(&converted_msg[output_length], "<a href=");
-                               output_length += 8;
-                               ptr = &ptr[8];
+                               sprintf(&converted_msg[output_length], "<a href=\"");
+                               output_length += 9;
+                               ptr = &ptr[9];
                         }
                 }
                 /**
@@ -346,6 +356,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);