Print this page
Thread safety fixes.

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/port/locale/wctomb.c
          +++ new/usr/src/lib/libc/port/locale/wctomb.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
↓ open down ↓ 16 lines elided ↑ open up ↑
  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  wctomb_l(char *s, wchar_t wchar, locale_t loc)
  38   38  {
  39      -        static const mbstate_t initial = { 0 };
  40      -        static mbstate_t mbs;
       39 +        mbstate_t mbs = { 0 };
  41   40          size_t rval;
  42   41  
  43   42          if (s == NULL) {
  44   43                  /* No support for state dependent encodings. */
  45      -                mbs = initial;
  46   44                  return (0);
  47   45          }
  48   46          if ((rval = wcrtomb_l(s, wchar, &mbs, loc)) == (size_t)-1)
  49   47                  return (-1);
  50   48          return ((int)rval);
  51   49  }
  52   50  
  53   51  int
  54   52  wctomb(char *s, wchar_t wchar)
  55   53  {
  56   54          return (wctomb_l(s, wchar, uselocale(NULL)));
  57   55  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX