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/mbsrtowcs.c
          +++ new/usr/src/lib/libc/port/locale/mbsrtowcs.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 ↓ 7 lines elided ↑ open up ↑
  19   20   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  20   21   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  21   22   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  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      -#include <errno.h>
       30 +#include <locale.h>
  30   31  #include <limits.h>
  31   32  #include <stdlib.h>
  32   33  #include <wchar.h>
  33   34  #include "mblocal.h"
       35 +#include "localeimpl.h"
       36 +#include "lctype.h"
  34   37  
  35   38  size_t
       39 +mbsrtowcs_l(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src,
       40 +    size_t len, mbstate_t *_RESTRICT_KYWD ps, locale_t loc)
       41 +{
       42 +        return (loc->ctype->lc_mbsnrtowcs(dst, src, ULONG_MAX, len, ps));
       43 +}
       44 +
       45 +size_t
  36   46  mbsrtowcs(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src,
  37   47      size_t len, mbstate_t *_RESTRICT_KYWD ps)
  38   48  {
  39      -        static mbstate_t mbs;
  40      -
  41      -        if (ps == NULL)
  42      -                ps = &mbs;
  43      -        return (__mbsnrtowcs(dst, src, ULONG_MAX, len, ps));
       49 +        return (mbsrtowcs_l(dst, src, len, ps, uselocale(NULL)));
  44   50  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX