+2009-03-19 Corinna Vinschen <corinna@vinschen.de>
+
+ * libc/stdlib/mbtowc_r.c (_mbtowc_r): Return EILSEQ in case of an
+ invalid character sequence.
+
+ * libc/stdlib/mbtowc_r.c (_mbtowc_r): Fix compiler warning due to
+ missing declaration of __locale_charset.
+ * libc/stdlib/wctomb_r.c (_wctomb_r): Ditto.
+
2009-03-18 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* libm/common/s_log2.c: New file.
#include "mbctype.h"
#include <wchar.h>
#include <string.h>
+#include <errno.h>
#ifdef _MB_CAPABLE
+extern char *__locale_charset ();
+
typedef enum { ESCAPE, DOLLAR, BRACKET, AT, B, J,
NUL, JIS_CHAR, OTHER, JIS_C_NUM } JIS_CHAR_TYPE;
typedef enum { ASCII, JIS, A_ESC, A_ESC_DL, JIS_1, J_ESC, J_ESC_BR,
return -2;
ch = t[i++];
if (ch < 0x80 || ch > 0xbf)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
if (state->__value.__wchb[0] < 0xc2)
- /* overlong UTF-8 sequence */
- return -1;
+ {
+ /* overlong UTF-8 sequence */
+ r->_errno = EILSEQ;
+ return -1;
+ }
state->__count = 0;
*pwc = (wchar_t)((state->__value.__wchb[0] & 0x1f) << 6)
| (wchar_t)(ch & 0x3f);
return -2;
ch = (state->__count == 1) ? t[i++] : state->__value.__wchb[1];
if (state->__value.__wchb[0] == 0xe0 && ch < 0xa0)
- /* overlong UTF-8 sequence */
- return -1;
+ {
+ /* overlong UTF-8 sequence */
+ r->_errno = EILSEQ;
+ return -1;
+ }
if (ch < 0x80 || ch > 0xbf)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
state->__value.__wchb[1] = ch;
state->__count = 2;
if (n < 3)
return -2;
ch = t[i++];
if (ch < 0x80 || ch > 0xbf)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
state->__count = 0;
tmp = (wchar_t)((state->__value.__wchb[0] & 0x0f) << 12)
| (wchar_t)((state->__value.__wchb[1] & 0x3f) << 6)
| (wchar_t)(ch & 0x3f);
if (tmp >= 0xd800 && tmp <= 0xdfff)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
*pwc = tmp;
return i;
}
return -2;
ch = (state->__count == 1) ? t[i++] : state->__value.__wchb[1];
if (state->__value.__wchb[0] == 0xf0 && ch < 0x90)
- /* overlong UTF-8 sequence */
- return -1;
+ {
+ /* overlong UTF-8 sequence */
+ r->_errno = EILSEQ;
+ return -1;
+ }
if (ch < 0x80 || ch > 0xbf)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
state->__value.__wchb[1] = ch;
if (state->__count == 1)
state->__count = 2;
return -2;
ch = (state->__count == 2) ? t[i++] : state->__value.__wchb[2];
if (ch < 0x80 || ch > 0xbf)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
state->__value.__wchb[2] = ch;
state->__count = 3;
if (n < 4)
return -2;
ch = t[i++];
if (ch < 0x80 || ch > 0xbf)
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
tmp = (wint_t)((state->__value.__wchb[0] & 0x07) << 18)
| (wint_t)((state->__value.__wchb[1] & 0x3f) << 12)
| (wint_t)((state->__value.__wchb[2] & 0x3f) << 6)
return i;
}
else
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
}
else if (!strcmp (__locale_charset (), "SJIS"))
{
return i;
}
else
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
}
}
else if (!strcmp (__locale_charset (), "EUCJP"))
return i;
}
else
- return -1;
+ {
+ r->_errno = EILSEQ;
+ return -1;
+ }
}
}
else if (!strcmp (__locale_charset (), "JIS"))
break;
case ERROR:
default:
+ r->_errno = EILSEQ;
return -1;
}