Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/stdlib/strfmon.c,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/stdlib/strfmon.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.8.2.1 retrieving revision 1.13 diff -u -p -r1.8.2.1 -r1.13 --- src/lib/libc/stdlib/strfmon.c 2012/04/17 00:05:25 1.8.2.1 +++ src/lib/libc/stdlib/strfmon.c 2017/11/27 23:54:28 1.13 @@ -1,4 +1,4 @@ -/* $NetBSD: strfmon.c,v 1.8.2.1 2012/04/17 00:05:25 yamt Exp $ */ +/* $NetBSD: strfmon.c,v 1.13 2017/11/27 23:54:28 maya Exp $ */ /*- * Copyright (c) 2001 Alexey Zelkin @@ -32,14 +32,11 @@ #if 0 __FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $"); #else -__RCSID("$NetBSD: strfmon.c,v 1.8.2.1 2012/04/17 00:05:25 yamt Exp $"); +__RCSID("$NetBSD: strfmon.c,v 1.13 2017/11/27 23:54:28 maya Exp $"); #endif #endif /* LIBC_SCCS and not lint */ -#if defined(__NetBSD__) #include "namespace.h" -#include -#endif #include #include @@ -47,11 +44,14 @@ __RCSID("$NetBSD: strfmon.c,v 1.8.2.1 20 #include #include #include +#include #include +#include #include #include #include -#include + +#include "setlocale_local.h" /* internal flags */ #define NEED_GROUPING 0x01 /* print digits grouped (default) */ @@ -104,15 +104,14 @@ __RCSID("$NetBSD: strfmon.c,v 1.8.2.1 20 groups++; \ } while (/* CONSTCOND */ 0) -static void __setup_vars(int, char *, char *, char *, const char **); -static int __calc_left_pad(int, char *); -static char *__format_grouped_double(double, int *, int, int, int); - -ssize_t -strfmon(char * __restrict s, size_t maxsize, const char * __restrict format, - ...) +static void __setup_vars(struct lconv *, int, char *, char *, char *, const char **); +static int __calc_left_pad(struct lconv *, int, char *); +static char *__format_grouped_double(struct lconv *, double, int *, int, int, int); + +static ssize_t +vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, + const char * __restrict format, va_list ap) { - va_list ap; char *dst; /* output destination pointer */ const char *fmt; /* current format poistion pointer */ struct lconv *lc; /* pointer to lconv structure */ @@ -136,9 +135,7 @@ strfmon(char * __restrict s, size_t maxs char *tmpptr; /* temporary vars */ int sverrno; - va_start(ap, format); - - lc = localeconv(); + lc = localeconv_l(loc); dst = s; fmt = format; asciivalue = NULL; @@ -244,8 +241,12 @@ strfmon(char * __restrict s, size_t maxs free(currency_symbol); if (flags & USE_INTL_CURRENCY) { currency_symbol = strdup(lc->int_curr_symbol); - if (currency_symbol != NULL) - space_char = *(currency_symbol+3); + if (currency_symbol != NULL && + strlen(currency_symbol) > 3) { + space_char = currency_symbol[3]; + currency_symbol[3] = '\0'; + } + } else currency_symbol = strdup(lc->currency_symbol); @@ -263,21 +264,21 @@ strfmon(char * __restrict s, size_t maxs /* fill left_prec with amount of padding chars */ if (left_prec >= 0) { - pad_size = __calc_left_pad((flags ^ IS_NEGATIVE), + pad_size = __calc_left_pad(lc, (flags ^ IS_NEGATIVE), currency_symbol) - - __calc_left_pad(flags, currency_symbol); + __calc_left_pad(lc, flags, currency_symbol); if (pad_size < 0) pad_size = 0; } - asciivalue = __format_grouped_double(value, &flags, + asciivalue = __format_grouped_double(lc, value, &flags, left_prec, right_prec, pad_char); if (asciivalue == NULL) goto end_error; /* errno already set */ /* to ENOMEM by malloc() */ /* set some variables for later use */ - __setup_vars(flags, &cs_precedes, &sep_by_space, + __setup_vars(lc, flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr); /* @@ -392,7 +393,6 @@ strfmon(char * __restrict s, size_t maxs } PRINT('\0'); - va_end(ap); free(asciivalue); free(currency_symbol); return (dst - s - 1); /* return size of put data except trailing '\0' */ @@ -411,20 +411,18 @@ end_error: if (currency_symbol != NULL) free(currency_symbol); errno = sverrno; - va_end(ap); return (-1); } static void -__setup_vars(int flags, char *cs_precedes, char *sep_by_space, +__setup_vars(struct lconv *lc, int flags, char *cs_precedes, char *sep_by_space, char *sign_posn, const char **signstr) { - struct lconv *lc = localeconv(); if ((flags & IS_NEGATIVE) && (flags & USE_INTL_CURRENCY)) { *cs_precedes = lc->int_n_cs_precedes; *sep_by_space = lc->int_n_sep_by_space; *sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn; - *signstr = (lc->negative_sign == '\0') ? "-" + *signstr = (*lc->negative_sign == '\0') ? "-" : lc->negative_sign; } else if (flags & USE_INTL_CURRENCY) { *cs_precedes = lc->int_p_cs_precedes; @@ -435,7 +433,7 @@ __setup_vars(int flags, char *cs_precede *cs_precedes = lc->n_cs_precedes; *sep_by_space = lc->n_sep_by_space; *sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn; - *signstr = (lc->negative_sign == '\0') ? "-" + *signstr = (*lc->negative_sign == '\0') ? "-" : lc->negative_sign; } else { *cs_precedes = lc->p_cs_precedes; @@ -444,23 +442,23 @@ __setup_vars(int flags, char *cs_precede *signstr = lc->positive_sign; } - /* Set defult values for unspecified information. */ + /* Set default values for unspecified information. */ if (*cs_precedes != 0) *cs_precedes = 1; if ((unsigned char)*sep_by_space == NBCHAR_MAX) - *sep_by_space = 0; + *sep_by_space = 1; if ((unsigned char)*sign_posn == NBCHAR_MAX) *sign_posn = 0; } static int -__calc_left_pad(int flags, char *cur_symb) { +__calc_left_pad(struct lconv *lc, int flags, char *cur_symb) { char cs_precedes, sep_by_space, sign_posn; const char *signstr; size_t left_chars = 0; - __setup_vars(flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr); + __setup_vars(lc, flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr); if (cs_precedes != 0) { left_chars += strlen(cur_symb); @@ -506,7 +504,7 @@ get_groups(int size, char *grouping) { /* convert double to ASCII */ static char * -__format_grouped_double(double value, int *flags, +__format_grouped_double(struct lconv *lc, double value, int *flags, int left_prec, int right_prec, int pad_char) { char *rslt; @@ -518,7 +516,6 @@ __format_grouped_double(double value, in int padded; - struct lconv *lc = localeconv(); char *grouping; char decimal_point; char thousands_sep; @@ -559,12 +556,11 @@ __format_grouped_double(double value, in /* make sure that we've enough space for result string */ bufsize = avalue_size * 2 + 1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ @@ -622,8 +618,35 @@ __format_grouped_double(double value, in memset(bufend, pad_char, (size_t) padded); } - bufsize = bufsize - (bufend - rslt) + 1; - memmove(rslt, bufend, bufsize); + memmove(rslt, bufend, bufend - rslt + 1); free(avalue); return (rslt); } + +ssize_t +strfmon(char * __restrict s, size_t maxsize, const char * __restrict format, + ...) +{ + ssize_t rv; + va_list ap; + + va_start(ap, format); + rv = vstrfmon_l(s, maxsize, _current_locale(), format, ap); + va_end(ap); + + return rv; +} + +ssize_t +strfmon_l(char * __restrict s, size_t maxsize, locale_t loc, + const char * __restrict format, ...) +{ + ssize_t rv; + va_list ap; + + va_start(ap, format); + rv = vstrfmon_l(s, maxsize, loc, format, ap); + va_end(ap); + + return rv; +}