mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-03-29  Geoff Clare  <gwc@unisoft.com>

	* stdlib/strfmon.c: Corrected problems with the code that
	sets default values for [np]_sep_by_space and
	[np]_sign_posn; also the new positive/negative alignment
	code from the previous patch was not quite right for
	[np]_sign_posn = 0.

	* localedata/tst-fmon.data: Changes corresponding to the
	two sets of fixes made to stdlib/strfmon.c.
This commit is contained in:
Ulrich Drepper 2000-03-31 06:57:36 +00:00
parent b5567b2af6
commit 9e9e0532a4
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-03-29 Geoff Clare <gwc@unisoft.com>
* stdlib/strfmon.c: Corrected problems with the code that
sets default values for [np]_sep_by_space and
[np]_sign_posn; also the new positive/negative alignment
code from the previous patch was not quite right for
[np]_sign_posn = 0.
* localedata/tst-fmon.data: Changes corresponding to the
two sets of fixes made to stdlib/strfmon.c.
2000-03-29 Jes Sorensen <jes@pcatls01.cern.ch>
* malloc/malloc.c: Declare bit flags UL so that they will not

25
localedata/tst-fmon.data
View File

@ -19,7 +19,7 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# The format of this file is pretty simple: Each line contains a test
# for strfmon. Fields are separated by TABs. Lines that start with a
# for strfmon. Fields are seperated by TABs. Lines that start with a
# '#' are comments and are ignored.
#
# Field Description
@ -36,8 +36,11 @@ C %n 0 0.00
C %% 0 %
C *%n* 1.23 *1.23*
C %9n 1.23 1.23
C %#9n 1.23 1.23
C %=*#9n 1.23 ********1.23
C %9n -1.23 -1.23
C %#9n 1.23 1.23
C %#9n -1.23 - 1.23
C %=*#9n 1.23 ********1.23
C %=*#9n -1.23 -********1.23
#
# check both the german locale and strfmon with that data
#
@ -80,12 +83,12 @@ de_DE.ISO-8859-1 %^#5.0n 3456.781 DM 3457
de_DE.ISO-8859-1 %^#5.4n 123.45 DM 123,4500
de_DE.ISO-8859-1 %^#5.4n -123.45 -DM 123,4500
de_DE.ISO-8859-1 %^#5.4n 3456.781 DM 3456,7810
de_DE.ISO-8859-1 %(#5n 123.45 DM 123,45
de_DE.ISO-8859-1 %(#5n 123.45 DM 123,45
de_DE.ISO-8859-1 %(#5n -123.45 (DM 123,45)
de_DE.ISO-8859-1 %(#5n 3456.781 DM 3.456,78
de_DE.ISO-8859-1 %!(#5n 123.45 123,45
de_DE.ISO-8859-1 %(#5n 3456.781 DM 3.456,78
de_DE.ISO-8859-1 %!(#5n 123.45 123,45
de_DE.ISO-8859-1 %!(#5n -123.45 ( 123,45)
de_DE.ISO-8859-1 %!(#5n 3456.781 3.456,78
de_DE.ISO-8859-1 %!(#5n 3456.781 3.456,78
#
# check both the en_US locale and strfmon with that data
# a lot of this checks are created from a strfmon(3) man-page.
@ -114,12 +117,12 @@ en_US.ISO-8859-1 %^#5.0n 3456.781 $ 3457
en_US.ISO-8859-1 %^#5.4n 123.45 $ 123.4500
en_US.ISO-8859-1 %^#5.4n -123.45 -$ 123.4500
en_US.ISO-8859-1 %^#5.4n 3456.781 $ 3456.7810
en_US.ISO-8859-1 %(#5n 123.45 $ 123.45
en_US.ISO-8859-1 %(#5n 123.45 $ 123.45
en_US.ISO-8859-1 %(#5n -123.45 ($ 123.45)
en_US.ISO-8859-1 %(#5n 3456.781 $ 3,456.78
en_US.ISO-8859-1 %!(#5n 123.45 123.45
en_US.ISO-8859-1 %(#5n 3456.781 $ 3,456.78
en_US.ISO-8859-1 %!(#5n 123.45 123.45
en_US.ISO-8859-1 %!(#5n -123.45 ( 123.45)
en_US.ISO-8859-1 %!(#5n 3456.781 3,456.78
en_US.ISO-8859-1 %!(#5n 3456.781 3,456.78
en_US.ISO-8859-1 %#5n 123.45 $ 123.45
en_US.ISO-8859-1 %#5n -123.45 -$ 123.45
en_US.ISO-8859-1 %#5n 3456.781 $ 3,456.78

23
stdlib/strfmon.c
View File

@ -193,14 +193,8 @@ __strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...)
va_end (ap);
return -1;
}
if (*_NL_CURRENT (LC_MONETARY, P_SIGN_POSN) == '\0')
p_sign_posn = 1;
else
p_sign_posn = *_NL_CURRENT (LC_MONETARY, P_SIGN_POSN);
if (*_NL_CURRENT (LC_MONETARY, N_SIGN_POSN) == '\0')
n_sign_posn = 1;
else
n_sign_posn = *_NL_CURRENT (LC_MONETARY, N_SIGN_POSN);
p_sign_posn = *_NL_CURRENT (LC_MONETARY, P_SIGN_POSN);
n_sign_posn = *_NL_CURRENT (LC_MONETARY, N_SIGN_POSN);
continue;
case '(': /* Use ( ) for negative sign. */
if (n_sign_posn != -1)
@ -385,10 +379,14 @@ __strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...)
cs_precedes = 1;
if (other_cs_precedes != 0)
other_cs_precedes = 1;
if (sep_by_space == 127)
if (sep_by_space == CHAR_MAX)
sep_by_space = 0;
if (other_sep_by_space == 127)
if (other_sep_by_space == CHAR_MAX)
other_sep_by_space = 0;
if (sign_posn == CHAR_MAX)
sign_posn = 1;
if (other_sign_posn == CHAR_MAX)
other_sign_posn = 1;
/* Set the left precision and padding needed for alignment */
if (left_prec == -1)
@ -404,7 +402,10 @@ __strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...)
int sign_precedes = 0;
int other_sign_precedes = 0;
left_pad = 0;
if (sign_posn == 0 && !is_negative)
left_pad = 1;
else
left_pad = 0;
if (!cs_precedes && other_cs_precedes)
{