Changeset 5458:f93dcd689032

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:

• ChangeLog (modified) (1 diff)
• alias.c (modified) (2 diffs)
• init.h (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2008-07-10 09:38 -0400  Aron Griffis  <agriffis@n01se.net>  (7729b1ad530c)
+
+        * copy.c, protos.h, sendlib.c: Unify mutt_write_references
+
+        copy.c and sendlib.c have independent and different implementations
+        of writing references to a file. Choose the one in sendlib since
+        it's conservative with mallocs and supports trimming the list.
+
+        Signed-off-by: Aron Griffis <agriffis@n01se.net>
+
+2008-07-10 09:38 -0400  Aron Griffis  <agriffis@n01se.net>  (651ffe277dfd)
+
+        * copy.c: Clean up error handling in mutt_copy_header
+
+        mutt_copy_header unnecessarily tests the result of each fputc/fputs
+        (well, most of them anyway, it's not consistent). This obfuscates
+        the code and hides bugs. Remove these extraneous checks since
+        ferror/feof are checked at the bottom of the function, and get rid
+        of all the early returns.
+
+        Signed-off-by: Aron Griffis <agriffis@n01se.net>
+
+2008-07-17 19:48 +0200  Rocco Rutte  <pdmef@gmx.net>  (f135d64e0082)
+
+        * ChangeLog, query.c: Cleanup unused vars changeset ba0d96408425
+        didn't remove
+
 2008-07-11 11:34 +0200  Rocco Rutte  <pdmef@gmx.net>  (cc67b008038c)
 

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);

init.h

@@ -104 +104 @@
   ** .pp
   ** The default file in which to save aliases created by the 
-  ** ``$create-alias'' function.
+  ** ``$create-alias'' function. Entries added to this file are
+  ** encoded in the charsacter set specified by $$config_charset if it
+  ** is set or the current character set otherwise.
   ** .pp
   ** \fBNote:\fP Mutt will not automatically source this file; you must
@@ -373 +375 @@
   ** .pp
   ** When defined, Mutt will recode commands in rc files from this
-  ** encoding.
+  ** encoding to the current charsacter set and aliases written to
+  ** $$alias_file from the current character set.
   */
   { "confirmappend",    DT_BOOL, R_NONE, OPTCONFIRMAPPEND, 1 },