From a0edd63e7c41336220353a6055662f38f5429a50 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 21 Apr 2000 03:43:31 +0000 Subject: Update. 2000-04-19 Jakub Jelinek * locale/programs/ld-ctype.c (ctype_output): Set size of the idx field to nelems * sizeof (uint32_t). * locale/programs/ld-address.c (address_output): Align word fields properly. * locale/programs/ld-monetary.c (monetary_output): Likewise. Don't restart idx pointers to idx end at the duo_int_curr_symbol field. Avoid giving arbitrary garbage in the crncystr field. Use sizeof(uint32_t) instead of 4 for len in uno_valid_from, uno_valid_to, duo_valid_from, duo_valid_to and conversion_rate fields. * locale/programs/ld-numeric.c (numeric_output): Likewise. Don't restart idx pointers to idx end at the decimal_point_wc field. * locale/programs/ld-time.c (time_output): week_1stday should be word, not byte. Align it properly. 2000-04-19 H.J. Lu * csu/gmon-start.c (_start): Declared as "extern void". (etext): Likewise. 2000-04-18 Andreas Jaeger * manual/install.texi (Running make install): Don't mention utmpd anymore. 2000-04-18 Andreas Jaeger * linuxthreads/Versions: Use ld instead of ld.so. * elf/Makefile (ld-map): Use ld.map. * Versions.def: Use ld instead of ld.so. * elf/Versions: Likewise. * sysdeps/mach/hurd/Versions: Likewise. --- locale/programs/ld-monetary.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'locale/programs/ld-monetary.c') diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c index 7e99b3f514..dd5b51c777 100644 --- a/locale/programs/ld-monetary.c +++ b/locale/programs/ld-monetary.c @@ -361,7 +361,7 @@ monetary_output (struct localedef_t *locale, struct charmap_t *charmap, { struct locale_monetary_t *monetary = locale->categories[LC_MONETARY].monetary; - struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)]; + struct iovec iov[3 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)]; struct locale_file data; uint32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)]; size_t cnt = 0; @@ -452,7 +452,7 @@ monetary_output (struct localedef_t *locale, struct charmap_t *charmap, ++cnt; idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; - iov[cnt].iov_base = (void *) &monetary->crncystr; + iov[cnt].iov_base = (void *) monetary->crncystr; iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1; ++cnt; @@ -486,7 +486,7 @@ monetary_output (struct localedef_t *locale, struct charmap_t *charmap, iov[cnt].iov_len = 1; ++cnt; - idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len; + idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) monetary->duo_int_curr_symbol; iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1; ++cnt; @@ -567,44 +567,51 @@ monetary_output (struct localedef_t *locale, struct charmap_t *charmap, ++cnt; idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + + /* Align following data */ + iov[cnt].iov_base = (void *) "\0\0"; + iov[cnt].iov_len = ((idx[cnt - 2] + 3) & ~3) - idx[cnt - 2]; + idx[cnt - 2] = (idx[cnt - 2] + 3) & ~3; + ++cnt; + iov[cnt].iov_base = (void *) &monetary->uno_valid_from; - iov[cnt].iov_len = 4; + iov[cnt].iov_len = sizeof(uint32_t); ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + idx[cnt - 3] = idx[cnt - 4] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) &monetary->uno_valid_to; - iov[cnt].iov_len = 4; + iov[cnt].iov_len = sizeof(uint32_t); ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + idx[cnt - 3] = idx[cnt - 4] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) &monetary->duo_valid_from; - iov[cnt].iov_len = 4; + iov[cnt].iov_len = sizeof(uint32_t); ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + idx[cnt - 3] = idx[cnt - 4] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) &monetary->duo_valid_to; - iov[cnt].iov_len = 4; + iov[cnt].iov_len = sizeof(uint32_t); ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + idx[cnt - 3] = idx[cnt - 4] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) monetary->conversion_rate; - iov[cnt].iov_len = 8; + iov[cnt].iov_len = 2 * sizeof(uint32_t); ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + idx[cnt - 3] = idx[cnt - 4] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) &monetary->mon_decimal_point_wc; iov[cnt].iov_len = sizeof (uint32_t); ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; + idx[cnt - 3] = idx[cnt - 4] + iov[cnt - 1].iov_len; iov[cnt].iov_base = (void *) &monetary->mon_thousands_sep_wc; iov[cnt].iov_len = sizeof (uint32_t); ++cnt; - assert (cnt == 2 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)); + assert (cnt == 3 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)); write_locale_data (output_path, "LC_MONETARY", - 2 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY), iov); + 3 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY), iov); } -- cgit 1.4.1