JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/stdio/vfwscanf.c (__SVFWSCANF_R): Fix fetching decimal_point in 

!_MB_CAPABLE as well as in !__HAVE_LOCALE_INFO_EXTENDED__ case.
This commit is contained in:
Corinna Vinschen 2013-12-19 18:50:00 +00:00
parent 0fcafd1535
commit 281924766d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2013-12-19 Corinna Vinschen <vinschen@redhat.com>
* libc/stdio/vfwscanf.c (__SVFWSCANF_R): Fix fetching decimal_point in
!_MB_CAPABLE as well as in !__HAVE_LOCALE_INFO_EXTENDED__ case.
2013-12-18 Corinna Vinschen <vinschen@redhat.com> 2013-12-18 Corinna Vinschen <vinschen@redhat.com>
* libc/stdio/vfscanf.c (BUF): Change definition to take multibyte * libc/stdio/vfscanf.c (BUF): Change definition to take multibyte

11
newlib/libc/stdio/vfwscanf.c
View File

@ -161,6 +161,7 @@ C99, POSIX-1.2008
#ifdef FLOATING_POINT #ifdef FLOATING_POINT
#include <math.h> #include <math.h>
#include <float.h> #include <float.h>
#include <locale.h>
#ifdef __HAVE_LOCALE_INFO_EXTENDED__ #ifdef __HAVE_LOCALE_INFO_EXTENDED__
#include "../locale/lnumeric.h" #include "../locale/lnumeric.h"
#endif #endif
@ -452,16 +453,16 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
{ {
size_t nconv; size_t nconv;
memset (&state, '\0', sizeof (state)); memset (&mbs, '\0', sizeof (mbs));
nconv = _mbrtowc_r (data, &decpt, nconv = _mbrtowc_r (rptr, &decpt,
_localeconv_r (data)->decimal_point, _localeconv_r (rptr)->decimal_point,
MB_CUR_MAX, &state); MB_CUR_MAX, &mbs);
if (nconv == (size_t) -1 || nconv == (size_t) -2) if (nconv == (size_t) -1 || nconv == (size_t) -2)
decpt = L'.'; decpt = L'.';
} }
#endif /* !__HAVE_LOCALE_INFO_EXTENDED__ */ #endif /* !__HAVE_LOCALE_INFO_EXTENDED__ */
#else #else
decpt = (wchar_t) *_localeconv_r (data)->decimal_point; decpt = (wchar_t) *_localeconv_r (rptr)->decimal_point;
#endif /* !_MB_CAPABLE */ #endif /* !_MB_CAPABLE */
#endif /* FLOATING_POINT */ #endif /* FLOATING_POINT */