Changeset 835:6f4b052f193a for compose.c

Timestamp:

1999-02-03 14:14:08 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

[unstable] Produce some reasonable character set support when
postponing messages.

Additionally, this patch fixes a nasty pointer leak in
load_charset() [noted with electric fence], and a completely
mis-lead attempt to use bsearch(). Apparently, nobody ever tested
the utf8 decoder for quite some time.

Files:

• compose.c (modified) (4 diffs)

compose.c

@@ -391 +391 @@
   char buff[SHORT_STRING];
 
-  if (b->type != TYPETEXT)
+  if (!mutt_is_text_type (b->type, b->subtype))
   {
     mutt_error _("Can't change character set for non-text attachments!");
@@ -404 +404 @@
   if (mutt_is_utf8(buff))
   {
-    mutt_error (_("UTF-8 encoding attachments has not yet been implemented."));
-    return 0;
-  }
-  
-  if (mutt_get_charset (buff) == NULL)
+    if (!b->noconv)
+    {
+      mutt_error (_("UTF-8 encoding attachments has not yet been implemented."));
+      return 0;
+    }
+  }
+  else if (mutt_get_charset (buff) == NULL)
   {
     mutt_error (_("Character set %s is unknown."), buff);
@@ -762 +764 @@
         break;
 
-      case OP_COMPOSE_NORECODE:
+#define CURRENT idx[menu->current]->content
+      
+      case OP_COMPOSE_TOGGLE_RECODE:
+      {      
         CHECK_COUNT;
-        if (idx[menu->current]->content->type != TYPETEXT)
+        if (!mutt_is_text_type (CURRENT->type, CURRENT->subtype))
         {
-          mutt_error (_("Recoding only affects text/plain attachments."));
+          mutt_error (_("Recoding only affects text attachments."));
           break;
         }
-        idx[menu->current]->content->noconv = !idx[menu->current]->content->noconv;
-        if (idx[menu->current]->content->noconv)
+        if (mutt_is_utf8 (mutt_get_parameter ("charset", CURRENT->parameter)))
+        {
+          mutt_error (_("We currently can't encode to utf-8."));
+          break;
+        }
+        CURRENT->noconv = !CURRENT->noconv;
+        if (CURRENT->noconv)
           mutt_message (_("The current attachment won't be converted."));
         else
@@ -776 +786 @@
         menu->redraw = REDRAW_CURRENT;
         break;
-      
+      }
+
+      case OP_COMPOSE_RECODE:
+      {
+        const char *chs;
+        int rv;
+
+        CHECK_COUNT;
+        if (!mutt_is_text_type (CURRENT->type, CURRENT->subtype))
+        {
+          mutt_error (_("Recoding only affetcs text attachments."));
+          break;
+        }
+
+        if (!(chs = mutt_get_parameter ("charset", CURRENT->parameter)))
+          chs = SendCharset;
+
+        if (CURRENT->noconv)
+          rv = mutt_recode_file (CURRENT->filename, chs, Charset);
+        else
+          rv = mutt_recode_file (CURRENT->filename, Charset, chs);
+
+        mutt_update_encoding (CURRENT);
+        
+        if (rv == 0)
+        {
+          mutt_message (_("Recoding successful."));
+          CURRENT->noconv = !CURRENT->noconv;
+        }
+
+        menu->redraw = REDRAW_CURRENT;
+        break;
+      }
+#undef CURRENT
+
       case OP_COMPOSE_EDIT_DESCRIPTION:
         CHECK_COUNT;