Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: TBD
*** 1,6 ****
--- 1,7 ----
/*
+ * Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
*** 24,44 ****
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include "lint.h"
! #include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <wchar.h>
#include "mblocal.h"
size_t
mbsrtowcs(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src,
size_t len, mbstate_t *_RESTRICT_KYWD ps)
{
! static mbstate_t mbs;
!
! if (ps == NULL)
! ps = &mbs;
! return (__mbsnrtowcs(dst, src, ULONG_MAX, len, ps));
}
--- 25,50 ----
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include "lint.h"
! #include <locale.h>
#include <limits.h>
#include <stdlib.h>
#include <wchar.h>
#include "mblocal.h"
+ #include "localeimpl.h"
+ #include "lctype.h"
size_t
+ mbsrtowcs_l(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src,
+ size_t len, mbstate_t *_RESTRICT_KYWD ps, locale_t loc)
+ {
+ return (loc->ctype->lc_mbsnrtowcs(dst, src, ULONG_MAX, len, ps));
+ }
+
+ size_t
mbsrtowcs(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src,
size_t len, mbstate_t *_RESTRICT_KYWD ps)
{
! return (mbsrtowcs_l(dst, src, len, ps, uselocale(NULL)));
}