Use iana_charset rather than calling nl_langinfo(CODESET).

svn path=/trunk/; revision=3981

diff --git a/driver.c b/driver.c
index 2b845b0f6f50af94021bc132fa46825a7ce00b16..c48defd8815c179a4a1cc71a3580f08b2508011d 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -333,7 +333,7 @@ static void send_size_warnings(struct query *ctl)
      */
     if (open_warning_by_mail(ctl, (struct msgblk *)NULL))
        return;
-    stuff_warning(nl_langinfo(CODESET), ctl,
+    stuff_warning(iana_charset, ctl,
           GT_("Subject: Fetchmail oversized-messages warning"));
     stuff_warning(NULL, ctl, "");
     stuff_warning(NULL, ctl,
@@ -910,7 +910,7 @@ static int do_session(
            if (timeoutcount > MAX_TIMEOUTS 
                && !open_warning_by_mail(ctl, (struct msgblk *)NULL))
            {
-               stuff_warning(nl_langinfo(CODESET), ctl,
+               stuff_warning(iana_charset, ctl,
                              GT_("Subject: fetchmail sees repeated timeouts"));
                stuff_warning(NULL, ctl, "");
                stuff_warning(NULL, ctl,
@@ -1111,7 +1111,7 @@ static int do_session(
                /* warn the system administrator */
                if (open_warning_by_mail(ctl, (struct msgblk *)NULL) == 0)
                {
-                   stuff_warning(nl_langinfo(CODESET), ctl,
+                   stuff_warning(iana_charset, ctl,
                         GT_("Subject: Fetchmail unreachable-server warning."));
                    stuff_warning(NULL, ctl, "");
                    stuff_warning(NULL, ctl, GT_("Fetchmail could not reach the mail server %s:"),
@@ -1226,7 +1226,7 @@ static int do_session(
                        && !open_warning_by_mail(ctl, (struct msgblk *)NULL))
                    {
                        ctl->wehavesentauthnote = 1;
-                       stuff_warning(nl_langinfo(CODESET), ctl,
+                       stuff_warning(iana_charset, ctl,
                                      GT_("Subject: fetchmail authentication failed on %s@%s"),
                            ctl->remotename, ctl->server.truename);
                        stuff_warning(NULL, ctl, "");
@@ -1299,7 +1299,7 @@ is restored."));
                           ctl->server.truename);
                    if (!open_warning_by_mail(ctl, (struct msgblk *)NULL))
                    {
-                       stuff_warning(nl_langinfo(CODESET), ctl,
+                       stuff_warning(iana_charset, ctl,
                              GT_("Subject: fetchmail authentication OK on %s@%s"), 
                                      ctl->remotename, ctl->server.truename);
                        stuff_warning(NULL, ctl, "");

diff --git a/sink.c b/sink.c
index 8939c8e9996c3e9caeaf615aeecaa62d655a6af4..662d0a7b47adccf7d56df7eee87a4aa303125528 100644 (file)
--- a/sink.c
+++ b/sink.c
@@ -1539,7 +1539,7 @@ int open_warning_by_mail(struct query *ctl, struct msgblk *msg)
        stuff_warning(NULL, ctl, "Date: %s", rfc822timestamp());
        stuff_warning(NULL, ctl, "MIME-Version: 1.0");
        stuff_warning(NULL, ctl, "Content-Transfer-Encoding: 8bit");
-       stuff_warning(NULL, ctl, "Content-Type: text/plain; charset=\"%s\"", nl_langinfo(CODESET));
+       stuff_warning(NULL, ctl, "Content-Type: text/plain; charset=\"%s\"", iana_charset);
     }
     return(status);
 }