Changeset 4963:5fc8c7cee1dd for charset.c

Timestamp:

2007-03-06 18:13:14 (21 months ago)

Author:

Alain Bench <veronatif@…>

Branch:

HEAD

Message:

Remove buggy usage of M_ICONV_HOOK_TO flag in mutt_idna.c:mutt_idna_to_local().
Wipe unwanted code depending on M_ICONV_HOOK_TO in charset.c:mutt_iconv_open().
Totally wipe M_ICONV_HOOK_TO symbol.
Remove misusages of M_ICONV_HOOK_FROM flag in:

• crypt-gpgme.c:print_utf8().
• mutt_idna.c:mutt_idna_to_local() and mutt_local_to_idna().
• pgp.c:pgp_traditional_encryptsign().

Document usage policy of M_ICONV_HOOK_FROM flag.
Cosmetic downcasing of some constant charset names (utf-8, euc-jp) for consistency.
Correction of a typo in the "iso8859-5" charset name.

Files:

• charset.c (modified) (6 diffs)

charset.c

@@ -130 +130 @@
   { "ISO_8859-5",       "iso-8859-5"    },
   { "cyrillic",         "iso-8859-5"    },
-  { "csISOLatinCyrillic", "iso8859-5"   },
+  { "csISOLatinCyrillic", "iso-8859-5"  },
 
   { "ISO_8859-9:1989",  "iso-8859-9"    },
@@ -151 +151 @@
   
   { "Extended_UNIX_Code_Packed_Format_for_Japanese",
-                        "EUC-JP"        },
+                        "euc-jp"        },
   { "csEUCPkdFmtJapanese", 
-                        "EUC-JP"        },
+                        "euc-jp"        },
   
   { "csGB2312",         "gb2312"        },
@@ -322 +322 @@
  * charset-hooks, recanonicalises, and finally applies iconv-hooks.
  * Parameter flags=0 skips charset-hooks, while M_ICONV_HOOK_FROM
- * applies them to fromcode.
+ * applies them to fromcode. Callers should use flags=0 when fromcode
+ * can safely be considered true, either some constant, or some value
+ * provided by the user; M_ICONV_HOOK_FROM should be used only when
+ * fromcode is unsure, taken from a possibly wrong incoming MIME label,
+ * or such. Misusing M_ICONV_HOOK_FROM leads to unwanted interactions
+ * in some setups. Note: By design charset-hooks should never be, and
+ * are never, applied to tocode. Highlight note: The top-well-named
+ * M_ICONV_HOOK_FROM acts on charset-hooks, not at all on iconv-hooks.
  */
 
@@ -336 +343 @@
   /* transform to MIME preferred charset names */
   mutt_canonical_charset (tocode1, sizeof (tocode1), tocode);
-
-#ifdef M_ICONV_HOOK_TO
-  /* Not used. */
-  if ((flags & M_ICONV_HOOK_TO) && (tmp = mutt_charset_hook (tocode1)))
-    mutt_canonical_charset (tocode1, sizeof (tocode1), tmp);
-#endif
-
   mutt_canonical_charset (fromcode1, sizeof (fromcode1), fromcode);
 
@@ -439 +439 @@
 /*
  * Convert a string
- * Used in rfc2047.c and rfc2231.c
+ * Used in rfc2047.c, rfc2231.c, crypt-gpgme.c, mutt_idna.c, and more.
+ * Parameter flags is given as-is to mutt_iconv_open(). See there
+ * for its meaning and usage policy.
  */
 
@@ -512 +514 @@
 };
 
+/*
+ * Parameter flags is given as-is to mutt_iconv_open(). See there
+ * for its meaning and usage policy.
+ */
 FGETCONV *fgetconv_open (FILE *file, const char *from, const char *to, int flags)
 {