2964 need POSIX 2008 locale object support

          --- old/usr/src/lib/libc/port/locale/wcwidth.c
          +++ new/usr/src/lib/libc/port/locale/wcwidth.c

   1    1  /*
   2    2   * Copyright (c) 1989, 1993
   3    3   *      The Regents of the University of California.  All rights reserved.
   4    4   * (c) UNIX System Laboratories, Inc.
   5    5   * All or some portions of this file are derived from material licensed
   6    6   * to the University of California by American Telephone and Telegraph
   7    7   * Co. or Unix System Laboratories, Inc. and are reproduced herein with
   8    8   * the permission of UNIX System Laboratories, Inc.
   9    9   *
  10   10   * This code is derived from software contributed to Berkeley by
  11   11   * Paul Borman at Krystal Technologies.
  12   12   *
  13   13   * Redistribution and use in source and binary forms, with or without
  14   14   * modification, are permitted provided that the following conditions
  15   15   * are met:
  16   16   * 1. Redistributions of source code must retain the above copyright
  17   17   *    notice, this list of conditions and the following disclaimer.
  18   18   * 2. Redistributions in binary form must reproduce the above copyright
  19   19   *    notice, this list of conditions and the following disclaimer in the
  20   20   *    documentation and/or other materials provided with the distribution.
  21   21   * 4. Neither the name of the University nor the names of its contributors
  22   22   *    may be used to endorse or promote products derived from this software
  23   23   *    without specific prior written permission.
  24   24   *
  25   25   * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  26   26   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  27   27   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  28   28   * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  29   29   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  30   30   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  31   31   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  32   32   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  33   33   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  34   34   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  35   35   * SUCH DAMAGE.
  36   36   */
  37   37  
  38   38  /*
  39   39   * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  40   40   * Use is subject to license terms.
  41   41   */
  42   42  
  43   43  #include "lint.h"
  44   44  #include <wchar.h>
  45   45  #include "_ctype.h"
  46   46  #include "runetype.h"
  47   47  
  48   48  #undef wcwidth
  49   49  
  50   50  int
  51   51  wcwidth(wchar_t wc)
  52   52  {
  53   53          unsigned int x;
  54   54  
  55   55          if (wc == 0)
  56   56                  return (0);
  57   57  

  58   58          x = ((wc < 0 || wc >= _CACHED_RUNES) ? ___runetype(wc) :
  59   59              _CurrentRuneLocale->__runetype[wc]) & (_CTYPE_SWM|_CTYPE_R);
  60   60  
  61   61          if ((x & _CTYPE_SWM) != 0)
  62   62                  return ((x & _CTYPE_SWM) >> _CTYPE_SWS);
  63   63          return ((x & _CTYPE_R) != 0 ? 1 : -1);
  64   64  }
  65   65  
  66   66  #pragma weak _scrwidth = scrwidth
  67   67  
       68 +int
       69 +wcwidth(wchar_t wc, locale_t locale)
       70 +{
       71 +        /* XXX */
       72 +        return (0);
       73 +}
       74 +
  68   75  /*
  69   76   * This is a Solaris extension.  It never returns a negative width, even for
  70   77   * non-printable characters.  It is used internally by the printf
  71   78   * implementation for %ws.
  72   79   */
  73   80  int
  74   81  scrwidth(wchar_t wc)
  75   82  {
  76   83          int     v = wcwidth(wc);
  77   84          return (v > 0 ? v : 0);
  78   85  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX