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/towlower.c
          +++ new/usr/src/lib/libc/port/locale/towlower.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
↓ open down ↓ 20 lines elided ↑ open up ↑
  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"
  40   41  #include <wctype.h>
  41   42  #include <stdio.h>
       43 +#include "localeimpl.h"
       44 +#include "lctype.h"
  42   45  #include "runetype.h"
  43   46  
  44   47  static wint_t
  45      -__change_case_ext(wint_t c, int lower)
       48 +change_case_ext(locale_t loc, wint_t c, int lower)
  46   49  {
       50 +        const _RuneLocale *rl;
       51 +        const _RuneRange *rr;
       52 +        const _RuneEntry *base, *re;
  47   53          size_t lim;
  48      -        _RuneRange *rr;
  49      -        _RuneEntry *base, *re;
  50   54  
  51   55          if (c < 0 || c == EOF)
  52   56                  return (c);
  53   57  
  54      -        rr = lower ?
  55      -            &_CurrentRuneLocale->__maplower_ext :
  56      -            &_CurrentRuneLocale->__mapupper_ext;
       58 +        rl = loc->runelocale;
       59 +        rr = lower ? &rl->__maplower_ext : &rl->__mapupper_ext;
  57   60          /* Binary search -- see bsearch.c for explanation. */
  58   61          base = rr->__ranges;
  59   62          for (lim = rr->__nranges; lim != 0; lim >>= 1) {
  60   63                  re = base + (lim >> 1);
  61   64                  if (re->__min <= c && c <= re->__max) {
  62   65                          return (re->__map + c - re->__min);
  63   66                  } else if (c > re->__max) {
  64   67                          base = re + 1;
  65   68                          lim--;
  66   69                  }
  67   70          }
  68   71  
  69   72          return (c);
  70   73  }
  71   74  
       75 +wint_t
       76 +towlower_l(wint_t wc, locale_t loc)
       77 +{
       78 +        return (iswascii(wc) ? __trans_lower[wc] :
       79 +            (wc < 0 || wc >= _CACHED_RUNES) ?
       80 +            change_case_ext(loc, wc, 1) :
       81 +            loc->runelocale->__maplower[wc]);
       82 +}
       83 +
  72   84  #undef towlower
  73   85  wint_t
  74   86  towlower(wint_t wc)
  75   87  {
  76      -        return ((wc < 0 || wc >= _CACHED_RUNES) ?
  77      -            __change_case_ext(wc, 1) :
  78      -            _CurrentRuneLocale->__maplower[wc]);
       88 +        return (iswascii(wc) ? __trans_lower[wc] :
       89 +            (wc < 0 || wc >= _CACHED_RUNES) ?
       90 +            change_case_ext(uselocale(NULL), wc, 1) :
       91 +            uselocale(NULL)->runelocale->__maplower[wc]);
  79   92  }
  80   93  
       94 +wint_t
       95 +towupper_l(wint_t wc, locale_t loc)
       96 +{
       97 +        return (iswascii(wc) ? __trans_upper[wc] :
       98 +            (wc < 0 || wc >= _CACHED_RUNES) ?
       99 +            change_case_ext(loc, wc, 0) :
      100 +            loc->runelocale->__mapupper[wc]);
      101 +}
      102 +
  81  103  #undef towupper
  82  104  wint_t
  83  105  towupper(wint_t wc)
  84  106  {
  85      -        return ((wc < 0 || wc >= _CACHED_RUNES) ?
  86      -            __change_case_ext(wc, 0) :
  87      -            _CurrentRuneLocale->__mapupper[wc]);
      107 +        return (iswascii(wc) ? __trans_upper[wc] :
      108 +            (wc < 0 || wc >= _CACHED_RUNES) ?
      109 +            change_case_ext(uselocale(NULL), wc, 0) :
      110 +            uselocale(NULL)->runelocale->__mapupper[wc]);
  88  111  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX