[PATCH] Fix collate_read

[PATCH] Fix collate_read

[Jakub Jelinek]

Hi!

WHen nowtok == tok_define && ignore_content, lr_ignore_rest only skips
till end of line, but lr_token is not called, which means nowtok is
never updated and we loop forever.  The patch is large only because of
identation changes.

2007-10-12  Jakub Jelinek  <jakub@redhat.com>

	* locale/programs/ld-collate.c (collate_read): If ignore_content
	and nowtok is tok_define, eat any tok_eol tokens.

--- libc/locale/programs/ld-collate.c	2007-10-12 00:19:00.000000000 +0200
+++ libc/locale/programs/ld-collate.c	2007-10-12 00:59:35.000000000 +0200
@@ -2719,25 +2719,24 @@ collate_read (struct linereader *ldfile,
   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

	Jakub