aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-09-27 07:12:38 +0000
committerUlrich Drepper <drepper@redhat.com>1999-09-27 07:12:38 +0000
commitdf0997401f21bdf6bac06b362d8bbce92394c534 (patch)
tree21c9fd3622e2d30e049f1be1fbb1b9b3bfbb9f63
parent549b3c3a857c21dcf8ac2b1a52cdea28803e2e09 (diff)
downloadglibc-df0997401f21bdf6bac06b362d8bbce92394c534.tar
glibc-df0997401f21bdf6bac06b362d8bbce92394c534.tar.gz
glibc-df0997401f21bdf6bac06b362d8bbce92394c534.tar.bz2
glibc-df0997401f21bdf6bac06b362d8bbce92394c534.zip
Update.
1999-09-27 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-collate.c (read_directions): Read new token after accepting sorting rule.
-rw-r--r--ChangeLog5
-rw-r--r--locale/programs/ld-collate.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 50d5060c3a..200bf9329b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-27 Ulrich Drepper <drepper@cygnus.com>
+
+ * locale/programs/ld-collate.c (read_directions): Read new token
+ after accepting sorting rule.
+
1999-09-26 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-ctype.c (charclass_symbolic_ellipsis): Fix
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 20a8776f93..070c65a2d8 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -317,6 +317,9 @@ read_directions (struct linereader *ldfile, struct token *arg,
valid = 1;
}
+ if (valid)
+ arg = lr_token (ldfile, charmap, repertoire);
+
if (arg->tok == tok_eof || arg->tok == tok_eol || arg->tok == tok_comma
|| arg->tok == tok_semicolon)
{