Reworked output handling.

[nmh] / sbr / check_charset.c

diff --git a/sbr/check_charset.c b/sbr/check_charset.c
index e16f3603aca71953308f000bcc58fe6e303619e2..cc93273fec1f78394f1ffffa4f7f79ea4476146c 100644 (file)
--- a/sbr/check_charset.c
+++ b/sbr/check_charset.c
@@ -2,11 +2,29 @@
 /*
  * check_charset.c -- routines for character sets
  *
 /*
  * check_charset.c -- routines for character sets
  *

- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.

  */
 
 #include <h/mh.h>
 
  */
 
 #include <h/mh.h>
 

+#include <langinfo.h>
+
+/* Only get_charset() should use norm_charmap(), so hide its
+   declaration here. */
+char *norm_charmap(char *);
+
+/*
+ * Get the current character set
+ */
+char *
+get_charset ()
+{
+    return norm_charmap(nl_langinfo (CODESET));
+}
+
+

 /*
  * Check if we can display a given character set natively.
  * We are passed the length of the initial part of the
 /*
  * Check if we can display a given character set natively.
  * We are passed the length of the initial part of the


@@ -24,12 +42,13 @@ check_charset (char *str, int len)
 
     /* Cache the name of our default character set */
     if (!mm_charset) {
 
     /* Cache the name of our default character set */
     if (!mm_charset) {

-       if (!(mm_charset = getenv ("MM_CHARSET")))
+       if (!(mm_charset = get_charset ()))

            mm_charset = "US-ASCII";
        mm_len = strlen (mm_charset);
 
            mm_charset = "US-ASCII";
        mm_len = strlen (mm_charset);
 

-       /* US-ASCII is a subset of the ISO-8859-X character sets */
-       if (!strncasecmp("ISO-8859-", mm_charset, 9)) {
+       /* US-ASCII is a subset of the ISO-8859-X and UTF-8 character sets */
+       if (!strncasecmp("ISO-8859-", mm_charset, 9) ||
+               !strcasecmp("UTF-8", mm_charset)) {

            alt_charset = "US-ASCII";
            alt_len = strlen (alt_charset);
        }
            alt_charset = "US-ASCII";
            alt_len = strlen (alt_charset);
        }


@@ -58,7 +77,7 @@ write_charset_8bit (void)
      * Cache the name of the character set to
      * use for 8bit text.
      */
      * Cache the name of the character set to
      * use for 8bit text.
      */

-    if (!mm_charset && !(mm_charset = getenv ("MM_CHARSET")))
+    if (!mm_charset && !(mm_charset = get_charset ()))

            mm_charset = "x-unknown";
 
     return mm_charset;
            mm_charset = "x-unknown";
 
     return mm_charset;