mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
Make localeconv() actual function. Now it will use LC_MONETARY/LC_NUMERIC
information to fill return structure. Remove unused anymore stub.
This commit is contained in:
Alexey Zelkin
parent
90423ececf
commit
e690a5563f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=72166
@ -1,70 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)lconv.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <limits.h>
|
||||
#include <locale.h>
|
||||
|
||||
static char empty[] = "";
|
||||
|
||||
/*
|
||||
* Default (C) locale conversion.
|
||||
*/
|
||||
static struct lconv C_lconv = {
|
||||
".", /* decimal_point */
|
||||
empty, /* thousands_sep */
|
||||
empty, /* grouping */
|
||||
empty, /* int_curr_symbol */
|
||||
empty, /* currency_symbol */
|
||||
empty, /* mon_decimal_point */
|
||||
empty, /* mon_thousands_sep */
|
||||
empty, /* mon_grouping */
|
||||
empty, /* positive_sign */
|
||||
empty, /* negative_sign */
|
||||
CHAR_MAX, /* int_frac_digits */
|
||||
CHAR_MAX, /* frac_digits */
|
||||
CHAR_MAX, /* p_cs_precedes */
|
||||
CHAR_MAX, /* p_sep_by_space */
|
||||
CHAR_MAX, /* n_cs_precedes */
|
||||
CHAR_MAX, /* n_sep_by_space */
|
||||
CHAR_MAX, /* p_sign_posn */
|
||||
CHAR_MAX, /* n_sign_posn */
|
||||
};
|
||||
|
||||
/*
|
||||
* Current locale conversion.
|
||||
*/
|
||||
struct lconv *__lconv = &C_lconv;
|
||||
@ -1,4 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2001 Alexey Zelkin
|
||||
* Copyright (c) 1991, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
@ -10,13 +11,6 @@
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
@ -32,10 +26,33 @@
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif
|
||||
static char rcsid[] = "$FreeBSD$";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <locale.h>
|
||||
#include <stdlib.h>
|
||||
#include "lmonetary.h"
|
||||
#include "lnumeric.h"
|
||||
|
||||
/*
|
||||
* The localeconv() function constructs a struct lconv from the current
|
||||
* monetary and numeric locales.
|
||||
*
|
||||
* Because localeconv() may be called many times (especially by library
|
||||
* routines like printf() & strtod()), the approprate members of the
|
||||
* lconv structure are computed only when the monetary or numeric
|
||||
* locale has been changed.
|
||||
*/
|
||||
int __mlocale_changed = 1;
|
||||
int __nlocale_changed = 1;
|
||||
|
||||
static char
|
||||
cnv(char *str) {
|
||||
return (char)strtol(str, NULL, 10);
|
||||
}
|
||||
|
||||
/*
|
||||
* Return the current locale conversion.
|
||||
@ -43,7 +60,46 @@ static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93";
|
||||
struct lconv *
|
||||
localeconv()
|
||||
{
|
||||
extern struct lconv *__lconv;
|
||||
static struct lconv ret;
|
||||
|
||||
return (__lconv);
|
||||
if (__mlocale_changed) {
|
||||
/* LC_MONETARY part */
|
||||
struct lc_monetary_T * mptr;
|
||||
|
||||
#define M_ASSIGN_STR(NAME) (ret.NAME = (char*)mptr->NAME)
|
||||
#define M_ASSIGN_CHAR(NAME) (ret.NAME = cnv((char*)mptr->NAME))
|
||||
|
||||
mptr = __get_current_monetary_locale();
|
||||
M_ASSIGN_STR(int_curr_symbol);
|
||||
M_ASSIGN_STR(currency_symbol);
|
||||
M_ASSIGN_STR(mon_decimal_point);
|
||||
M_ASSIGN_STR(mon_thousands_sep);
|
||||
M_ASSIGN_STR(mon_grouping);
|
||||
M_ASSIGN_STR(positive_sign);
|
||||
M_ASSIGN_STR(negative_sign);
|
||||
M_ASSIGN_CHAR(int_frac_digits);
|
||||
M_ASSIGN_CHAR(frac_digits);
|
||||
M_ASSIGN_CHAR(p_cs_precedes);
|
||||
M_ASSIGN_CHAR(p_sep_by_space);
|
||||
M_ASSIGN_CHAR(n_cs_precedes);
|
||||
M_ASSIGN_CHAR(n_sep_by_space);
|
||||
M_ASSIGN_CHAR(p_sign_posn);
|
||||
M_ASSIGN_CHAR(n_sign_posn);
|
||||
__mlocale_changed = 0;
|
||||
}
|
||||
|
||||
if (__nlocale_changed) {
|
||||
/* LC_NUMERIC part */
|
||||
struct lc_numeric_T * nptr;
|
||||
|
||||
#define N_ASSIGN_STR(NAME) (ret.NAME = (char*)nptr->NAME)
|
||||
|
||||
nptr = __get_current_numeric_locale();
|
||||
N_ASSIGN_STR(decimal_point);
|
||||
N_ASSIGN_STR(thousands_sep);
|
||||
N_ASSIGN_STR(grouping);
|
||||
__nlocale_changed = 0;
|
||||
}
|
||||
|
||||
return (&ret);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user