Changeset 5458:f93dcd689032 for alias.c

Timestamp:

2008-07-21 00:11:40 (4 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Encode lines written to $alias_file in $config_charset if set. Closes #3095

Files:

• alias.c (modified) (2 diffs)

alias.c

@@ -212 +212 @@
 }
 
+static void recode_buf (char *buf, size_t buflen)
+{
+  char *s;
+
+  if (!ConfigCharset || !*ConfigCharset || !Charset)
+    return;
+  s = safe_strdup (buf);
+  if (!s)
+    return;
+  if (mutt_convert_string (&s, Charset, ConfigCharset, 0) == 0)
+    strfcpy (buf, s, buflen);
+  FREE(&s);
+}
+
 void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
 {
@@ -356 +370 @@
     else
       strfcpy (buf, new->name, sizeof (buf));
+    recode_buf (buf, sizeof (buf));
     fprintf (rc, "alias %s ", buf);
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), new->addr, 0);
+    recode_buf (buf, sizeof (buf));
     write_safe_address (rc, buf);
     fputc ('\n', rc);