* Bumped internal version number to 6.31. Minimum Citadel server required

[citadel.git] / webcit / html2html.c

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 6eb490a602faf891c2a2fbb1fa5584da65157768..f41ac542a69977a5b479c5bb3f73902998c44171 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -6,32 +6,16 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
 
 
 /*
+ * Sanitize and enhance an HTML message for display.
+ * Also convert weird character sets to UTF-8 if necessary.
  */
-void output_html(void) {
+void output_html(char *charset) {
        char buf[SIZ];
        char *msg;
        char *ptr;
@@ -47,19 +31,28 @@ void output_html(void) {
        int alevel = 0;
        int i;
        int linklen;
+#ifdef HAVE_ICONV
+       iconv_t ic = (iconv_t)(-1) ;
+       char *ibuf;                   /* Buffer of characters to be converted */
+       char *obuf;                   /* Buffer for converted characters      */
+       size_t ibuflen;               /* Length of input buffer               */
+       size_t obuflen;               /* Length of output buffer              */
+       char *osav;                   /* Saved pointer to output buffer       */
+#endif
 
        msg = strdup("");
        sprintf(new_window, "<A TARGET=\"%s\" HREF=", TARGET);
 
-       while (serv_gets(buf), strcmp(buf, "000")) {
+       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) {
-                       wprintf("<B>realloc() error!  "
-                               "couldn't get %d bytes: %s</B><BR><BR>\n",
+                       wprintf("<B>");
+                       wprintf(_("realloc() error! couldn't get %d bytes: %s"),
                                buffer_length + 1,
                                strerror(errno));
+                       wprintf("</B><br /><br />\n");
                        return;
                }
                strcpy(&msg[content_length], buf);
@@ -68,6 +61,32 @@ void output_html(void) {
                content_length += 1;
        }
 
+#ifdef HAVE_ICONV
+       if ( (strcasecmp(charset, "us-ascii"))
+          && (strcasecmp(charset, "UTF-8"))
+          && (strcasecmp(charset, ""))
+       ) {
+               ic = iconv_open("UTF-8", charset);
+               if (ic == (iconv_t)(-1) ) {
+                       lprintf(5, "%s:%d iconv_open() failed: %s\n",
+                               __FILE__, __LINE__, strerror(errno));
+               }
+       }
+       if (ic != (iconv_t)(-1) ) {
+               ibuf = msg;
+               ibuflen = content_length;
+               obuflen = content_length + (content_length / 2) ;
+               obuf = (char *) malloc(obuflen);
+               osav = obuf;
+               iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+               content_length = content_length + (content_length / 2) - obuflen;
+               osav[content_length] = 0;
+               free(msg);
+               msg = osav;
+               iconv_close(ic);
+       }
+#endif
+
        ptr = msg;
        msgstart = msg;
        msgend = &msg[content_length];
@@ -196,7 +215,7 @@ void output_html(void) {
        client_write(converted_msg, output_length);
 
        /* A little trailing vertical whitespace... */
-       wprintf("<BR><BR>\n");
+       wprintf("<br /><br />\n");
 
        /* Now give back the memory */
        free(converted_msg);