diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-04-08 15:03:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-04-08 15:03:46 +0000 |
| commit | 32df6712bf050c095c720682bd70c842774508fc (patch) | |
| tree | c2c727eda2487adcb18cd9d1bbb2a1859f33adc2 /locale/programs/ld-collate.c | |
| parent | d24be489a10c51465bd1117749602d9b0a8483ba (diff) | |
| download | glibc-32df6712bf050c095c720682bd70c842774508fc.tar.gz glibc-32df6712bf050c095c720682bd70c842774508fc.tar.xz glibc-32df6712bf050c095c720682bd70c842774508fc.zip | |
(collate_read): Ignore script lines as well when ignoring the whole category.
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index f72516c87b..7af3b8aa92 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2003, 2005, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1995-2003, 2005-2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -3195,6 +3195,14 @@ error while adding equivalent collating symbol")); break; case tok_script: + /* Ignore the rest of the line if we don't need the input of + this line. */ + if (ignore_content) + { + lr_ignore_rest (ldfile, 0); + break; + } + /* We get told about the scripts we know. */ arg = lr_token (ldfile, charmap, result, repertoire, verbose); if (arg->tok != tok_bsymbol) |