From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 8 Apr 2008 15:03:46 +0000 (+0000)
Subject: (collate_read): Ignore script lines as well when ignoring the whole category.
X-Git-Tag: cvs/fedora-glibc-20080410T1907~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32df6712bf050c095c720682bd70c842774508fc;p=thirdparty%2Fglibc.git

(collate_read): Ignore script lines as well when ignoring the whole category.
---

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index f72516c87bc..7af3b8aa92d 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)