From 3db52d94e2dcd03925664df6a09e9676ad1f2baf Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 8 Mar 1998 15:26:29 +0000 Subject: Update. 1998-03-08 14:58 Ulrich Drepper * Makeconfig (nisobjdir): Set to path to nis directory. (rpath-link): Add nisobjdir. Patch by Sven Verdoolaege . * elf/Makefile: Pretty print. * elf/dl-lookup.c: Include unistd.h. * elf/dl-runtime.c: Likewise. * localedata/Makefile (test-srcs): Add tst-rpmatch. (distribute): Add tst-rpmatch.sh. (tests): Add tst-rpmatch to dependency list and run tst-rpmatch.sh. New tests for rpmatch function by Jochen Hein . * localedata/tst-rpmatch.c: New file. * localedata/tst-rpmatch.sh: New file. * localedata/locales/de_DE: Correct yesexpr and noexpr. * localedata/locales/de_AT: Likewise. * posix/getopt.c: Update contact address. * posix/getopt1.c: Pretty print. * sysdeps/generic/libc-start.c: Do most of the initialization now here instead of in start.S. * sysdeps/unix/sysv/linux/libc-start.c: Likewise. * sysdeps/i386/elf/start.S: Remove most of the initialization code. * sysdeps/unix/sysv/linux/i386/profil-counter.h: No need for profil_counter to be public. 1998-03-08 13:06 Tim Waugh * posix/wordexp.c (parse_arith): Now works for negative numbers too. (parse_param): Coded parameter length expansion (${#var}). (parse_param): Handling for "=", "+", "-", and the ":" versions added. (parse_param): Cleaned up (fixed) error handling. * posix/wordexp-test.c: IFS now includes non-whitespace character (comma). Added more tests. --- localedata/ChangeLog | 5 +++ localedata/Makefile | 8 +++-- localedata/locales/de_AT | 4 +-- localedata/locales/de_DE | 4 +-- localedata/locales/ru_RU | 78 +++++++++++++++++++++++------------------------ localedata/tst-rpmatch.c | 37 ++++++++++++++++++++++ localedata/tst-rpmatch.sh | 64 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 154 insertions(+), 46 deletions(-) create mode 100644 localedata/tst-rpmatch.c create mode 100755 localedata/tst-rpmatch.sh (limited to 'localedata') diff --git a/localedata/ChangeLog b/localedata/ChangeLog index ed25564..e968fe0 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +1998-03-08 Ulrich Drepper + + * locales/ru_RU: Correct inconsistencies in mon data. + Patch by Alexander V. Lukyanov . + 1997-10-09 04:56 Ulrich Drepper * locales/is_IS: Update from Debian version. diff --git a/localedata/Makefile b/localedata/Makefile index 4e26d15..d62a6a3 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -30,7 +30,7 @@ charmaps := $(filter-out $(addprefix charmaps/, CVS RCS %~), \ locales := $(filter-out $(addprefix locales/, CVS RCS %~), \ $(wildcard locales/*)) -test-srcs := collate-test xfrm-test tst-fmon +test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1 test-output := $(foreach s, .out .xout, \ $(addsuffix $s, $(basename $(test-input)))) @@ -43,7 +43,7 @@ ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \ distribute := CHECKSUMS tst-fmon.sh tst-fmon.data ChangeLog sort-test.sh \ README mnemonic.ds fr_CA,2.13.in de_DE.in da_DK.in \ - $(charmaps) $(locales) $(ld-test-srcs) + $(charmaps) $(locales) $(ld-test-srcs) tst-rpmatch.sh # Get $(inst_i18ndir) defined. include ../Makeconfig @@ -59,8 +59,10 @@ $(inst_i18ndir)/locales/%: locales/%; $(do-install) ifeq (no,$(cross-compiling)) -tests: $(objpfx)collate-test $(objpfx)xfrm-test $(objpfx)tst-fmon +tests: $(objpfx)collate-test $(objpfx)xfrm-test $(objpfx)tst-fmon \ + $(objpfx)tst-rpmatch $(SHELL) -e sort-test.sh $(common-objpfx) $(test-input) $(SHELL) -e tst-fmon.sh $(common-objpfx) tst-fmon.data $(SHELL) -e tst-locale.sh $(common-objpfx) + $(SHELL) -e tst-rpmatch.sh $(common-objpfx) endif diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT index 2c75d68..a464217 100644 --- a/localedata/locales/de_AT +++ b/localedata/locales/de_AT @@ -27,8 +27,8 @@ copy "en_DK" END LC_COLLATE LC_MESSAGES -yesexpr "<<(><)/>><.><*>" -noexpr "<<(><)/>><.><*>" +yesexpr "<'/>><<(><)/>><.><*>" +noexpr "<'/>><<(><)/>><.><*>" END LC_MESSAGES LC_MONETARY diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE index 6308ff3..b13f52f 100644 --- a/localedata/locales/de_DE +++ b/localedata/locales/de_DE @@ -2138,8 +2138,8 @@ copy "en_DK" END LC_CTYPE LC_MESSAGES -yesexpr "<<(><)/>><.><*>" -noexpr "<<(><)/>><.><*>" +yesexpr "<'/>><<(><)/>><.><*>" +noexpr "<'/>><<(><)/>><.><*>" END LC_MESSAGES LC_MONETARY diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU index 9da6982..d898f63 100644 --- a/localedata/locales/ru_RU +++ b/localedata/locales/ru_RU @@ -38,7 +38,7 @@ LC_COLLATE % members of equivalence classes % 3. A distinction is made with regards % to case as noted below. -% 4. Special characters are ignored +% 4. Special characters are ignored % when comparing letters, but then % they are considered % 5. The alphabets are sorted in order @@ -66,10 +66,10 @@ collating-symbol % and Spanish being treated % as one letter. -% The ...... collating +% The ...... collating % symbols have defined weights as % the last character in a group of -% Latin letters. They are used +% Latin letters. They are used % to specify deltas by locales using % a locale as the default ordering % and by "replace-after" statements @@ -992,7 +992,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + "";"";"";IGNORE "";"";"";IGNORE "";"";"";IGNORE @@ -1007,7 +1007,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1024,7 +1024,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1041,7 +1041,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE > ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1092,14 +1092,14 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE > ;;;IGNORE > ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + "";"";"";IGNORE "";"";"";IGNORE "";"";"";IGNORE @@ -1124,7 +1124,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1141,7 +1141,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1176,14 +1176,14 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + "";"";"";IGNORE "";"";"";IGNORE ;;;IGNORE ;;;IGNORE > ;;;IGNORE > ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1198,7 +1198,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1220,7 +1220,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE > ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1229,7 +1229,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1249,7 +1249,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE <'n> ;;;IGNORE - + "";"";"";IGNORE "";"";"";IGNORE ;;;IGNORE @@ -1319,7 +1319,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + "";"";"";IGNORE "";"";"";IGNORE

;;;IGNORE @@ -1328,10 +1328,10 @@ UNDEFINED IGNORE;IGNORE;IGNORE

;;;IGNORE

;;;IGNORE

;;;IGNORE - + ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1352,7 +1352,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE "";"";"";IGNORE @@ -1374,7 +1374,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE "";"";"";IGNORE ;;;IGNORE @@ -1393,7 +1393,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE > ;;;IGNORE ;;;IGNORE ;;;IGNORE - + "";"";"";IGNORE "";"";"";IGNORE ;;;IGNORE @@ -1458,14 +1458,14 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1480,14 +1480,14 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1506,7 +1506,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -1523,7 +1523,7 @@ UNDEFINED IGNORE;IGNORE;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE - + ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -2134,18 +2134,18 @@ abday "";/ "";/ "";/ "" -mon "";/ - "";/ +mon "<%'>";/ + "<%'>";/ "";/ - "";/ + "<%'>";/ "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" + "<%'>";/ + "<%'>";/ + "";/ + "<%'>";/ + "<%'>";/ + "<%'>";/ + "<%'>" abmon "";/ "";/ "";/ diff --git a/localedata/tst-rpmatch.c b/localedata/tst-rpmatch.c new file mode 100644 index 0000000..f799304 --- /dev/null +++ b/localedata/tst-rpmatch.c @@ -0,0 +1,37 @@ +/* Test program for + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jochen Hein . + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include + +int +main (int argc, char* argv[]) +{ + setlocale (LC_ALL, argv[1]); + + if (rpmatch (argv[2]) != atol (argv[3])) + { + fprintf (stderr,"Failed: Locale %s, String %s, Exp: %s, got %d\n", + argv[1], argv[2], argv[3], rpmatch (argv[2])); + exit (EXIT_FAILURE); + } + exit (EXIT_SUCCESS); +} diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh new file mode 100755 index 0000000..7718b54 --- /dev/null +++ b/localedata/tst-rpmatch.sh @@ -0,0 +1,64 @@ +#! /bin/sh -f +# +# Copyright (C) 1998 Free Software Foundation, Inc. +# This file is part of the GNU C Library and contains tests for +# the rpmatch(3)-implementation. +# contributed by Jochen Hein + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +common_objpfx=$1 +IFS="§" +rc=0 +while read locale string result dummy; do + if [ "$locale" != "#" ]; then + LOCPATH=${common_objpfx}localedata \ + ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + ${common_objpfx}localedata/tst-rpmatch $locale $string $result \ + || exit 1 + fi +done <