summaryrefslogtreecommitdiff
path: root/locale/programs/ld-collate.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-05-04 10:05:57 +0000
committerJakub Jelinek <jakub@redhat.com>2007-05-04 10:05:57 +0000
commit2a0a747e57ec96bab9d4a6b7c0b32df82a41316e (patch)
tree002d92f89d7109abc1c2ebe7f113f8dee0dc3034 /locale/programs/ld-collate.c
parentaf5726aed8a0c87d7f29570641cf0acb6a92f918 (diff)
Updated to fedora-glibc-20070504T0917cvs/fedora-glibc-2_5_90-22
Diffstat (limited to 'locale/programs/ld-collate.c')
-rw-r--r--locale/programs/ld-collate.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index a4f491cd28..56f3180b10 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -3132,7 +3132,7 @@ error while adding equivalent collating symbol"));
break;
}
- if (state != 0 && state != 1)
+ if (state != 0 && state != 1 && state != 2)
goto err_label;
state = 1;
@@ -3154,8 +3154,9 @@ error while adding equivalent collating symbol"));
if (sp == NULL)
{
lr_error (ldfile, _("\
-%s: unknown section name `%s'"),
- "LC_COLLATE", arg->val.str.startmb);
+%s: unknown section name `%.*s'"),
+ "LC_COLLATE", (int) arg->val.str.lenmb,
+ arg->val.str.startmb);
/* We use the error section. */
collate->current_section = &collate->error_section;