From 39e16978c3b4ac8eaf2201fac56316623910d9da Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 29 Aug 1997 01:19:12 +0000 Subject: Update. 1997-08-29 02:36 Ulrich Drepper * Makefile (version-info.h): Use ISO form for the date. * catgets/catgetsinfo.h: Include . (struct catalog_obj): Add lock field. (__open_catalog): Remove second parameter from prototype. * catgets/catgets.c (catopen): Initialize lock field. (catgets): Don't pass second parameter to __open_catalog. * catgets/gencat.c: Initialize lock field and don't pass second parameter to __open_catalog. * catgets/open_catalog.c (__open_catalog): Decide about use of path by examining path in struct, not based on extra argument. Acquire a the lock before trying to load the catalog and release it before returning. * csu/Makefile (abi-tag.h): Make sure target directory exists. * io/Makefile (headers): Add bits/poll.h. * io/sys/poll.h: Remove definitions of POLL* constants. Include . * sysdeps/generic/bits/poll.h: New file. * sysdeps/unix/sysv/linux/bits/poll.h: New file. * sysdeps/unix/sysv/linux/m68k/bits/poll.h: New file. * sysdeps/unix/sysv/linux/mips/bits/poll.h: New file. * sysdeps/unix/sysv/linux/sparc/bits/poll.h: New file. * libio/fileops.c (_IO_file_read, _IO_file_write): Remove dead code. * malloc/obstack.c: Add casts to keep very verbose compilers on 64bit machine quiet. * nss/Makefile (libnss_db.so): Find libdb.so in db2 directory. 1997-08-28 17:30 Ulrich Drepper * catgets/catgets.c (catopen): Correctly determine length of string in NLSPATH evironment variable. Patch by HJ Lu . 1997-08-27 23:19 Richard Henderson * sysdeps/generic/dl-sysdep.c (DL_FIND_ARG_COMPONENTS): Provide default macro to track down arguments from stack start. (_dl_sysdep_start): Use it. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Truncate to simply providing a special DL_FIND_ARG_COMPONENTS and including the next file up the line. * sysdeps/powerpc/e_sqrt.c: Move contents to w_sqrt.c and provide stub. * sysdeps/powerpc/e_sqrtf.c: Likewise. * sysdeps/powerpc/s_copysignf.S: Provide empty file; symbol is with the double precision version. * sysdeps/powerpc/s_fabsf.S: Likewise. * sysdeps/powerpc/s_isnanf.S: Likewise. --- localedata/CHECKSUMS | 8 ++-- localedata/Makefile | 7 +-- localedata/README | 12 ++--- localedata/fmon-de_DE.exp | 30 +++++++++++++ localedata/fmon-en_US.exp | 30 +++++++++++++ localedata/locales/cs_CZ | 112 ++++++++++++++++++++-------------------------- localedata/sort-test.sh | 2 +- localedata/tst-fmon.c | 65 +++++++++++++++++++++++++++ localedata/tst-fmon.sh | 32 +++++++++++++ 9 files changed, 221 insertions(+), 77 deletions(-) create mode 100644 localedata/fmon-de_DE.exp create mode 100644 localedata/fmon-en_US.exp create mode 100644 localedata/tst-fmon.c create mode 100755 localedata/tst-fmon.sh (limited to 'localedata') diff --git a/localedata/CHECKSUMS b/localedata/CHECKSUMS index 7c71e4e..0c01ab2 100644 --- a/localedata/CHECKSUMS +++ b/localedata/CHECKSUMS @@ -156,6 +156,7 @@ db3c60025eb80244d70bf7889f058055 charmaps/T.101-G2 572baa84bd05d4b236b7e2fb211d0dfd charmaps/T.61-7BIT 1e39e36aa7544014059b0aa8381ab051 charmaps/T.61-8BIT 81c8e12a75dff4371ce82773d670cd6d charmaps/VIDEOTEX-SUPPL +910e8174540ecba1ac61b5f27f6dc359 locales/cs_CZ 45ade09ead9fd385d58504bfc005ecab locales/da_DK 249894e0554d46d1fbdae4a5fb8cc20e locales/de_AT b3628f73e00bb655a5e96bcc2331893c locales/de_BE @@ -175,14 +176,13 @@ bda978c8b0e379d57a8599edfdb2e858 locales/fi_FI a25300033ea6c619a4e15051f14aa65e locales/fo_FO 02ca55b19338f94530f0b60999638ed4 locales/fr_BE 655c7b8713b9aad20014df2c27928cb7 locales/fr_CA -8e60885c3fda81bc7773f139657974f3 locales/fr_CA,2.13 -8a76a0e3ea2923367fdbab78a6bc67cb locales/fr_CA,2.13.orig +d5bec15a74c4107a77a46fe185883574 locales/fr_CA,2.13 19403a5cd69a9ad658b173859eb022ef locales/fr_CH 48d8981b117e72c5eb2e9c181cbd7d2b locales/fr_FR cc1b77cf4cdc4488a99637e730e0f57f locales/fr_LU 1987b72e766038b0f475165c994d1469 locales/ga_IE be2ef06fd9a4b4def515216972fe9250 locales/gr_GR -9e2de7fe4b41f9bad952cdc5bfd77cd4 locales/hr_HR +e7ad1d62ccf958b04f018cbd96ede3b2 locales/hr_HR 7f35d03bbe29b53831674704f8b307af locales/hu_HU 1a8b95f6663b7a99703a32c6135d8896 locales/is_IS 47620dbc36bf3ffe04b32dd16b7aae3c locales/it_IT @@ -194,7 +194,7 @@ d5394568c45886788becf67b54bc916e locales/lt_LT e71081f29649cfd4ac8563ae1f7932fa locales/nl_NL 3a0720088defd80baa0623990c6d196a locales/no_NO 6d1bb18d4271cd712e5dc24eec4706b9 locales/pl_PL -b07ce7e57dda4687f2a83cd5ec79a3e0 locales/POSIX +bbbcbd6f0a484ec25d8a592217a76ebb locales/POSIX 509fc74fdd394f6876358d357f955645 locales/pt_BR 7c2463bcee68bccde3145642a34a8ef1 locales/pt_PT 32c766f85eb82823856485e5802dce19 locales/ro_RO diff --git a/localedata/Makefile b/localedata/Makefile index 17dd43c..87f8cba 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -30,9 +30,9 @@ charmaps := $(filter-out $(addprefix charmaps/, CVS RCS %~), \ locales := $(filter-out $(addprefix locales/, CVS RCS %~), \ $(wildcard locales/*)) -test-srcs := collate-test xfrm-test +test-srcs := collate-test xfrm-test tst-fmon test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1 - +fmon-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 # Get $(inst_i18ndir) defined. include ../Makeconfig @@ -48,6 +48,7 @@ $(inst_i18ndir)/locales/%: locales/%; $(do-install) ifeq (no,$(cross-compiling)) -tests: $(objpfx)collate-test $(objpfx)xfrm-test +tests: $(objpfx)collate-test $(objpfx)xfrm-test $(objpfx)tst-fmon $(SHELL) -e sort-test.sh $(common-objpfx) $(test-input) + $(SHELL) -e tst-fmon.sh $(common-objpfx) $(fmon-input) endif diff --git a/localedata/README b/localedata/README index efd375d..3ef7553 100644 --- a/localedata/README +++ b/localedata/README @@ -2,7 +2,7 @@ and POSIX character set descriptions -Ulrich Drepper Time-stamp: <1997/02/12 22:13:01 drepper> +Ulrich Drepper Time-stamp: <1997/06/04 01:36:26 drepper> drepper@cygnus.com @@ -34,10 +34,10 @@ desired data should happen like this: localedef -i fr_CA -f ISO-8859-1 fr_CA This will place the 6 output files in the appropriate directory where -the GNU libc functions can find them. Please note that you need the -rights to write to this directory ($(prefix)/share/locale, where +the GNU libc functions can find them. Please note that you need +permission to write to this directory ($(prefix)/share/locale, where $(prefix) is the value you specified while configuring GNU libc). If -you do not have the necessary rights, you can write the files into an +you do not have the necessary permissions, you can write the files into an arbitrary directory by giving a path including a '/' character instead of `fr_CA'. E.g., to put the new files in a subdirectory of the current directory simply use @@ -48,7 +48,7 @@ How to use these data files is described in the GNU libc manual, especially in the section describing the `setlocale' function. -The here contained files can originally be found at +The files contained here were originally from ftp://dkuug.dk/i18n/WG15-collection @@ -60,7 +60,7 @@ data or want to add something please contact and Ulrich Drepper -Please make sure your corrections are relativ to the originally +Please make sure your corrections are relative to the originally distributed files. Consult the CHECKSUMS file which contains the MD5 sums for all data files. diff --git a/localedata/fmon-de_DE.exp b/localedata/fmon-de_DE.exp new file mode 100644 index 0000000..77cb9dd --- /dev/null +++ b/localedata/fmon-de_DE.exp @@ -0,0 +1,30 @@ +" DM123,45" +"-DM123,45" +" DM3.456,78" +" DM123,45" +" -DM123,45" +" DM3.456,78" +" DM 123,45" +"-DM 123,45" +" DM 3.456,78" +" DM***123,45" +"-DM***123,45" +" DM*3.456,78" +" DM000123,45" +"-DM000123,45" +" DM03.456,78" +" DM 123,45" +"-DM 123,45" +" DM 3456,78" +" DM 123" +"-DM 123" +" DM 3457" +" DM 123,4500" +"-DM 123,4500" +" DM 3456,7810" +" DM 123,45 " +"(DM 123,45)" +" DM 3.456,78 " +" 123,45 " +"( 123,45)" +" 3.456,78 " diff --git a/localedata/fmon-en_US.exp b/localedata/fmon-en_US.exp new file mode 100644 index 0000000..a740c72 --- /dev/null +++ b/localedata/fmon-en_US.exp @@ -0,0 +1,30 @@ +" $123.45" +"-$123.45" +" $3,456.78" +" $123.45" +" -$123.45" +" $3,456.78" +" $ 123.45" +"-$ 123.45" +" $ 3,456.78" +" $***123.45" +"-$***123.45" +" $*3,456.78" +" $000123.45" +"-$000123.45" +" $03,456.78" +" $ 123.45" +"-$ 123.45" +" $ 3456.78" +" $ 123" +"-$ 123" +" $ 3457" +" $ 123.4500" +"-$ 123.4500" +" $ 3456.7810" +" $ 123.45 " +"($ 123.45)" +" $ 3,456.78 " +" 123.45 " +"( 123.45)" +" 3,456.78 " diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ index ba15957..6713adc 100644 --- a/localedata/locales/cs_CZ +++ b/localedata/locales/cs_CZ @@ -2,9 +2,9 @@ escape_char / comment_char % % % Czech Language Locale for Czech -% Source: -% Address: U školy 292 Without diactitical chars: U skoly 292 -% 783 72 Velký Týnec 782 72 Velky Tynec +% Source: +% Address: U školy 292 Without diactitical chars: U skoly 292 +% 783 72 Velký Týnec 782 72 Velky Tynec % Contact: Vladimir Michl % Email: Vladimir.Michl@upol.cz % Tel: @@ -19,13 +19,15 @@ comment_char % % Charset: ISO_8859-2:1987 % Distribution and use is free, also % for commercial purposes. +% 1997-08-20: Michael Mráka +% Změny zejména v sekci LC_TIME. (Changes especially in LC_TIME section.) + % zpracování: %% localedef -c -i -f "ISO_8859-2:1987" 'cs_CZ.ISO-8859-2' %% pokud se podaří odstranit chyby, lze -c vynechat. -%% pro úspěšné přeložení je třeba mít kolekci lokalizací WG15collection. -%% Tuto rozbalit do adresáře +%% pro úspěšné přeložení je třeba mít kolekci lokalizací WG15collection. Tuto rozbalit do adresáře %% /usr/share/i18n %% Lokalizace se pak budou tvořit v adresáři /usr/share/locale @@ -42,9 +44,9 @@ comment_char % LC_COLLATE % Definice písmene ch -collating-element from "" -collating-element from "" -collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" collating-symbol collating-symbol @@ -65,11 +67,10 @@ collating-symbol collating-symbol collating-symbol -order_start forward;backward/ - ;forward;position +order_start forward;forward;forward;forward - + @@ -87,7 +88,7 @@ order_start forward;backward/ -% +% ;;;IGNORE IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; @@ -202,8 +203,8 @@ order_start forward;backward/ IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; -UNDEFINED IGNORE;IGNORE;IGNORE - +UNDEFINED IGNORE;IGNORE;IGNORE;IGNORE + <0> <0>;<0>;IGNORE;IGNORE <1> <1>;<1>;IGNORE;IGNORE <2> <2>;<2>;IGNORE;IGNORE @@ -267,9 +268,9 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -385,13 +386,10 @@ END LC_COLLATE LC_CTYPE -digit <0>;<1>;<2>;<3>;<4>;/ - <5>;<6>;<7>;<8>;<9> +digit <0>;<1>;<2>;<3>;<4>;<5>;<6>;<7>;<8>;<9> -xdigit <0>;<1>;<2>;<3>;<4>;/ - <5>;<6>;<7>;<8>;<9>;/ - ;...;;/ - ;...; +xdigit <0>;<1>;<2>;<3>;<4>;<5>;<6>;<7>;<8>;<9>;/ + ;...;;;...; punct ;...;;/ <:>;...;;/ @@ -406,7 +404,7 @@ blank ;; space ;;;;/ ;; - + cntrl ;;;;;;/ ;;;;;;/ ;;;;
;;/ @@ -419,7 +417,8 @@ cntrl ;;;;;;/ ;;;;;;/ ;;;; -alpha ;...;;/ + +upper ;...;;/ ;/ ;/ ;/ @@ -459,8 +458,9 @@ alpha ;...;;/ ;/ ;/ ;/ - ;/ - ;...;;/ + + +lower ;...;;/ ;/ ;/ ;/ @@ -503,7 +503,7 @@ alpha ;...;;/ ;/ -upper ;...;;/ +alpha ;...;;/ ;/ ;/ ;/ @@ -543,9 +543,8 @@ upper ;...;;/ ;/ ;/ ;/ - - -lower ;...;;/ + ;/ + ;...;;/ ;/ ;/ ;/ @@ -588,7 +587,6 @@ lower ;...;;/ ;/ - toupper (,);(,);(,);(,);(,);(,);/ (,);(,);(,);(,);(,);(,);/ (,);(,);(,);(

,

";/ "";/ @@ -750,18 +749,22 @@ day "";/ "

";/ "" -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "

";/ - "";/ - "";/ - "";/ - "

" +%abmon "";"";"";"";"";/ +% "";"";"

";"";"";/ +% "";"

" +% Obávám se, že čeština žádné zkratky pro měsíce nezná :-) +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "

";/ + "";/ + "";/ + "

";/ + "

" mon "";/ "";/ @@ -777,33 +780,16 @@ mon "";/ "

" -d_t_fmt "<%><%><.><%><%><%><:><%><:><%><%>" -%d_t_fmt "<%><.><%><.><%><%><%>" +d_t_fmt "<%><%><.><%><%><,><%><:><%><:><%><%>" d_fmt "<%><.><%><.><%>" -%d_fmt "<%><.><%><.><%>" t_fmt "<%><:><%><:><%>" -%t_fmt "<%>" t_fmt_ampm "<%><:><%><:><%>" -%t_fmt_ampm "" -%am_pm "am";"pm" am_pm "";"" -% Zde nevím, co následující položky znamenají -% V případě potřeby prosím opravte - -%era "<%>" - -%era_year "<%>" - -%alt_digits "<0>";"<1>";"<2>";"<3>";"<4>";/ -% "<5>";"<6>";"<7>";"<8>" - -%era_d_fmt "<%><%><%>" - END LC_TIME %% END OF LOCALIZATION FILE for cs_CZ.ISO-8859-2 diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 8197ac0..8f9bb55 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -35,5 +35,5 @@ done exit $status # Local Variables: -# mode:ksh +# mode:shell-script # End: diff --git a/localedata/tst-fmon.c b/localedata/tst-fmon.c new file mode 100644 index 0000000..4b71469 --- /dev/null +++ b/localedata/tst-fmon.c @@ -0,0 +1,65 @@ +#include +#include +#include + +static int +check (const char *fmt, double n) +{ + int result; + char buf[1000]; + + result = strfmon (buf, sizeof buf, fmt, n) == -1; + + printf ("\"%s\"\n", buf); + return result; +} + +int +main (void) +{ + int result = 0; + + setlocale (LC_ALL, ""); + + result |= check ("%n", 123.45); + result |= check ("%n", -123.45); + result |= check ("%n", 3456.781); + + result |= check ("%11n", 123.45); + result |= check ("%11n", -123.45); + result |= check ("%11n", 3456.781); + + result |= check ("%#5n", 123.45); + result |= check ("%#5n", -123.45); + result |= check ("%#5n", 3456.781); + + result |= check ("%=*#5n", 123.45); + result |= check ("%=*#5n", -123.45); + result |= check ("%=*#5n", 3456.781); + + result |= check ("%=0#5n", 123.45); + result |= check ("%=0#5n", -123.45); + result |= check ("%=0#5n", 3456.781); + + result |= check ("%^#5n", 123.45); + result |= check ("%^#5n", -123.45); + result |= check ("%^#5n", 3456.781); + + result |= check ("%^#5.0n", 123.45); + result |= check ("%^#5.0n", -123.45); + result |= check ("%^#5.0n", 3456.781); + + result |= check ("%^#5.4n", 123.45); + result |= check ("%^#5.4n", -123.45); + result |= check ("%^#5.4n", 3456.781); + + result |= check ("%(#5n", 123.45); + result |= check ("%(#5n", -123.45); + result |= check ("%(#5n", 3456.781); + + result |= check ("%!(#5n", 123.45); + result |= check ("%!(#5n", -123.45); + result |= check ("%!(#5n", 3456.781); + + return result; +} diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh new file mode 100755 index 0000000..cac9917 --- /dev/null +++ b/localedata/tst-fmon.sh @@ -0,0 +1,32 @@ +#! /bin/sh + +common_objpfx=$1; shift +lang=$* + +here=`pwd` + +# Generate data files. +for l in $lang; do + cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` + cn=locales/$cns + fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'` + LD_LIBRARY_PATH=$common_objpfx I18NPATH=./locales ${common_objpfx}elf/ld.so \ + ${common_objpfx}locale/localedef --quiet -i $cn -f $fn \ + ${common_objpfx}localedata/$cns +done + +# Run the tests. +for l in $lang; do + cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` + + LOCPATH=$common_objpfx/localedata LC_ALL=$cns \ + LD_LIBRARY_PATH=$common_objpfx $common_objpfx/elf/ld.so \ + $common_objpfx/localedata/tst-fmon \ + > $common_objpfx/localedata/fmon-$cns.out || status=1 + cmp -s fmon-$cns.exp $common_objpfx/localedata/fmon-$cns.out || status=1 +done + +exit $status +# Local Variables: +# mode:shell-script +# End: -- cgit v1.1

);(,);(,);/ @@ -687,7 +685,7 @@ END LC_CTYPE %% ekvivalenty yes/no %% ------------------------- -LC_MESSAGES +LC_MESSAGES yesexpr "<<(><)/>><.><*>" noexpr "<<(><)/>><.><*>" @@ -734,6 +732,7 @@ END LC_NUMERIC LC_TIME + abday "";/ "