From 4cfde89657ffccbfb2801986d767964da400c7ec Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Jun 2003 07:39:03 +0000 Subject: Update. 2003-06-16 Ulrich Drepper * elf/rtld.c (dl_main): Use l_map_start not l_addr in Phdr computation so that prelinking wroks. * inet/netinet/ip6.h (IP6OPT_PAD1, IP6OPT_PADN): Define. --- localedata/locales/an_ES | 126 ++++++++++++++++++++++++++++++++++++++++++++++ localedata/locales/is_IS | 58 ++++++++++----------- localedata/tst-fmon.c | 3 -- localedata/tst-fmon.sh | 13 ++--- localedata/tst-numeric.sh | 12 +++-- 5 files changed, 169 insertions(+), 43 deletions(-) create mode 100644 localedata/locales/an_ES (limited to 'localedata') diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES new file mode 100644 index 0000000000..30eafaf741 --- /dev/null +++ b/localedata/locales/an_ES @@ -0,0 +1,126 @@ +comment_char % +escape_char / +% +% Aragonese Language Locale for Spain +% Source: +% Address: +% Contact: Jordi Mallach Pérez +% Email: jordi@gnu.org +% Language: an +% Territory: ES +% Revision: 1.0 +% Date: 2003-05-22 +% Application: general +% Users: general +% Charset: ISO-8859-1 +% +% This file is under the +% GNU General Public License. +% Based in the gl_ES Locale + +LC_IDENTIFICATION +title "Aragonese locale for Spain" +source "" +address "" +contact "Jordi Mallach Pérez" +email "bug-glibc@gnu.org" +tel "" +fax "" +language "an" +territory "ES" +revision "1.0" +date "2003-06-15" +% +category "i18n:1999";LC_IDENTIFICATION +category "i18n:1999";LC_CTYPE +category "i18n:1999";LC_COLLATE +category "i18n:1999";LC_TIME +category "posix:1993";LC_NUMERIC +category "i18n:1999";LC_MONETARY +category "i18n:1999";LC_MESSAGES +category "i18n:1999";LC_PAPER +category "i18n:1999";LC_NAME +category "i18n:1999";LC_ADDRESS +category "i18n:1999";LC_TELEPHONE +END LC_IDENTIFICATION + +LC_COLLATE +copy "es_ES" +END LC_COLLATE + +LC_CTYPE +copy "es_ES" +END LC_CTYPE + +LC_MESSAGES +yesexpr "" +noexpr "" +END LC_MESSAGES + +LC_MONETARY +copy "es_ES" +END LC_MONETARY + +LC_NUMERIC +copy "es_ES" +END LC_NUMERIC + +LC_TIME +abday "";"";/ + "";"";/ + "";"";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"" +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +d_t_fmt "" +d_fmt "" +t_fmt "" +am_pm "";"" +t_fmt_ampm "" +date_fmt "/ +/ +" +END LC_TIME + +LC_PAPER +copy "es_ES" +END LC_PAPER + +LC_TELEPHONE +copy "es_ES" +END LC_TELEPHONE + +LC_MEASUREMENT +copy "es_ES" +END LC_MEASUREMENT + +LC_NAME +copy "es_ES" +END LC_NAME + +LC_ADDRESS +copy "es_ES" +END LC_ADDRESS diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS index a62aa35f11..d2da32b61b 100644 --- a/localedata/locales/is_IS +++ b/localedata/locales/is_IS @@ -2185,35 +2185,35 @@ grouping 3;3 END LC_NUMERIC LC_TIME -abday "";"";/ - "";"";/ - "";"";/ - "" -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abmon "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +abday "";"";/ + "";"";/ + "";"";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"" +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" d_t_fmt "" d_fmt "" t_fmt "" diff --git a/localedata/tst-fmon.c b/localedata/tst-fmon.c index af87335972..091a057a0f 100644 --- a/localedata/tst-fmon.c +++ b/localedata/tst-fmon.c @@ -42,15 +42,12 @@ int main (int argc, char *argv[]) { char *s = malloc (201); - double monval; if (setlocale (LC_MONETARY, argv[1]) == NULL) { fprintf (stderr, "setlocale(LC_MONETARY, \"%s\"): %m\n", argv[1]); exit (EXIT_SETLOCALE); } - /* This is locale-dependent! see setlocale(3) for details */ - monval = strtod (argv[3], NULL); if (strfmon (s, 200, argv[2], (double) atof (argv[3])) == -1) { diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index e58db1d344..c8b6d69949 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -39,25 +39,26 @@ for cns in `cd ./tst-fmon-locales && ls tstfmon_*`; do done # Run the tests. +errcode=0 # There's a TAB for IFS while IFS=" " read locale format value expect; do case "$locale" in '#'*) continue ;; esac if [ -n "$format" ]; then - LOCPATH=${common_objpfx}localedata \ - GCONV_PATH=${common_objpfx}/iconvdata \ - ${run_program_prefix} ${common_objpfx}localedata/tst-fmon \ - "$locale" "$format" "$value" "$expect" - if [ $? -eq 0 ]; then + 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}\" Expect: \"${expect}\" passed" else + errcode=$? echo "Locale: \"${locale}\" Format: \"${format}\"" \ "Value: \"${value}\" Expect: \"${expect}\" failed" fi fi done < $datafile -exit $? +exit $errcode # Local Variables: # mode:shell-script # End: diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh index f590dfd042..f27eacd078 100644 --- a/localedata/tst-numeric.sh +++ b/localedata/tst-numeric.sh @@ -25,25 +25,27 @@ run_program_prefix=$2 datafile=$3 # Run the tests. +errcode=0 # There's a TAB for IFS while IFS=" " read locale format value expect; do case "$locale" in '#'*) continue ;; esac if [ -n "$format" ]; then - LOCPATH=${common_objpfx}localedata \ - GCONV_PATH=${common_objpfx}/iconvdata \ - ${run_program_prefix} ${common_objpfx}localedata/tst-numeric \ + if LOCPATH=${common_objpfx}localedata \ + GCONV_PATH=${common_objpfx}/iconvdata \ + ${run_program_prefix} ${common_objpfx}localedata/tst-numeric \ "$locale" "$format" "$value" "$expect" - if [ $? -eq 0 ]; then + then echo "Locale: \"${locale}\" Format: \"${format}\"" \ "Value: \"${value}\" Expect: \"${expect}\" passed" else + errcode=$? echo "Locale: \"${locale}\" Format: \"${format}\"" \ "Value: \"${value}\" Expect: \"${expect}\" failed" fi fi done < $datafile -exit $? +exit $errcode # Local Variables: # mode:shell-script # End: -- cgit v1.2.3