X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/1f2f436a38f7ae2d39a943ad2898d8fed4ed2e58..refs/heads/master:/stdio/FreeBSD/ungetwc.c?ds=sidebyside diff --git a/stdio/FreeBSD/ungetwc.c b/stdio/FreeBSD/ungetwc.c index 47e84ae..37e6402 100644 --- a/stdio/FreeBSD/ungetwc.c +++ b/stdio/FreeBSD/ungetwc.c @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.11 2008/04/17 22:17:54 jhb Exp $"); +#include "xlocale_private.h" + #include "namespace.h" #include #include @@ -42,14 +44,14 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.11 2008/04/17 22:17:54 jhb * Non-MT-safe version. */ wint_t -__ungetwc(wint_t wc, FILE *fp) +__ungetwc(wint_t wc, FILE *fp, locale_t loc) { char buf[MB_LEN_MAX]; size_t len; if (wc == WEOF) return (WEOF); - if ((len = __wcrtomb(buf, wc, &fp->_mbstate)) == (size_t)-1) { + if ((len = loc->__lc_ctype->__wcrtomb(buf, wc, &fp->_mbstate, loc)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } @@ -70,7 +72,21 @@ ungetwc(wint_t wc, FILE *fp) FLOCKFILE(fp); ORIENT(fp, 1); - r = __ungetwc(wc, fp); + r = __ungetwc(wc, fp, __current_locale()); + FUNLOCKFILE(fp); + + return (r); +} + +wint_t +ungetwc_l(wint_t wc, FILE *fp, locale_t loc) +{ + wint_t r; + + NORMALIZE_LOCALE(loc); + FLOCKFILE(fp); + ORIENT(fp, 1); + r = __ungetwc(wc, fp, loc); FUNLOCKFILE(fp); return (r);