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/wcswidth.c
          +++ new/usr/src/lib/libc/port/locale/wcswidth.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) 1989, 1993
   4    5   *      The Regents of the University of California.  All rights reserved.
   5    6   * (c) UNIX System Laboratories, Inc.
   6    7   * All or some portions of this file are derived from material licensed
   7    8   * to the University of California by American Telephone and Telegraph
   8    9   * Co. or Unix System Laboratories, Inc. and are reproduced herein with
   9   10   * the permission of UNIX System Laboratories, Inc.
  10   11   *
  11   12   * This code is derived from software contributed to Berkeley by

  12   13   * Paul Borman at Krystal Technologies.
  13   14   *
  14   15   * Redistribution and use in source and binary forms, with or without
  15   16   * modification, are permitted provided that the following conditions
  16   17   * are met:
  17   18   * 1. Redistributions of source code must retain the above copyright
  18   19   *    notice, this list of conditions and the following disclaimer.
  19   20   * 2. Redistributions in binary form must reproduce the above copyright
  20   21   *    notice, this list of conditions and the following disclaimer in the
  21   22   *    documentation and/or other materials provided with the distribution.
  22   23   * 4. Neither the name of the University nor the names of its contributors
  23   24   *    may be used to endorse or promote products derived from this software
  24   25   *    without specific prior written permission.
  25   26   *
  26   27   * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  27   28   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  28   29   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  29   30   * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

  30   31   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  31   32   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  32   33   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  33   34   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  34   35   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  35   36   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  36   37   * SUCH DAMAGE.
  37   38   */
  38   39  
  39   40  #include "lint.h"
       41 +#include <locale.h>
  40   42  #include <wchar.h>
       43 +#include <xlocale.h>
  41   44  
  42   45  int
  43      -wcswidth(const wchar_t *pwcs, size_t n)
       46 +wcswidth_l(const wchar_t *pwcs, size_t n, locale_t loc)
  44   47  {
  45   48          wchar_t wc;
  46   49          int len, l;
  47   50  
  48   51          len = 0;
  49   52          while (n-- > 0 && (wc = *pwcs++) != L'\0') {
  50      -                if ((l = wcwidth(wc)) < 0)
       53 +                if ((l = wcwidth_l(wc, loc)) < 0)
  51   54                          return (-1);
  52   55                  len += l;
  53   56          }
  54   57          return (len);
       58 +}
       59 +
       60 +int
       61 +wcswidth(const wchar_t *pwcs, size_t n)
       62 +{
       63 +        return (wcswidth_l(pwcs, n, uselocale(NULL)));
  55   64  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX