Update.

	* wcsmbs/mbrtowc.c: Set flush to 1 for conversion function calls
	depending on whether the input string is empty or not.

	* wcsmbs/mbrtowc.c: Calling function without input means clearing the
	given state and not avoiding this by modifying a local object.
	* wcsmbs/wcrtomb.c: Likewise.

	* iconv/skeleton.c: If no EMIT_SHIFT_TO_INIT is defined clear state
	object since some incomplete characters might be in there.

1 files changed, 12 insertions, 5 deletions

diff --git a/localedata/tests-mbwc/dat_mbrlen.c b/localedata/tests-mbwc/dat_mbrlen.c
index f1f9e15294..8fdef8bf8a 100644
--- a/localedata/tests-mbwc/dat_mbrlen.c
+++ b/localedata/tests-mbwc/dat_mbrlen.c
@@ -85,9 +85,7 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	{
 	  {
 	    { 1, 0,		1,  0,		     },
-	    /* <WAIVER_? x 2> assuming ascii */
 	    { 1, EILSEQ,	1, -1,		     },
-	    /* <WAIVER_? x 2> assuming ascii */
 	    { 1, EILSEQ,	1, -1,		     },
 	  }
 	}
@@ -102,16 +100,20 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	{
 	  {
 	    { 1, "\317\302",   1,		   0, 0 },
+#ifdef SHOJI_IS_RIGHT
 	    { 0, "",	   0,		   0, 0 },
+#else
+	    /* XXX This test depends on the internal state being empty.
+	       XXX Therefore we must explicitly clean it.  */
+	    { 0, "",	   0,		   0, 1 },
+#endif
 	    { 1, "\317\302",   USE_MBCURMAX,   0, 0 },
 	  }
 	},
 	{
 	  {
 	    { 1, 0,		1, -2,		     },
-	    /* <WAIVER_?> returned -2 */
 	    { 1, 0,		1,  0,		     },
-	    /* <WAIVER_?> returned	 1 */
 	    { 1, 0,		1,  2,		     },
 	  }
 	}
@@ -127,8 +129,13 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	{
 	  {
 	    { 1, 0,		1, -2,		     },
-	    /* <WAIVER_?> returned -2 */
+#ifdef SHOJI_IS_RIGHT
 	    { 1, 0,		1, +2,		     },
+#else
+	    /* XXX ISO C explicitly says that the return value does not
+	       XXX reflect the bytes contained in the state.  */
+	    { 1, 0,		1, +1,		     },
+#endif
 	    { 1, 0,		1,  2,		     },
 	  }
 	}