diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 23 | ||||
| -rw-r--r-- | locale/programs/ld-time.c | 10 |
3 files changed, 27 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 12e8d9515d..e7c031dea1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-08-12 Ulrich Drepper <drepper@redhat.com> + [BZ #3013] + * locale/programs/ld-ctype.c (ctype_output): Adjust alignments, fix + lenght of one output field, correct bitmask creation. + * locale/programs/ld-time.c: Add alignment. + [BZ #2997] * misc/error.c: Add space between program name and message if file name is missing. diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index b0b2e3f805..f38231f984 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -992,8 +992,8 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, total += iov[2 + elem + offset].iov_len; } iov[2 + elem + offset].iov_base = (void *) nulbytes; - iov[2 + elem + offset].iov_len = 1 + (4 - ((total + 1) % 4)); - total += 1 + (4 - ((total + 1) % 4)); + iov[2 + elem + offset].iov_len = 4 - (total % 4); + total += 4 - (total % 4); idx[elem + 1] = idx[elem] + total; break; @@ -1010,8 +1010,8 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, total += iov[2 + elem + offset].iov_len; } iov[2 + elem + offset].iov_base = (void *) nulbytes; - iov[2 + elem + offset].iov_len = 1 + (4 - ((total + 1) % 4)); - total += 1 + (4 - ((total + 1) % 4)); + iov[2 + elem + offset].iov_len = 4 - (total % 4); + total += 4 - (total % 4); idx[elem + 1] = idx[elem] + total; break; @@ -1153,7 +1153,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, iov[2 + elem + offset].iov_base = ctype->default_missing ?: (uint32_t *) L""; iov[2 + elem + offset].iov_len = - wcslen (iov[2 + elem + offset].iov_base); + wcslen (iov[2 + elem + offset].iov_base) * sizeof (uint32_t); idx[elem + 1] = idx[elem] + iov[2 + elem + offset].iov_len; break; @@ -3844,9 +3844,14 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, { ctype->class_b[nr] = (uint32_t *) xcalloc (256 / 32, sizeof (uint32_t)); - for (idx = 0; idx < 256; ++idx) - if (ctype->class256_collection[idx] & _ISbit (nr)) - ctype->class_b[nr][idx >> 5] |= (uint32_t)1 << (idx & 0x1f); + /* We only set CLASS_B for the bits in the ISO C classes, not + the user defined classes. The number should not change but + who knows. */ +#define LAST_ISO_C_BIT 11 + if (nr <= LAST_ISO_C_BIT) + for (idx = 0; idx < 256; ++idx) + if (ctype->class256_collection[idx] & _ISbit (nr)) + ctype->class_b[nr][idx >> 5] |= (uint32_t) 1 << (idx & 0x1f); } for (nr = 0; nr < ctype->nr_charclass; nr++) diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 4f1dcb0ce7..bf5151858a 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -542,7 +542,7 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap, * (2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME) + time->num_era - 1 + 2 * 99 - + 2 + time->num_era * 10 - 1)); + + 2 + time->num_era * 10)); struct locale_file data; uint32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_TIME)]; size_t cnt, last_idx, num, n; @@ -901,6 +901,12 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap, ++cnt; ++last_idx; + /* We must align the following data. */ + iov[2 + cnt].iov_base = (void *) "\0\0"; + iov[2 + cnt].iov_len = -idx[last_idx] & 3; + idx[last_idx] += -idx[last_idx] & 3; + ++cnt; + iov[2 + cnt].iov_base = (void *) time->wdate_fmt; iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1) * sizeof (uint32_t)); @@ -916,7 +922,7 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap, assert (cnt == (_NL_ITEM_INDEX (_NL_NUM_LC_TIME) + time->num_era - 1 + 2 * 99 - + 2 + time->num_era * 10 - 1)); + + 2 + time->num_era * 10)); assert (last_idx == _NL_ITEM_INDEX (_NL_NUM_LC_TIME)); write_locale_data (output_path, LC_TIME, "LC_TIME", 2 + cnt, iov); |