[BZ #3745]

	* locale/programs/ld-collate.c (handle_ellipsis): Fix generation
	of names for ellipsises.

diff --git a/ChangeLog b/ChangeLog
index 62f0dd6d5d6b118293d9c544c74c2d570ad3344f..72a9f8489364f510bb9437bc5ad9c31753d4b114 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-17  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #3745]
+       * locale/programs/ld-collate.c (handle_ellipsis): Fix generation
+       of names for ellipsises.
+
        [BZ #3348]
        * malloc/memusage.sh: Cleanups.
        * debug/xtrace.sh: Quoting and trap changes.

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index af472799585d5c7c79121473ab9e2d1354ae290a..a4f491cd284dc38be2d8e13e77d305e0fb5e137c 100644 (file)
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2003, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
@@ -1330,8 +1330,9 @@ order for `%.*s' already defined at %s:%Zu"),
              uint32_t wc;
              int cnt;
 
-             /* Generate the the name.  */
-             sprintf (buf + preflen, base == 10 ? "%ld" : "%lX", from);
+             /* Generate the name.  */
+             sprintf (buf + preflen, base == 10 ? "%0*ld" : "%0*lX",
+                      (int) (lenfrom - preflen), from);
 
              /* Look whether this name is already defined.  */
              void *ptr;
@@ -3571,7 +3572,6 @@ error while adding equivalent collating symbol"));
 
              if (was_ellipsis != tok_none)
                {
-
                  handle_ellipsis (ldfile, symstr, symlen, was_ellipsis,
                                   charmap, repertoire, result);