From 32df6712bf050c095c720682bd70c842774508fc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 8 Apr 2008 15:03:46 +0000 Subject: (collate_read): Ignore script lines as well when ignoring the whole category. --- locale/programs/ld-collate.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'locale') 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 , 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) -- cgit v1.2.3