(collate_read): If ignore_content and nowtok is tok_define, eat any tok_eol tokens.

This commit is contained in:
Ulrich Drepper 2007-10-12 00:30:56 +00:00
parent d0b5557df8
commit 52683814b9

View File

@ -2719,11 +2719,9 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
while (nowtok == tok_define) while (nowtok == tok_define)
{ {
if (ignore_content) if (ignore_content)
{
lr_ignore_rest (ldfile, 0); lr_ignore_rest (ldfile, 0);
continue; else
} {
arg = lr_token (ldfile, charmap, result, NULL, verbose); arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_ident) if (arg->tok != tok_ident)
SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE"); SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
@ -2739,6 +2737,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
lr_ignore_rest (ldfile, 1); lr_ignore_rest (ldfile, 1);
} }
}
do do
{ {