From 1974cfc54c63ce74619dafbf1b985c8fbf46182b Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Sat, 31 Aug 2013 00:00:52 -0600
Subject:   * DATE tokens were not internally transformed to UTF-8, which made
 their     values appear garbled or incomplete in the screen. Reported by
 Werner     Scheinast.

  * Quoted string in URL Viewers configuration variable were not
    unquoted before passing to viewer.
---
 pith/pine.hlp | 7 ++++++-
 pith/string.c | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'pith')
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 1017d965..ce7d04be 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 26 2013-08-28 22:31:51
+Alpine Commit 27 2013-08-30 23:54:12
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -191,12 +191,17 @@ Additions include:
 <P>
 Bugs that have been addressed include:
 <UL>
+  <LI> DATE tokens were not internally transformed to UTF-8, which made their
+       values appear garbled or incomplete in the screen. Reported by Werner 
+       Scheinast.
   <LI> Fixes to configure script so that it will not require PAM for every system.
   <LI> Fix to configure script so that it will use CPPFLAGS instead of 
        CPPCFLAGS, and so the --with-ssl-include-dir option take effect 
        during the build. Fix by Ulf-Dietrich Braumann.
   <LI> Fix in WebAlpine: do not use deprecated dereference in pointer, 
        needs to use tcl_getstringresult() instead. Reported by Ulf-Dietrich Braumann.
+  <LI> Quoted string in URL Viewers configuration variable were not 
+       unquoted before passing to viewer.
   <LI> Fix in configure script to detect location of tcl library; add
        /usr/local in FreeBSD and fix a bug in configure script that used
        $alpine_TCLINC instead of $alpine_TCLINC/tcl.h. Reported and fixed
diff --git a/pith/string.c b/pith/string.c
index a0a826df..65ebd19c 100644
--- a/pith/string.c
+++ b/pith/string.c
@@ -776,6 +776,14 @@ month_abbrev_locale(int month_num)
 	    tm.tm_mon = month_num-1;
 	    our_strftime(buf, sizeof(buf), "%b", &tm);
 
+	    if(strucmp("UTF-8", ps_global->display_charmap)){
+	      char *s;
+	      s = convert_to_utf8(buf, ps_global->display_charmap, 0);
+	      strncpy(buf, s ? s : "", sizeof(buf));
+	      buf[sizeof(buf)-1] = '\0';
+	      if(s) fs_give((void **)&s);
+	    }
+
 	    /*
 	     * If it is all digits, then use the English
 	     * words instead. Look for
-- 
cgit v1.2.3-54-g00ecf

