summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-04-10 19:21:13 +0000
committerJakub Jelinek <jakub@redhat.com>2008-04-10 19:21:13 +0000
commitb0c50524f1fb93adbd52e9950f92650e020b0d59 (patch)
treefd9af5238c7ebb9bb27ffafb3e47be9ed5ca2680 /locale
parent3a2e541ba348de2bbab7b65328694403e61e5dff (diff)
Updated to fedora-glibc-20080410T1907
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-collate.c10
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)