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

          --- old/usr/src/lib/libc/port/locale/btowc.c
          +++ new/usr/src/lib/libc/port/locale/btowc.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, 2003 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 <stdio.h>
  30   31  #include <wchar.h>
       32 +#include <locale.h>
       33 +#include <xlocale.h>
  31   34  #include "mblocal.h"
  32   35  
  33   36  wint_t
  34      -btowc(int c)
       37 +btowc_l(int c, locale_t loc)
  35   38  {
  36   39          static const mbstate_t initial = { 0 };
  37   40          mbstate_t mbs = initial;
  38   41          char cc;
  39   42          wchar_t wc;
  40   43  
  41   44          if (c == EOF)
  42   45                  return (WEOF);
  43   46          /*
  44   47           * We expect mbrtowc() to return 0 or 1, hence the check for n > 1
  45   48           * which detects error return values as well as "impossible" byte
  46   49           * counts.
  47   50           */
  48   51          cc = (char)c;
  49      -        if (__mbrtowc(&wc, &cc, 1, &mbs) > 1)
       52 +        if (mbrtowc_l(&wc, &cc, 1, &mbs, loc) > 1)
  50   53                  return (WEOF);
  51   54          return (wc);
       55 +}
       56 +
       57 +wint_t
       58 +btowc(int c)
       59 +{
       60 +        return (btowc_l(c, uselocale(NULL)));
  52   61  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX