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

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 6d8f3fb2f0f957fcfe3c063b2079101b7cffdcf5..145a27f71ac32da8d55e2f5864201281323447e6 100644 (file)
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -2719,25 +2719,24 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
   while (nowtok == tok_define)
     {
       if (ignore_content)
-       {
-         lr_ignore_rest (ldfile, 0);
-         continue;
-       }
-
-      arg = lr_token (ldfile, charmap, result, NULL, verbose);
-      if (arg->tok != tok_ident)
-       SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
+       lr_ignore_rest (ldfile, 0);
       else
        {
-         /* Simply add the new symbol.  */
-         struct name_list *newsym = xmalloc (sizeof (*newsym)
-                                         + arg->val.str.lenmb + 1);
-         memcpy (newsym->str, arg->val.str.startmb, arg->val.str.lenmb);
-         newsym->str[arg->val.str.lenmb] = '\0';
-         newsym->next = defined;
-         defined = newsym;
+         arg = lr_token (ldfile, charmap, result, NULL, verbose);
+         if (arg->tok != tok_ident)
+           SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
+         else
+           {
+             /* Simply add the new symbol.  */
+             struct name_list *newsym = xmalloc (sizeof (*newsym)
+                                                 + arg->val.str.lenmb + 1);
+             memcpy (newsym->str, arg->val.str.startmb, arg->val.str.lenmb);
+             newsym->str[arg->val.str.lenmb] = '\0';
+             newsym->next = defined;
+             defined = newsym;
 
-         lr_ignore_rest (ldfile, 1);
+             lr_ignore_rest (ldfile, 1);
+           }
        }
 
       do