Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/port/locale/lnumeric.c
          +++ new/usr/src/lib/libc/port/locale/lnumeric.c
   1    1  /*
        2 + * Copyright 2014 Garrett D'Amore.
   2    3   * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
   3    4   * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
   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 ↓ 8 lines elided ↑ open up ↑
  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   30  #include <limits.h>
       31 +#include <errno.h>
  30   32  #include "ldpart.h"
  31   33  #include "lnumeric.h"
  32      -#include "../i18n/_locale.h"
       34 +#include "localeimpl.h"
  33   35  
  34      -extern int __nlocale_changed;
  35   36  extern const char *__fix_locale_grouping_str(const char *);
  36   37  
  37      -#define LCNUMERIC_SIZE (sizeof (struct lc_numeric_T) / sizeof (char *))
       38 +#define LCNUMERIC_SIZE (sizeof (struct lc_numeric) / sizeof (char *))
  38   39  
  39   40  static char     numempty[] = { CHAR_MAX, '\0' };
  40   41  
  41      -static const struct lc_numeric_T _C_numeric_locale = {
       42 +struct lc_numeric lc_numeric_posix = {
  42   43          ".",            /* decimal_point */
  43   44          "",             /* thousands_sep */
  44   45          numempty        /* grouping */
  45   46  };
  46   47  
  47      -static struct lc_numeric_T _numeric_locale;
  48      -static int      _numeric_using_locale;
  49      -static char     *_numeric_locale_buf;
       48 +struct locdata __posix_numeric_locdata = {
       49 +        .l_lname = "C",
       50 +        .l_refcnt = (uint32_t)-1,
       51 +        .l_data = { &lc_numeric_posix }
       52 +};
  50   53  
  51      -int
  52      -__numeric_load_locale(const char *name)
  53      -{
  54      -        const struct lc_numeric_T *leg = &_C_numeric_locale;
  55   54  
       55 +/*
       56 + * Return the locale's numeric locdata structure, places a hold on it,
       57 + * which the caller must release.
       58 + */
       59 +struct locdata *
       60 +__lc_numeric_load(const char *name)
       61 +{
       62 +        struct locdata *ldata;
       63 +        struct lc_numeric *lnum;
  56   64          int ret;
  57   65  
  58      -        ret = __part_load_locale(name, &_numeric_using_locale,
  59      -            &_numeric_locale_buf, "LC_NUMERIC", LCNUMERIC_SIZE, LCNUMERIC_SIZE,
  60      -            (const char **)&_numeric_locale);
  61      -        if (ret == _LDP_ERROR)
  62      -                return (_LDP_ERROR);
       66 +        if ((ldata = __locdata_alloc(name, sizeof (*lnum))) == NULL) {
       67 +                errno = EINVAL;
       68 +                return (NULL);
       69 +        }
       70 +        lnum = ldata->l_data[0];
  63   71  
  64      -        __nlocale_changed = 1;
  65      -        if (ret == _LDP_LOADED) {
  66      -                /* Can't be empty according to C99 */
  67      -                if (*_numeric_locale.decimal_point == '\0')
  68      -                        _numeric_locale.decimal_point =
  69      -                            _C_numeric_locale.decimal_point;
  70      -                _numeric_locale.grouping =
  71      -                    __fix_locale_grouping_str(_numeric_locale.grouping);
  72      -                leg = (const struct lc_numeric_T *)&_numeric_locale;
       72 +        ret = __part_load_locale(name, (char **)&ldata->l_data[1],
       73 +            "LC_NUMERIC", LCNUMERIC_SIZE, LCNUMERIC_SIZE, (const char **)lnum);
       74 +
       75 +        if (ret != _LDP_LOADED) {
       76 +                __locdata_release(ldata);
       77 +                return (NULL);
  73   78          }
  74      -        /* This is Solaris legacy, required for ABI compatability */
  75      -        _numeric[0] = *leg->decimal_point;
  76      -        _numeric[1] = *leg->grouping;
  77      -        return (ret);
  78      -}
  79   79  
  80      -struct lc_numeric_T *
  81      -__get_current_numeric_locale(void)
  82      -{
  83      -        return (_numeric_using_locale ? &_numeric_locale :
  84      -            (struct lc_numeric_T *)&_C_numeric_locale);
       80 +        /* Can't be empty according to C99 */
       81 +        if (*lnum->decimal_point == '\0')
       82 +                lnum->decimal_point = lc_numeric_posix.decimal_point;
       83 +        lnum->grouping = __fix_locale_grouping_str(lnum->grouping);
       84 +
       85 +        return (ldata);
  85   86  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX