OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2004-01-01  Petter Reinholdtsen  <pere@hungry.com>

	* tst-fmon.data: Add simple test to check left justified currency
	values in the C locale.

	* tst-fmon.sh: Don't print every line.  The program already prints
	the failing ones.
This commit is contained in:
Ulrich Drepper 2004-01-02 00:59:51 +00:00
parent 23d99b3c2f
commit 3451e12ee3
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
localedata/ChangeLog
View File

@ -1,5 +1,13 @@
2004-01-01 Petter Reinholdtsen <pere@hungry.com>
* tst-fmon.data: Add simple test to check left justified currency
values in the C locale.
2004-01-01 Ulrich Drepper <drepper@redhat.com>
* tst-fmon.sh: Don't print every line. The program already prints
the failing ones.
* tst-fmon.c (main): Fix typo in message.
2003-07-06 Petter Reinholdtsen <pere@hungry.com>

4
localedata/tst-fmon.data
View File

@ -44,6 +44,10 @@ 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 %-14#5.4n 1.23 " 1.2300 "
C %-14#5.4n -1.23 "- 1.2300 "
C %-14#5.4n 123.45 " 123.4500 "
C %-14#5.4n 123456 " 123456.0000 "
#
# check both the german locale and strfmon with that data
#

18
localedata/tst-fmon.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Testing the implementation of strfmon(3).
# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
# Copyright (C) 1996-1998, 2000, 2003, 2004 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
#
@ -45,17 +45,11 @@ while IFS=" " read locale format value expect; do
case "$locale" in '#'*) continue ;; esac
if [ -n "$format" ]; then
expect=`echo "$expect" | sed 's/^\"\(.*\)\"$/\1/'`
if LOCPATH=${common_objpfx}localedata \
GCONV_PATH=${common_objpfx}/iconvdata \
${run_program_prefix} ${common_objpfx}localedata/tst-fmon \
"$locale" "$format" "$value" "$expect" ; then
echo "Locale: \"${locale}\" Format: \"${format}\"" \
"Value: \"${value}\" Expected: \"${expect}\" passed"
else
errcode=$?
echo "Locale: \"${locale}\" Format: \"${format}\"" \
"Value: \"${value}\" Expected: \"${expect}\" failed"
fi
LOCPATH=${common_objpfx}localedata \
GCONV_PATH=${common_objpfx}/iconvdata \
${run_program_prefix} ${common_objpfx}localedata/tst-fmon \
"$locale" "$format" "$value" "$expect" ||
errcode=$?
fi
done < $datafile

4
stdlib/strfmon.c
View File

@ -1,5 +1,5 @@
/* Formatting a monetary value according to the current locale.
Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>
and Jochen Hein <Jochen.Hein@informatik.TU-Clausthal.de>, 1996.
@ -570,7 +570,7 @@ __strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...)
info.is_long = 0;
info.alt = 0;
info.space = 0;
info.left = left;
info.left = 0;
info.showsign = 0;
info.group = group;
info.pad = pad;