Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/port/locale/mbrtowc.c
          +++ new/usr/src/lib/libc/port/locale/mbrtowc.c
   1    1  /*
        2 + * Copyright 2013 Garrett D'Amore <garrett@damore.org>
   2    3   * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
   3    4   * Copyright (c) 2002-2004 Tim J. Robbins.
   4    5   * All rights reserved.
   5    6   *
   6    7   * Redistribution and use in source and binary forms, with or without
   7    8   * modification, are permitted provided that the following conditions
   8    9   * are met:
   9   10   * 1. Redistributions of source code must retain the above copyright
  10   11   *    notice, this list of conditions and the following disclaimer.
  11   12   * 2. Redistributions in binary form must reproduce the above copyright
↓ open down ↓ 9 lines elided ↑ open up ↑
  21   22   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  22   23   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  23   24   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  24   25   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  25   26   * SUCH DAMAGE.
  26   27   */
  27   28  
  28   29  #include "lint.h"
  29   30  #include <wchar.h>
  30   31  #include "mblocal.h"
       32 +#include "localeimpl.h"
       33 +#include "lctype.h"
  31   34  
  32   35  size_t
  33      -mbrtowc(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s,
  34      -    size_t n, mbstate_t *_RESTRICT_KYWD ps)
       36 +mbrtowc_l(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s,
       37 +    size_t n, mbstate_t *_RESTRICT_KYWD ps, locale_t loc)
  35   38  {
  36   39          static mbstate_t mbs;
  37   40  
  38   41          if (ps == NULL)
  39   42                  ps = &mbs;
  40      -        return (__mbrtowc(pwc, s, n, ps));
       43 +        return (loc->ctype->lc_mbrtowc(pwc, s, n, ps));
       44 +}
       45 +
       46 +size_t
       47 +mbrtowc(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s,
       48 +    size_t n, mbstate_t *_RESTRICT_KYWD ps)
       49 +{
       50 +        return (mbrtowc_l(pwc, s, n, ps, uselocale(NULL)));
  41   51  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX