Created ctdl_iconv_open() wrapper around iconv_open()

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 2999881e86bd3cf54b96001ef32eef0fe0325b3b..ec3e13ff9580a051e0a54e8150a9faa68a3ad9de 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -28,6 +28,32 @@ struct addrbookent {
 
 
 #ifdef HAVE_ICONV
+
+/**
+ * \brief      Wrapper around iconv_open()
+ *             Our version adds aliases for non-standard Microsoft charsets
+ *              such as 'MS950', aliasing them to names like 'CP950'
+ *
+ * \param      tocode          Target encoding
+ * \param      fromcode        Source encoding
+ */
+iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
+{
+       iconv_t ic = (iconv_t)(-1) ;
+       ic = iconv_open(tocode, fromcode);
+       if (ic == (iconv_t)(-1) ) {
+               char alias_fromcode[64];
+               if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) {
+                       safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode);
+                       alias_fromcode[0] = 'C';
+                       alias_fromcode[1] = 'P';
+                       ic = iconv_open(tocode, alias_fromcode);
+               }
+       }
+       return(ic);
+}
+
+
 /**
  * \brief  Handle subjects with RFC2047 encoding
  *  such as:
@@ -73,7 +99,7 @@ void utf8ify_rfc822_string(char *buf) {
                        ibuflen = strlen(istr);
                }
 
-               ic = iconv_open("UTF-8", charset);
+               ic = ctdl_iconv_open("UTF-8", charset);
                if (ic != (iconv_t)(-1) ) {
                        obuf = malloc(1024);
                        obuflen = 1024;
@@ -660,7 +686,9 @@ void read_message(long msgnum, int printable_view, char *section) {
                        }
                        safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
                                (sizeof reply_all - strlen(reply_all)) );
+#ifdef HAVE_ICONV
                        utf8ify_rfc822_string(&buf[5]);
+#endif
                        escputs(&buf[5]);
                        wprintf(" ");
                }
@@ -895,7 +923,7 @@ void read_message(long msgnum, int printable_view, char *section) {
           && (strcasecmp(mime_charset, "UTF-8"))
           && (strcasecmp(mime_charset, ""))
        ) {
-               ic = iconv_open("UTF-8", mime_charset);
+               ic = ctdl_iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
                        lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
                                __FILE__, __LINE__, mime_charset, strerror(errno));
@@ -1291,7 +1319,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
           && (strcasecmp(mime_charset, "UTF-8"))
           && (strcasecmp(mime_charset, ""))
        ) {
-               ic = iconv_open("UTF-8", mime_charset);
+               ic = ctdl_iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
                        lprintf(5, "%s:%d iconv_open() failed: %s\n",
                                __FILE__, __LINE__, strerror(errno));
@@ -2050,7 +2078,8 @@ void readloop(char *oper)
 
        is_singlecard = atoi(bstr("is_singlecard"));
 
-       if (WC->wc_view == VIEW_CALENDAR) {             /**< calendar */
+       if ((WC->wc_view == VIEW_CALENDAR) ||
+               (WC->wc_view == VIEW_CALBRIEF)){                /**< calendar */
                is_calendar = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
@@ -2653,7 +2682,8 @@ void display_enter(void)
         * Are we perhaps in a calendar view?  If so, then an "enter
         * message" command really means "add new calendar item."
         */
-       if (WC->wc_view == VIEW_CALENDAR) {
+       if ((WC->wc_view == VIEW_CALENDAR) ||
+               (WC->wc_view == VIEW_CALBRIEF)){
                display_edit_event();
                return;
        }