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

          --- old/usr/src/lib/libc/port/locale/mbtowc.c
          +++ new/usr/src/lib/libc/port/locale/mbtowc.c
   1    1  /*
        2 + * Copyright 2014 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

  12   13   *    notice, this list of conditions and the following disclaimer in the
  13   14   *    documentation and/or other materials provided with the distribution.
  14   15   *
  15   16   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  16   17   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  17   18   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  18   19   * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  19   20   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  20   21   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

  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 <stdlib.h>
  30   31  #include <wchar.h>
       32 +#include <locale.h>
       33 +#include <xlocale.h>
  31   34  #include "mblocal.h"
  32   35  
  33   36  int
  34      -mbtowc(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s, size_t n)
       37 +mbtowc_l(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s, size_t n,
       38 +    locale_t loc)
  35   39  {
  36      -        static const mbstate_t initial = { 0 };
  37      -        static mbstate_t mbs;
       40 +        mbstate_t mbs = { 0 };
  38   41          size_t rval;
  39   42  
  40   43          if (s == NULL) {
  41   44                  /* No support for state dependent encodings. */
  42      -                mbs = initial;
  43   45                  return (0);
  44   46          }
  45      -        rval = __mbrtowc(pwc, s, n, &mbs);
       47 +        rval = mbrtowc_l(pwc, s, n, &mbs, loc);
  46   48          if (rval == (size_t)-1 || rval == (size_t)-2)
  47   49                  return (-1);
  48   50          return ((int)rval);
       51 +}
       52 +
       53 +int
       54 +mbtowc(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s, size_t n)
       55 +{
       56 +        return (mbtowc_l(pwc, s, n, uselocale(NULL)));
  49   57  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX