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. * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. *
*** 33,70 **** */ #include "lint.h" #include <sys/types.h> #include <errno.h> - #include "runetype.h" #include <stdlib.h> #include <string.h> #include <wchar.h> #include "mblocal.h" static size_t _BIG5_mbrtowc(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, size_t, mbstate_t *RESTRICT_KYWD); static int _BIG5_mbsinit(const mbstate_t *); static size_t _BIG5_wcrtomb(char *_RESTRICT_KYWD, wchar_t, mbstate_t *_RESTRICT_KYWD); typedef struct { wchar_t ch; } _BIG5State; ! int ! _BIG5_init(_RuneLocale *rl) { ! ! __mbrtowc = _BIG5_mbrtowc; ! __wcrtomb = _BIG5_wcrtomb; ! __mbsinit = _BIG5_mbsinit; ! _CurrentRuneLocale = rl; ! __ctype[520] = 2; ! charset_is_ascii = 0; ! return (0); } static int _BIG5_mbsinit(const mbstate_t *ps) { --- 34,76 ---- */ #include "lint.h" #include <sys/types.h> #include <errno.h> #include <stdlib.h> #include <string.h> #include <wchar.h> #include "mblocal.h" + #include "lctype.h" static size_t _BIG5_mbrtowc(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, size_t, mbstate_t *RESTRICT_KYWD); static int _BIG5_mbsinit(const mbstate_t *); static size_t _BIG5_wcrtomb(char *_RESTRICT_KYWD, wchar_t, mbstate_t *_RESTRICT_KYWD); + static size_t _BIG5_mbsnrtowcs(wchar_t *_RESTRICT_KYWD, + const char **_RESTRICT_KYWD, size_t, size_t, + mbstate_t *_RESTRICT_KYWD); + static size_t _BIG5_wcsnrtombs(char *_RESTRICT_KYWD, + const wchar_t **_RESTRICT_KYWD, size_t, size_t, + mbstate_t *_RESTRICT_KYWD); typedef struct { wchar_t ch; } _BIG5State; ! void ! _BIG5_init(struct lc_ctype *lct) { ! lct->lc_mbrtowc = _BIG5_mbrtowc; ! lct->lc_wcrtomb = _BIG5_wcrtomb; ! lct->lc_mbsnrtowcs = _BIG5_mbsnrtowcs; ! lct->lc_wcsnrtombs = _BIG5_wcsnrtombs; ! lct->lc_mbsinit = _BIG5_mbsinit; ! lct->lc_max_mblen = 2; ! lct->lc_is_ascii = 0; } static int _BIG5_mbsinit(const mbstate_t *ps) {
*** 161,166 **** --- 167,186 ---- *s = wc & 0xff; return (2); } *s = wc & 0xff; return (1); + } + + static size_t + _BIG5_mbsnrtowcs(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src, + size_t nms, size_t len, mbstate_t *_RESTRICT_KYWD ps) + { + return (__mbsnrtowcs_std(dst, src, nms, len, ps, _BIG5_mbrtowc)); + } + + static size_t + _BIG5_wcsnrtombs(char *_RESTRICT_KYWD dst, const wchar_t **_RESTRICT_KYWD src, + size_t nwc, size_t len, mbstate_t *_RESTRICT_KYWD ps) + { + return (__wcsnrtombs_std(dst, src, nwc, len, ps, _BIG5_wcrtomb)); }