Thread safety fixes.

          --- old/usr/src/lib/libc/port/locale/mbtowc.c
          +++ new/usr/src/lib/libc/port/locale/mbtowc.c
   1    1  /*
   2      - * Copyright 2013 Garrett D'Amore <garrett@damore.org>
        2 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
   3    3   * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
   4    4   * Copyright (c) 2002-2004 Tim J. Robbins.
   5    5   * All rights reserved.
   6    6   *
   7    7   * Redistribution and use in source and binary forms, with or without
   8    8   * modification, are permitted provided that the following conditions
   9    9   * are met:
  10   10   * 1. Redistributions of source code must retain the above copyright
  11   11   *    notice, this list of conditions and the following disclaimer.
  12   12   * 2. Redistributions in binary form must reproduce the above copyright

  13   13   *    notice, this list of conditions and the following disclaimer in the
  14   14   *    documentation and/or other materials provided with the distribution.
  15   15   *
  16   16   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  17   17   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  18   18   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  19   19   * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  20   20   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  21   21   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  22   22   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  23   23   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  24   24   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  25   25   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  26   26   * SUCH DAMAGE.
  27   27   */
  28   28  
  29   29  #include "lint.h"

  30   30  #include <stdlib.h>
  31   31  #include <wchar.h>
  32   32  #include <locale.h>
  33   33  #include <xlocale.h>
  34   34  #include "mblocal.h"
  35   35  
  36   36  int
  37   37  mbtowc_l(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s, size_t n,
  38   38      locale_t loc)
  39   39  {
  40      -        static const mbstate_t initial = { 0 };
  41      -        static mbstate_t mbs;
       40 +        mbstate_t mbs = { 0 };
  42   41          size_t rval;
  43   42  
  44   43          if (s == NULL) {
  45   44                  /* No support for state dependent encodings. */
  46      -                mbs = initial;
  47   45                  return (0);
  48   46          }
  49   47          rval = mbrtowc_l(pwc, s, n, &mbs, loc);
  50   48          if (rval == (size_t)-1 || rval == (size_t)-2)
  51   49                  return (-1);
  52   50          return ((int)rval);
  53   51  }
  54   52  
  55   53  int
  56   54  mbtowc(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s, size_t n)
  57   55  {
  58   56          return (mbtowc_l(pwc, s, n, uselocale(NULL)));
  59   57  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX