Update.

	* locale/programs/ld-ctype.c (ctype_output): Correct computation of
	nelems.  Correctly compute index for additional character classes.
	(ctype_read): Handle charclass and charconv definitions.  Also
	recognize arbitrary strings as mapping names.
	* locale/programs/ld-time.c (time_finish): Correctly skip over wide
	character era strings.
	* locale/lc-time.c (_nl_get_era_entry): Correctly skip era name
	and format for wide characters.
	* time/strftime.c: Correctly determine era information for wide
	wcsftime.
	* wctrans.c: Fix after removal of second endianess table.
	* wctype/wctype.h (_ISwbit): Correctly handle bits > 16.
	Patches by Shinya Hanataka <hanataka@abyss.rim.or.jp>.

	* wcsmbs/wcwidth.h (internal_wcwidth): Reject non-printable characters.

1 files changed, 2 insertions, 2 deletions

diff --git a/locale/lc-time.c b/locale/lc-time.c
index 533e2e0d4c..78789dce41 100644
--- a/locale/lc-time.c
+++ b/locale/lc-time.c
@@ -98,9 +98,9 @@ _nl_get_era_entry (const struct tm *tp)
 		  ptr += 3 - (((ptr - (const char *) eras[cnt]) + 3) & 3);
 
 		  /* Skip wide era name.  */
-		  ptr = (char *) wcschr ((wchar_t *) ptr, '\0');
+		  ptr = (char *) (wcschr ((wchar_t *) ptr, '\0') + 1);
 		  /* Skip wide era format.  */
-		  ptr = (char *) wcschr ((wchar_t *) ptr, '\0');
+		  ptr = (char *) (wcschr ((wchar_t *) ptr, '\0') + 1);
 		}
 	    }
 	}