Changeset 5480:3e850c6e43fd

Timestamp:

2008-08-19 00:39:44 (5 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Make text/enriched handler multibyte aware. Closes #3033.

Files:

• handler.c (modified) (25 diffs)
• mutt.h (modified) (1 diff)

handler.c

@@ -450 +450 @@
 struct enriched_state
 {
-  char *buffer;
-  char *line;
-  char *param;
+  wchar_t *buffer;
+  wchar_t *line;
+  wchar_t *param;
   size_t buff_len;
   size_t line_len;
@@ -467 +467 @@
 };
 
+static int enriched_cmp (const char *a, const wchar_t *b)
+{
+  register const char *p = a;
+  register const wchar_t *q = b;
+  int i;
+
+  if (!a && !b)
+    return 0;
+  if (!a && b)
+    return -1;
+  if (a && !b)
+    return 1;
+
+  for ( ; *p || *q; p++, q++)
+  {
+    if ((i = ascii_tolower (*p)) - ascii_tolower (((char) *q) & 0x7f))
+      return i;
+  }
+  return 0;
+}
+
 static void enriched_wrap (struct enriched_state *stte)
 {
@@ -479 +500 @@
       size_t y = stte->line_used - 1;
 
-      while (y && ISSPACE (stte->line[y]))
-      {
-        stte->line[y] = '\0';
+      while (y && iswspace (stte->line[y]))
+      {
+        stte->line[y] = (wchar_t) '\0';
         y--;
         stte->line_used--;
@@ -491 +512 @@
         y = 0;
 
-        while (stte->line[y] && ISSPACE (stte->line[y]))
+        while (stte->line[y] && iswspace (stte->line[y]))
           y++;
         if (y)
@@ -531 +552 @@
       }
     }
-    state_puts (stte->line, stte->s);
+    state_putws ((const wchar_t*) stte->line, stte->s);
   }
 
   state_putc ('\n', stte->s);
-  stte->line[0] = '\0';
+  stte->line[0] = (wchar_t) '\0';
   stte->line_len = 0;
   stte->line_used = 0;
@@ -586 +607 @@
   if (stte->buff_used)
   {
-    stte->buffer[stte->buff_used] = '\0';
+    stte->buffer[stte->buff_used] = (wchar_t) '\0';
     stte->line_used += stte->buff_used;
     if (stte->line_used > stte->line_max)
     {
       stte->line_max = stte->line_used;
-      safe_realloc (&stte->line, stte->line_max + 1);
-    }
-    strcat (stte->line, stte->buffer);  /* __STRCAT_CHECKED__ */
+      safe_realloc (&stte->line, (stte->line_max + 1) * sizeof (wchar_t));
+    }
+    wcscat (stte->line, stte->buffer);
     stte->line_len += stte->word_len;
     stte->word_len = 0;
@@ -603 +624 @@
 
 
-static void enriched_putc (int c, struct enriched_state *stte)
+static void enriched_putwc (wchar_t c, struct enriched_state *stte)
 {
   if (stte->tag_level[RICH_PARAM]) 
@@ -610 +631 @@
     {
       if (stte->param_used + 1 >= stte->param_len)
-        safe_realloc (&stte->param, (stte->param_len += STRING));
+        safe_realloc (&stte->param, (stte->param_len += STRING) * sizeof (wchar_t));
 
       stte->param[stte->param_used++] = c;
@@ -621 +642 @@
   {
     stte->buff_len += LONG_STRING;
-    safe_realloc (&stte->buffer, stte->buff_len + 1);
-  }
-
-  if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0' )
-  {
-    if (c == '\t')
+    safe_realloc (&stte->buffer, (stte->buff_len + 1) * sizeof (wchar_t));
+  }
+
+  if ((!stte->tag_level[RICH_NOFILL] && iswspace (c)) || c == (wchar_t) '\0')
+  {
+    if (c == (wchar_t) '\t')
       stte->word_len += 8 - (stte->line_len + stte->word_len) % 8;
     else
@@ -641 +662 @@
       {
         stte->buffer[stte->buff_used++] = c;
-        stte->buffer[stte->buff_used++] = '\010';
+        stte->buffer[stte->buff_used++] = (wchar_t) '\010';
         stte->buffer[stte->buff_used++] = c;
       }
@@ -648 +669 @@
 
         stte->buffer[stte->buff_used++] = '_';
-        stte->buffer[stte->buff_used++] = '\010';
+        stte->buffer[stte->buff_used++] = (wchar_t) '\010';
         stte->buffer[stte->buff_used++] = c;
       }
@@ -654 +675 @@
       {
         stte->buffer[stte->buff_used++] = c;
-        stte->buffer[stte->buff_used++] = '\010';
+        stte->buffer[stte->buff_used++] = (wchar_t) '\010';
         stte->buffer[stte->buff_used++] = '_';
       }
@@ -670 +691 @@
 }
 
-static void enriched_puts (char *s, struct enriched_state *stte)
-{
-  char *c;
-
-  if (stte->buff_len < stte->buff_used + mutt_strlen(s))
+static void enriched_puts (const char *s, struct enriched_state *stte)
+{
+  const char *c;
+
+  if (stte->buff_len < stte->buff_used + mutt_strlen (s))
   {
     stte->buff_len += LONG_STRING;
-    safe_realloc (&stte->buffer, stte->buff_len + 1);
+    safe_realloc (&stte->buffer, (stte->buff_len + 1) * sizeof (wchar_t));
   }
   c = s;
   while (*c)
   {
-    stte->buffer[stte->buff_used++] = *c;
+    stte->buffer[stte->buff_used++] = (wchar_t) *c;
     c++;
   }
 }
 
-static void enriched_set_flags (const char *tag, struct enriched_state *stte)
-{
-  const char *tagptr = tag;
+static void enriched_set_flags (const wchar_t *tag, struct enriched_state *stte)
+{
+  const wchar_t *tagptr = tag;
   int i, j;
 
-  if (*tagptr == '/')
+  if (*tagptr == (wchar_t) '/')
     tagptr++;
   
   for (i = 0, j = -1; EnrichedTags[i].tag_name; i++)
-    if (ascii_strcasecmp (EnrichedTags[i].tag_name,tagptr) == 0)
+    if (enriched_cmp (EnrichedTags[i].tag_name, tagptr) == 0)
     {
       j = EnrichedTags[i].index;
@@ -707 +728 @@
       enriched_flush (stte, 1);
 
-    if (*tag == '/')
+    if (*tag == (wchar_t) '/')
     {
       if (stte->tag_level[j]) /* make sure not to go negative */
@@ -713 +734 @@
       if ((stte->s->flags & M_DISPLAY) && j == RICH_PARAM && stte->tag_level[RICH_COLOR])
       {
-        stte->param[stte->param_used] = '\0';
-        if (!ascii_strcasecmp(stte->param, "black"))
+        stte->param[stte->param_used] = (wchar_t) '\0';
+        if (!enriched_cmp("black", stte->param))
         {
           enriched_puts("\033[30m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "red"))
+        else if (!enriched_cmp("red", stte->param))
         {
           enriched_puts("\033[31m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "green"))
+        else if (!enriched_cmp("green", stte->param))
         {
           enriched_puts("\033[32m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "yellow"))
+        else if (!enriched_cmp("yellow", stte->param))
         {
           enriched_puts("\033[33m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "blue"))
+        else if (!enriched_cmp("blue", stte->param))
         {
           enriched_puts("\033[34m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "magenta"))
+        else if (!enriched_cmp("magenta", stte->param))
         {
           enriched_puts("\033[35m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "cyan"))
+        else if (!enriched_cmp("cyan", stte->param))
         {
           enriched_puts("\033[36m", stte);
         }
-        else if (!ascii_strcasecmp(stte->param, "white"))
+        else if (!enriched_cmp("white", stte->param))
         {
           enriched_puts("\033[37m", stte);
@@ -756 +777 @@
       {
         stte->param_used = 0;
-        stte->param[0] = '\0';
+        stte->param[0] = (wchar_t) '\0';
       }
     }
@@ -775 +796 @@
   long bytes = a->length;
   struct enriched_state stte;
-  int c = 0;
+  wchar_t wc = 0;
   int tag_len = 0;
-  char tag[LONG_STRING + 1];
+  wchar_t tag[LONG_STRING + 1];
 
   memset (&stte, 0, sizeof (stte));
@@ -783 +804 @@
   stte.WrapMargin = ((s->flags & M_DISPLAY) ? (COLS-4) : ((COLS-4)<72)?(COLS-4):72);
   stte.line_max = stte.WrapMargin * 4;
-  stte.line = (char *) safe_calloc (1, stte.line_max + 1);
-  stte.param = (char *) safe_calloc (1, STRING);
+  stte.line = (wchar_t *) safe_calloc (1, (stte.line_max + 1) * sizeof (wchar_t));
+  stte.param = (wchar_t *) safe_calloc (1, (STRING) * sizeof (wchar_t));
 
   stte.param_len = STRING;
@@ -799 +820 @@
     if (state != ST_EOF)
     {
-      if (!bytes || (c = fgetc (s->fpin)) == EOF)
+      if (!bytes || (wc = fgetwc (s->fpin)) == EOF)
         state = ST_EOF;
       else
@@ -808 +829 @@
     {
       case TEXT :
-        switch (c)
+        switch (wc)
         {
           case '<' :
@@ -821 +842 @@
             else 
             {
-              enriched_putc (' ', &stte);
+              enriched_putwc ((wchar_t) ' ', &stte);
               state = NEWLINE;
             }
@@ -827 +848 @@
 
           default:
-            enriched_putc (c, &stte);
+            enriched_putwc (wc, &stte);
         }
         break;
 
       case LANGLE :
-        if (c == '<')
-        {
-          enriched_putc (c, &stte);
+        if (wc == (wchar_t) '<')
+        {
+          enriched_putwc (wc, &stte);
           state = TEXT;
           break;
@@ -845 +866 @@
         /* Yes, fall through (it wasn't a <<, so this char is first in TAG) */
       case TAG :
-        if (c == '>')
-        {
-          tag[tag_len] = '\0';
+        if (wc == (wchar_t) '>')
+        {
+          tag[tag_len] = (wchar_t) '\0';
           enriched_set_flags (tag, &stte);
           state = TEXT;
         }
         else if (tag_len < LONG_STRING)  /* ignore overly long tags */
-          tag[tag_len++] = c;
+          tag[tag_len++] = wc;
         else
           state = BOGUS_TAG;
@@ -858 +879 @@
 
       case BOGUS_TAG :
-        if (c == '>')
+        if (wc == (wchar_t) '>')
           state = TEXT;
         break;
 
       case NEWLINE :
-        if (c == '\n')
+        if (wc == (wchar_t) '\n')
           enriched_flush (&stte, 1);
         else
         {
-          ungetc (c, s->fpin);
+          ungetwc (wc, s->fpin);
           bytes++;
           state = TEXT;
@@ -874 +895 @@
 
       case ST_EOF :
-        enriched_putc ('\0', &stte);
+        enriched_putwc ((wchar_t) '\0', &stte);
         enriched_flush (&stte, 1);
         state = DONE;

mutt.h

@@ -918 +918 @@
 #define state_puts(x,y) fputs(x,(y)->fpout)
 #define state_putc(x,y) fputc(x,(y)->fpout)
+#define state_putws(x,y) fputws(x,(y)->fpout)
+#define state_putwc(x,y) fputwc(x,(y)->fpout)
 
 void state_mark_attach (STATE *);