Changeset 3311:cd3774ecfa9f for compose.c

Timestamp:

2003-03-03 06:01:06 (6 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

IDN support for e-mail messages. Things should work automagically
once you have the GNU IDN library available from
ftp://alpha.gnu.org/pub/gnu/libidn/ installed. For IDN's which
can't be losslessly recoded to your local character set, mutt should
automatically fall back to using the ASCII representation. There's
probably a considerable number of bugs in this, and the code may, at
this point, not even compile on machines without libidn. Will start
working on that ASAP.

Files:

• compose.c (modified) (5 diffs)

compose.c

@@ -19 +19 @@
 #include "mutt.h"
 #include "mutt_curses.h"
+#include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
@@ -364 +365 @@
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), addr);
+  rfc822_write_address (buf, sizeof (buf), addr, 1);
   mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
   mutt_paddstr (W, buf);
@@ -400 +401 @@
 {
   char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */
-
-  rfc822_write_address (buf, sizeof (buf), *addr);
+  char *err = NULL;
+  
+  mutt_addrlist_to_local (*addr);
+  rfc822_write_address (buf, sizeof (buf), *addr, 0);
   if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0)
   {
@@ -415 +418 @@
   }
 
+  if (mutt_addrlist_to_idna (*addr, &err) != 0)
+  {
+    mutt_error (_("Warning: '%s' is a bad IDN."), err);
+    mutt_refresh();
+    FREE (&err);
+  }
+
   /* redraw the expanded list so the user can see the result */
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), *addr);
+  rfc822_write_address (buf, sizeof (buf), *addr, 1);
   move (line, HDR_XOFFSET);
   mutt_paddstr (W, buf);
-
+  
   return 0;
 }
@@ -693 +703 @@
             (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))
         {
+          char *tag = NULL, *err = NULL;
+          mutt_env_to_local (msg->env);
           mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
                              fcc, fcclen);
+          if (mutt_env_to_idna (msg->env, &tag, &err))
+          {
+            mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
+            FREE (&err);
+          }
         }
         else