diff options
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/locale/collate.c | 20 | ||||
| -rw-r--r-- | lib/libc/locale/collate.h | 3 |
2 files changed, 13 insertions, 10 deletions
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index 44c3eb7..45493d4 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -60,7 +60,7 @@ __collate_load_tables(const char *encoding) int i, saverr; char collate_version[STR_LEN]; char buf[PATH_MAX]; - char *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table; + void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table; static char collate_encoding[ENCODING_LEN + 1]; /* 'encoding' must be already checked. */ @@ -143,15 +143,15 @@ __collate_load_tables(const char *encoding) (void)fclose(fp); (void)strcpy(collate_encoding, encoding); - (void)memcpy(__collate_substitute_table, TMP_substitute_table, - sizeof(__collate_substitute_table)); - (void)memcpy(__collate_char_pri_table, TMP_char_pri_table, - sizeof(__collate_char_pri_table)); - (void)memcpy(__collate_chain_pri_table, TMP_chain_pri_table, - sizeof(__collate_chain_pri_table)); - free(TMP_substitute_table); - free(TMP_char_pri_table); - free(TMP_chain_pri_table); + if (__collate_substitute_table_ptr != NULL) + free(__collate_substitute_table_ptr); + __collate_substitute_table_ptr = TMP_substitute_table; + if (__collate_char_pri_table_ptr != NULL) + free(__collate_char_pri_table_ptr); + __collate_char_pri_table_ptr = TMP_char_pri_table; + if (__collate_chain_pri_table_ptr != NULL) + free(__collate_chain_pri_table_ptr); + __collate_chain_pri_table_ptr = TMP_chain_pri_table; __collate_substitute_nontrivial = 0; for (i = 0; i < UCHAR_MAX + 1; i++) { diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h index 4a0eefb..413fdf3 100644 --- a/lib/libc/locale/collate.h +++ b/lib/libc/locale/collate.h @@ -48,8 +48,11 @@ struct __collate_st_chain_pri { extern int __collate_load_error; extern int __collate_substitute_nontrivial; +#define __collate_substitute_table (*__collate_substitute_table_ptr) extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; +#define __collate_char_pri_table (*__collate_char_pri_table_ptr) extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; +#define __collate_chain_pri_table (*__collate_chain_pri_table_ptr) extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; __BEGIN_DECLS |
