Reworked output handling.

[nmh] / sbr / check_charset.c

diff --git a/sbr/check_charset.c b/sbr/check_charset.c
index f45448dad5b10ab2b9f5f4b46560790a87fbd1c9..cc93273fec1f78394f1ffffa4f7f79ea4476146c 100644 (file)
--- a/sbr/check_charset.c
+++ b/sbr/check_charset.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -11,6 +9,22 @@
 
 #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
@@ -28,7 +42,7 @@ check_charset (char *str, int len)
 
     /* 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);
 
@@ -63,7 +77,7 @@ write_charset_8bit (void)
      * 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;