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

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/port/locale/wctob.c
          +++ new/usr/src/lib/libc/port/locale/wctob.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 ↓ 10 lines elided ↑ open up ↑
  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 <limits.h>
  30   31  #include <stdio.h>
  31   32  #include <wchar.h>
       33 +#include <locale.h>
       34 +#include <xlocale.h>
  32   35  #include "mblocal.h"
  33   36  
  34   37  int
  35      -wctob(wint_t c)
       38 +wctob_l(wint_t c, locale_t loc)
  36   39  {
  37   40          static const mbstate_t initial = { 0 };
  38   41          mbstate_t mbs = initial;
  39   42          char buf[MB_LEN_MAX];
  40   43  
  41      -        if (c == WEOF || __wcrtomb(buf, c, &mbs) != 1)
       44 +        if (c == WEOF || wcrtomb_l(buf, c, &mbs, loc) != 1)
  42   45                  return (EOF);
  43   46          return ((unsigned char)*buf);
       47 +}
       48 +
       49 +int
       50 +wctob(wint_t c)
       51 +{
       52 +        return (wctob_l(c, uselocale(NULL)));
  44   53  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX