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/wcsrtombs.c
          +++ new/usr/src/lib/libc/port/locale/wcsrtombs.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 ↓ 11 lines elided ↑ open up ↑
  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 <stdlib.h>
  31   32  #include <string.h>
  32   33  #include <wchar.h>
       34 +#include "localeimpl.h"
       35 +#include "lctype.h"
  33   36  #include "mblocal.h"
  34   37  
  35   38  size_t
  36      -wcsrtombs(char *_RESTRICT_KYWD dst, const wchar_t **_RESTRICT_KYWD src,
  37      -    size_t len, mbstate_t *_RESTRICT_KYWD ps)
       39 +wcsrtombs_l(char *_RESTRICT_KYWD dst, const wchar_t **_RESTRICT_KYWD src,
       40 +    size_t len, mbstate_t *_RESTRICT_KYWD ps, locale_t loc)
  38   41  {
  39   42          static mbstate_t mbs;
  40   43  
  41   44          if (ps == NULL)
  42   45                  ps = &mbs;
  43      -        return (__wcsnrtombs(dst, src, ULONG_MAX, len, ps));
       46 +        return (loc->ctype->lc_wcsnrtombs(dst, src, ULONG_MAX, len, ps));
       47 +}
       48 +
       49 +size_t
       50 +wcsrtombs(char *_RESTRICT_KYWD dst, const wchar_t **_RESTRICT_KYWD src,
       51 +    size_t len, mbstate_t *_RESTRICT_KYWD ps)
       52 +{
       53 +        return (wcsrtombs_l(dst, src, len, ps, uselocale(NULL)));
  44   54  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX