aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-09 08:21:40 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-09 08:21:40 +0000
commit7bd3a4eadbf78212ce93f974353e64136ee4e978 (patch)
tree9555c79fdafb43378066285b681e8b1c0a7e0935
parentf1d8b8044e2dbf207ab98b26f5b9bbdfb7e59382 (diff)
downloadglibc-7bd3a4eadbf78212ce93f974353e64136ee4e978.tar
glibc-7bd3a4eadbf78212ce93f974353e64136ee4e978.tar.gz
glibc-7bd3a4eadbf78212ce93f974353e64136ee4e978.tar.bz2
glibc-7bd3a4eadbf78212ce93f974353e64136ee4e978.zip
Update.
1999-12-09 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-collate.c (insert_value): If this is the first symbol the cursor can be the same as the next pointer.
-rw-r--r--ChangeLog5
-rw-r--r--locale/programs/ld-collate.c3
-rw-r--r--localedata/ChangeLog5
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 695337eda0..f33bc686ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-09 Ulrich Drepper <drepper@cygnus.com>
+
+ * locale/programs/ld-collate.c (insert_value): If this is the
+ first symbol the cursor can be the same as the next pointer.
+
1999-12-08 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-ctype.c (ctype_output): Correct sizes of mapping
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 0d6e113827..2858f641d6 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -457,7 +457,8 @@ insert_value (struct linereader *ldfile, struct token *arg,
return;
/* Test whether this element is not already in the list. */
- if (elem->next != NULL || elem->next == collate->cursor)
+ if (elem->next != NULL || (collate->cursor != NULL
+ && elem->next == collate->cursor))
{
lr_error (ldfile, _("order for `%.*s' already defined at %s:%Z"),
arg->val.str.lenmb, arg->val.str.startmb,
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 0a237e2a38..5668867dd4 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,10 @@
1999-12-08 Ulrich Drepper <drepper@cygnus.com>
+ * tests/test6.c: New file.
+ * tests/test6.cm: New file.
+ * tests/test6.def: New file.
+ * tests/test6.mne: New file.
+
* repertoiremaps/mnemonic.ds: Add U066A, UFE80, UFE81, UFE83,
UFE85, and UFE8B.
* charmaps/IBM864: Add mapping for /x25, /xc1, /xc2, /xc3, /xc4,