[uClibc-cvs] uClibc/extra/locale gen_collate.c,NONE,1.1 tst_nl_langinfo.c,NONE,1.1 Makefile,1.7,1.8 gen_ldc.c,1.1,1.2 gen_locale.c,1.3,1.4 gen_wc8bit.c,1.2,1.3 locale_mmap.h,1.2,1.3
Manuel Novoa III
mjn3 at uclibc.org
Fri Dec 20 19:26:50 UTC 2002
Update of /var/cvs/uClibc/extra/locale
In directory winder:/tmp/cvs-serv18665/extra/locale
Modified Files:
Makefile gen_ldc.c gen_locale.c gen_wc8bit.c locale_mmap.h
Added Files:
gen_collate.c tst_nl_langinfo.c
Log Message:
The big thing is locale dependent collation support.
Also added outdigit support and (legacy) YESSTR/NOSTR support.
--- NEW FILE: gen_collate.c ---
/* TODO:
*
* add UNDEFINED at end if not specified
* convert POSITION -> FORWARD,POSITION
*
*
* deal with lowercase in <Uhhhh>
*
* what about reorders that keep the same rule?
*
* remove "unused" collation elements? (probably doesn't save much)
*
* add_rule function ... returns index into rule table after possibly adding custom-indexed rule
* but don't forget about multichar weights... replace with strings of indexes
*
*/
#ifndef _GNU_SOURCE
[...3881 lines suppressed...]
DUMPn(overrides_offset);
DUMPn(multistart_offset);
}
#undef DUMPn
fprintf(fp, "\n");
dump_u16_array(fp, index2weight_buffer, index2weight_len, "index2weight");
dump_u16_array(fp, index2ruleidx_buffer, index2ruleidx_len, "index2ruleidx");
dump_u16_array(fp, multistart_buffer, multistart_len, "multistart");
dump_u16_array(fp, override_buffer, override_len, "override");
dump_u16_array(fp, ruletable_buffer, ruletable_len, "ruletable");
dump_u16_array(fp, weightstr_buffer, weightstr_len, "weightstr");
dump_u16_array(fp, wcs2colidt_buffer, wcs2colidt_len, "wcs2colidt");
fprintf(fp,"}; /* %8lu */\n", collate_pos);
fprintf(fp,"#define __lc_collate_data_LEN %d\n\n", collate_pos);
}
--- NEW FILE: tst_nl_langinfo.c ---
#define _GNU_SOURCE
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <langinfo.h>
#include <nl_types.h>
#if !defined(__UCLIBC__) && 0
#define DO_EXTRA
#endif
int main(int argc, char **argv)
{
char *l;
const unsigned char *x;
/* const unsigned char *y; */
const unsigned char *p;
if (argc > 2) {
printf("invalid args\n");
return EXIT_FAILURE;
}
if (argc == 1) {
l = "";
} else {
l = *++argv;
}
if (!(x = setlocale(LC_ALL,l))) {
printf("couldn't set locale %s\n", l);
return EXIT_FAILURE;
}
/* printf("\nsetlocale returned:\n "); */
/* do { */
/* printf("\\x%02x", *x); */
/* } while (*x++); */
/* printf("\n"); */
#ifndef __BCC__
#define STR(X) #X
#else
#define STR(X) __STR(X)
#endif
#define __PASTE2(A,B) A.B
#define DO_NL_I(X) \
printf( STR(X) " = %d\n", (int) nl_langinfo(X) );
#define DO_NL_S(X) \
printf( STR(X) " = \"%s\"\n", nl_langinfo(X) );
#define DO_NL_C(X) \
printf( STR(X) " = \"\\x%02x\"\n", *((unsigned char *) nl_langinfo(X)) );
printf("ctype\n");
DO_NL_S(CODESET);
#ifdef DO_EXTRA
DO_NL_I(_NL_CTYPE_INDIGITS_MB_LEN);
DO_NL_S(_NL_CTYPE_INDIGITS0_MB);
DO_NL_S(_NL_CTYPE_INDIGITS1_MB);
DO_NL_S(_NL_CTYPE_INDIGITS2_MB);
DO_NL_S(_NL_CTYPE_INDIGITS3_MB);
DO_NL_S(_NL_CTYPE_INDIGITS4_MB);
DO_NL_S(_NL_CTYPE_INDIGITS5_MB);
DO_NL_S(_NL_CTYPE_INDIGITS6_MB);
DO_NL_S(_NL_CTYPE_INDIGITS7_MB);
DO_NL_S(_NL_CTYPE_INDIGITS8_MB);
DO_NL_S(_NL_CTYPE_INDIGITS9_MB);
#endif
DO_NL_S(_NL_CTYPE_OUTDIGIT0_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT1_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT2_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT3_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT4_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT5_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT6_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT7_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT8_MB);
DO_NL_S(_NL_CTYPE_OUTDIGIT9_MB);
printf("numeric\n");
DO_NL_S(RADIXCHAR); /* DECIMAL_POINT */
DO_NL_S(THOUSEP); /* THOUSANDS_SEP */
/* DO_NL_S(GROUPING); */
printf("GROUPING = \"");
for (p = (unsigned char *) nl_langinfo(GROUPING) ; *p ; p++) {
printf("\\x%02x", *p);
}
printf("\"\n\n");
printf("monetary\n");
DO_NL_S(INT_CURR_SYMBOL);
DO_NL_S(CURRENCY_SYMBOL);
DO_NL_S(MON_DECIMAL_POINT);
DO_NL_S(MON_THOUSANDS_SEP);
/* DO_NL_S(MON_GROUPING); */
printf("MON_GROUPING = \"");
for (p = (unsigned char *) nl_langinfo(MON_GROUPING) ; *p ; p++) {
printf("\\x%02x", *p);
}
printf("\"\n\n");
DO_NL_S(POSITIVE_SIGN);
DO_NL_S(NEGATIVE_SIGN);
DO_NL_C(INT_FRAC_DIGITS);
DO_NL_C(FRAC_DIGITS);
DO_NL_C(P_CS_PRECEDES);
DO_NL_C(P_SEP_BY_SPACE);
DO_NL_C(N_CS_PRECEDES);
DO_NL_C(N_SEP_BY_SPACE);
DO_NL_C(P_SIGN_POSN);
DO_NL_C(N_SIGN_POSN);
DO_NL_C(INT_P_CS_PRECEDES);
DO_NL_C(INT_P_SEP_BY_SPACE);
DO_NL_C(INT_N_CS_PRECEDES);
DO_NL_C(INT_N_SEP_BY_SPACE);
DO_NL_C(INT_P_SIGN_POSN);
DO_NL_C(INT_N_SIGN_POSN);
DO_NL_S(CRNCYSTR); /* CURRENCY_SYMBOL */
printf("time\n");
DO_NL_S(ABDAY_1);
DO_NL_S(ABDAY_2);
DO_NL_S(ABDAY_3);
DO_NL_S(ABDAY_4);
DO_NL_S(ABDAY_5);
DO_NL_S(ABDAY_6);
DO_NL_S(ABDAY_7);
DO_NL_S(DAY_1);
DO_NL_S(DAY_2);
DO_NL_S(DAY_3);
DO_NL_S(DAY_4);
DO_NL_S(DAY_5);
DO_NL_S(DAY_6);
DO_NL_S(DAY_7);
DO_NL_S(ABMON_1);
DO_NL_S(ABMON_2);
DO_NL_S(ABMON_3);
DO_NL_S(ABMON_4);
DO_NL_S(ABMON_5);
DO_NL_S(ABMON_6);
DO_NL_S(ABMON_7);
DO_NL_S(ABMON_8);
DO_NL_S(ABMON_9);
DO_NL_S(ABMON_10);
DO_NL_S(ABMON_11);
DO_NL_S(ABMON_12);
DO_NL_S(MON_1);
DO_NL_S(MON_2);
DO_NL_S(MON_3);
DO_NL_S(MON_4);
DO_NL_S(MON_5);
DO_NL_S(MON_6);
DO_NL_S(MON_7);
DO_NL_S(MON_8);
DO_NL_S(MON_9);
DO_NL_S(MON_10);
DO_NL_S(MON_11);
DO_NL_S(MON_12);
DO_NL_S(AM_STR);
DO_NL_S(PM_STR);
DO_NL_S(D_T_FMT);
DO_NL_S(D_FMT);
DO_NL_S(T_FMT);
DO_NL_S(T_FMT_AMPM);
/* DO_NL_S(ERA); */
{
const char *p = nl_langinfo(ERA);
if (!p || !*p) {
printf("ERA = (none)\n");
} else {
int i;
printf("ERA:\n");
for (i=0 ; i < 100 ; i++) {
printf(" %3d: \"%s\"\n", i, p);
while (*p) ++p;
++p;
if (!*p) break;
}
}
}
DO_NL_S(ERA_YEAR); /* non SuSv3 */
DO_NL_S(ERA_D_FMT);
/* DO_NL_S(ALT_DIGITS); */
{
const char *p = nl_langinfo(ALT_DIGITS);
if (!p || !*p) {
printf("ALT_DIGITS = (none)\n");
} else {
int i;
printf("ALT_DIGITS:\n");
for (i=0 ; i < 100 ; i++) {
printf(" %3d: \"%s\"\n", i, p);
while (*p) ++p;
++p;
}
}
}
DO_NL_S(ERA_D_T_FMT);
DO_NL_S(ERA_T_FMT);
#ifdef DO_EXTRA
DO_NL_C(_NL_TIME_WEEK_NDAYS);
DO_NL_I(_NL_TIME_WEEK_1STDAY); /* grr... this won't work with 16bit ptrs */
DO_NL_C(_NL_TIME_WEEK_1STWEEK);
DO_NL_C(_NL_TIME_FIRST_WEEKDAY);
DO_NL_C(_NL_TIME_FIRST_WORKDAY);
DO_NL_C(_NL_TIME_CAL_DIRECTION);
DO_NL_S(_NL_TIME_TIMEZONE);
DO_NL_S(_DATE_FMT);
#endif
printf("messages\n");
DO_NL_S(YESEXPR);
DO_NL_S(NOEXPR);
DO_NL_S(YESSTR);
DO_NL_S(NOSTR);
#ifdef DO_EXTRA
printf("paper\n");
DO_NL_I(_NL_PAPER_HEIGHT);
DO_NL_I(_NL_PAPER_WIDTH);
printf("name\n");
DO_NL_S(_NL_NAME_NAME_FMT);
DO_NL_S(_NL_NAME_NAME_GEN);
DO_NL_S(_NL_NAME_NAME_MR);
DO_NL_S(_NL_NAME_NAME_MRS);
DO_NL_S(_NL_NAME_NAME_MISS);
DO_NL_S(_NL_NAME_NAME_MS);
printf("address\n");
DO_NL_S(_NL_ADDRESS_POSTAL_FMT);
DO_NL_S(_NL_ADDRESS_COUNTRY_NAME);
DO_NL_S(_NL_ADDRESS_COUNTRY_POST);
DO_NL_S(_NL_ADDRESS_COUNTRY_AB2);
DO_NL_S(_NL_ADDRESS_COUNTRY_AB3);
DO_NL_S(_NL_ADDRESS_COUNTRY_CAR);
DO_NL_I(_NL_ADDRESS_COUNTRY_NUM);
DO_NL_S(_NL_ADDRESS_COUNTRY_ISBN);
DO_NL_S(_NL_ADDRESS_LANG_NAME);
DO_NL_S(_NL_ADDRESS_LANG_AB);
DO_NL_S(_NL_ADDRESS_LANG_TERM);
DO_NL_S(_NL_ADDRESS_LANG_LIB);
printf("telephone\n");
DO_NL_S(_NL_TELEPHONE_TEL_INT_FMT);
DO_NL_S(_NL_TELEPHONE_TEL_DOM_FMT);
DO_NL_S(_NL_TELEPHONE_INT_SELECT);
DO_NL_S(_NL_TELEPHONE_INT_PREFIX);
printf("measurement\n");
DO_NL_C(_NL_MEASUREMENT_MEASUREMENT); /* 1 is metric, 2 is US */
printf("identification\n");
DO_NL_S(_NL_IDENTIFICATION_TITLE);
DO_NL_S(_NL_IDENTIFICATION_SOURCE);
DO_NL_S(_NL_IDENTIFICATION_ADDRESS);
DO_NL_S(_NL_IDENTIFICATION_CONTACT);
DO_NL_S(_NL_IDENTIFICATION_EMAIL);
DO_NL_S(_NL_IDENTIFICATION_TEL);
DO_NL_S(_NL_IDENTIFICATION_FAX);
DO_NL_S(_NL_IDENTIFICATION_LANGUAGE);
DO_NL_S(_NL_IDENTIFICATION_TERRITORY);
DO_NL_S(_NL_IDENTIFICATION_AUDIENCE);
DO_NL_S(_NL_IDENTIFICATION_APPLICATION);
DO_NL_S(_NL_IDENTIFICATION_ABBREVIATION);
DO_NL_S(_NL_IDENTIFICATION_REVISION);
DO_NL_S(_NL_IDENTIFICATION_DATE);
DO_NL_S(_NL_IDENTIFICATION_CATEGORY);
#endif
return EXIT_SUCCESS;
}
Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/extra/locale/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 4 Dec 2002 22:40:15 -0000 1.7
+++ Makefile 20 Dec 2002 19:26:15 -0000 1.8
@@ -27,30 +27,33 @@
gen_wc8bit: gen_wc8bit.c
$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_wc8bit) $^ -o $@
-#gen_wc8bit.c -o gen_wc8bit
c8tables.h: gen_wc8bit codesets.txt
./gen_wc8bit `cat codesets.txt`
gen_wctype: gen_wctype.c
$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
-#gen_wctype.c -o gen_wctype
# Warning! Beware tr_TR toupper/tolower exceptions!
-# Warning! Ignore the width table. It will go away.
wctables.h: gen_wctype
./gen_wctype en_US
gen_locale: gen_locale.c c8tables.h
$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) gen_locale.c -o $@
-#gen_locale.c -o gen_locale
# TODO: if no wide char support, we should auto-disable all UTF-8 locales
locale_tables.h: gen_locale locales.txt
./gen_locale locales.txt
-lt_defines.h: locale_tables.h
+lt_defines.h: locale_tables.h locale_collate.h
grep "^#define" locale_tables.h > lt_defines.h
+ grep "^#define __lc" locale_collate.h >> lt_defines.h
+
+gen_collate: gen_collate.c
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) gen_collate.c -o $@
+
+locale_collate.h: gen_collate locale_tables.h
+ grep COL_IDX_ locale_tables.h | sed -e "s/^.*COL_IDX_\([^, ]*\).*$$/\1/" | sort | uniq | xargs ./gen_collate
locales.txt:
@if [ ! -f locales.txt ] ; then \
@@ -89,7 +92,7 @@
# locale_data.c: lmmtolso locale.mmap
# ./lmmtolso
-gen_ldc: gen_ldc.c c8tables.h wctables.h locale_tables.h
+gen_ldc: gen_ldc.c c8tables.h wctables.h locale_tables.h locale_collate.h
$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_mmap) gen_ldc.c -o $@
#gen_ldc.c -o gen_ldc
@@ -110,8 +113,8 @@
clean:
rm -f *.[oa] *~ core
- rm -f gen_wc8bit gen_wctype gen_locale gen_ldc
- rm -f c8tables.h wctables.h locale_tables.h lt_defines.h
+ rm -f gen_wc8bit gen_wctype gen_locale gen_ldc gen_collate
+ rm -f c8tables.h wctables.h locale_tables.h lt_defines.h locale_collate.h
rm -f gen_mmap locale.mmap lmmtolso
rm -f locale_data.c locale_data.o uClibc_locale_data.h
Index: gen_ldc.c
===================================================================
RCS file: /var/cvs/uClibc/extra/locale/gen_ldc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gen_ldc.c 22 Nov 2002 03:05:11 -0000 1.1
+++ gen_ldc.c 20 Dec 2002 19:26:15 -0000 1.2
@@ -39,6 +39,7 @@
#define WCuplow_diff_TBL_LEN (2 * WCuplow_diffs)
/* #define WCcomb_TBL_LEN (WCcomb_II_LEN + WCcomb_TI_LEN + WCcomb_UT_LEN) */
+#include "locale_collate.h"
#include "locale_tables.h"
#include "locale_mmap.h"
@@ -69,7 +70,7 @@
static const size_t common_tbl_offsets[CATEGORIES*4] = {
- 0, 0, 0, 0, /* ctype */
+ COMMON_OFFSETS(ctype),
COMMON_OFFSETS(numeric),
COMMON_OFFSETS(monetary),
COMMON_OFFSETS(time),
@@ -190,6 +191,7 @@
/* const unsigned char tblwcomb[WCcomb_TBL_LEN]; */
/* width?? */
#endif /* __WCHAR_ENABLED */
+ out_uc(lso, __lc_ctype_data, __lc_ctype_data_LEN, "lc_ctype_data");
out_uc(lso, __lc_numeric_data, __lc_numeric_data_LEN, "lc_numeric_data");
out_uc(lso, __lc_monetary_data, __lc_monetary_data_LEN, "lc_monetary_data");
out_uc(lso, __lc_time_data, __lc_time_data_LEN, "lc_time_data");
@@ -209,6 +211,10 @@
fprintf(lso, "},\n");
#endif /* __CTYPE_HAS_8_BIT_LOCALES */
+ out_uc(lso, __lc_ctype_rows, __lc_ctype_rows_LEN, "lc_ctype_rows");
+ out_u16(lso, __lc_ctype_item_offsets, __lc_ctype_item_offsets_LEN, "lc_ctype_item_offsets");
+ out_u16(lso, __lc_ctype_item_idx, __lc_ctype_item_idx_LEN, "lc_ctype_item_idx");
+
out_uc(lso, __lc_numeric_rows, __lc_numeric_rows_LEN, "lc_numeric_rows");
out_u16(lso, __lc_numeric_item_offsets, __lc_numeric_item_offsets_LEN, "lc_numeric_item_offsets");
out_u16(lso, __lc_numeric_item_idx, __lc_numeric_item_idx_LEN, "lc_numeric_item_idx");
@@ -221,16 +227,23 @@
out_u16(lso, __lc_time_item_offsets, __lc_time_item_offsets_LEN, "lc_time_item_offsets");
out_u16(lso, __lc_time_item_idx, __lc_time_item_idx_LEN, "lc_time_item_idx");
- /* TODO -- collate*/
-
out_uc(lso, __lc_messages_rows, __lc_messages_rows_LEN, "lc_messages_rows");
out_u16(lso, __lc_messages_item_offsets, __lc_messages_item_offsets_LEN, "lc_messages_item_offsets");
out_u16(lso, __lc_messages_item_idx, __lc_messages_item_idx_LEN, "lc_messages_item_idx");
+ /* collate should be last*/
+ assert(sizeof(__locale_collate_tbl)/sizeof(__locale_collate_tbl[0]) == __lc_collate_data_LEN) ;
+ out_u16(lso, __locale_collate_tbl, __lc_collate_data_LEN, "collate_data");
+
+
{
unsigned char co_buf[CATEGORIES] = {
- 1, __lc_numeric_item_offsets_LEN, __lc_monetary_item_offsets_LEN,
- __lc_time_item_offsets_LEN, 0, __lc_messages_item_offsets_LEN
+ __lc_ctype_item_offsets_LEN,
+ __lc_numeric_item_offsets_LEN,
+ __lc_monetary_item_offsets_LEN,
+ __lc_time_item_offsets_LEN,
+ 0,
+ __lc_messages_item_offsets_LEN
};
out_uc(lso, co_buf, CATEGORIES, "lc_common_item_offsets_LEN");
}
@@ -267,189 +280,7 @@
return EXIT_SUCCESS;
}
-
-
/* ---------------------------------------------------------------------- */
-
-#if 0
-#define WRITE_COMMON_MMAP(X) \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE3(lc_,X,_data)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(__lc_,X,_data_LEN) ; i++) { \
- putc(__PASTE3(__lc_,X,_data)[i], fp); \
- }
-
-#define WRITE_COMMON_MMIDX(X) \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE3(lc_,X,_rows)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(__lc_,X,_rows_LEN) ; i++) { \
- putc(__PASTE3(__lc_,X,_rows)[i], fp); \
- } \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE3(lc_,X,_item_offsets)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(__lc_,X,_item_offsets_LEN) ; i++) { \
- putc( ((unsigned char *) &(__PASTE3(__lc_,X,_item_offsets)[i]))[0], fp); \
- putc( ((unsigned char *) &(__PASTE3(__lc_,X,_item_offsets)[i]))[1], fp); \
- } \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE3(lc_,X,_item_idx)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(__lc_,X,_item_idx_LEN) ; i++) { \
- putc( ((unsigned char *) &(__PASTE3(__lc_,X,_item_idx)[i]))[0], fp); \
- putc( ((unsigned char *) &(__PASTE3(__lc_,X,_item_idx)[i]))[1], fp); \
- }
-
-#define WRITE_WC_DATA(X) \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE2(tblw,X)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(WC,X,_TBL_LEN) ; i++) { \
- putc(__PASTE3(WC,X,_data)[i], fp); \
- }
-
-#define WRITE_WC_I16_DATA(X) \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE2(tblw,X)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(WC,X,_TBL_LEN) ; i++) { \
- putc( ((unsigned char *) &(__PASTE3(WC,X,_data)[i]))[0], fp); \
- putc( ((unsigned char *) &(__PASTE3(WC,X,_data)[i]))[1], fp); \
- }
-
-#define WRITE_C_DATA(X) \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE2(tbl8,X)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(C,X,_TBL_LEN) ; i++) { \
- putc(__PASTE3(C,X,_data)[i], fp); \
- }
-
-#define WRITE_C_U16_DATA(X) \
- fseek(fp, (long) offsetof(__locale_mmap_t, __PASTE2(tbl8,X)), SEEK_SET); \
- for (i=0 ; i < __PASTE3(C,X,_TBL_LEN) ; i++) { \
- putc( ((unsigned char *) &(__PASTE3(C,X,_data)[i]))[0], fp); \
- putc( ((unsigned char *) &(__PASTE3(C,X,_data)[i]))[1], fp); \
- }
-
-/**********************************************************************/
-
-#define COMMON_OFFSETS(X) \
- offsetof(__locale_mmap_t, __PASTE3(lc_,X,_rows)), \
- offsetof(__locale_mmap_t, __PASTE3(lc_,X,_item_offsets)), \
- offsetof(__locale_mmap_t, __PASTE3(lc_,X,_item_idx)), \
- offsetof(__locale_mmap_t, __PASTE3(lc_,X,_data)) \
-
-
-static const size_t common_tbl_offsets[CATEGORIES*4] = {
- 0, 0, 0, 0, /* ctype */
- COMMON_OFFSETS(numeric),
- COMMON_OFFSETS(monetary),
- COMMON_OFFSETS(time),
- 0, 0, 0, 0, /* collate */
- COMMON_OFFSETS(messages),
-};
-
-
-
-
-
-int main(void)
-{
- FILE *fp;
- size_t i;
- unsigned char *p;
-
- if (!(fp = fopen("locale.mmap", "w"))) {
- printf("error - can't open locale.mmap for writing!");
- return EXIT_FAILURE;
- }
-
- for (i=0 ; i < sizeof(__locale_mmap_t) ; i++) {
- putc(0, fp); /* Zero out the file. */
- }
-
-#ifdef __CTYPE_HAS_8_BIT_LOCALES
- WRITE_C_DATA(ctype);
- WRITE_C_DATA(uplow);
-#ifdef __WCHAR_ENABLED
- WRITE_C_U16_DATA(c2wc);
- WRITE_C_DATA(wc2c);
- /* translit */
-#endif /* __WCHAR_ENABLED */
-#endif /* __CTYPE_HAS_8_BIT_LOCALES */
-
-#ifdef __WCHAR_ENABLED
- WRITE_WC_DATA(ctype);
- WRITE_WC_DATA(uplow);
- WRITE_WC_I16_DATA(uplow_diff);
-/* WRITE_WC_DATA(comb); */
- /* width?? */
-#endif /* __WCHAR_ENABLED */
-
- WRITE_COMMON_MMAP(numeric);
- WRITE_COMMON_MMAP(monetary);
- WRITE_COMMON_MMAP(time);
- /* TODO -- collate*/
- WRITE_COMMON_MMAP(messages);
-
-#ifdef __CTYPE_HAS_8_BIT_LOCALES
- fseek(fp, (long) offsetof(__locale_mmap_t, codeset_8_bit), SEEK_SET); \
- p = (unsigned char *) codeset_8_bit;
- for (i=0 ; i < sizeof(codeset_8_bit) ; i++) {
- putc(p[i], fp);
- }
-#endif /* __CTYPE_HAS_8_BIT_LOCALES */
-
- WRITE_COMMON_MMIDX(numeric);
- WRITE_COMMON_MMIDX(monetary);
- WRITE_COMMON_MMIDX(time);
- /* TODO -- collate*/
- WRITE_COMMON_MMIDX(messages);
-
- fseek(fp, (long) offsetof(__locale_mmap_t, lc_common_item_offsets_LEN), SEEK_SET);
- putc(1, fp); /* ctype -- (codeset) handled specially */
- putc(__lc_numeric_item_offsets_LEN, fp);
- putc(__lc_monetary_item_offsets_LEN, fp);
- putc(__lc_time_item_offsets_LEN, fp);
- putc(0, fp); /* collate */
- putc(__lc_messages_item_offsets_LEN, fp);
-
- fseek(fp, (long) offsetof(__locale_mmap_t, lc_common_tbl_offsets), SEEK_SET);
- for (i=0 ; i < sizeof(common_tbl_offsets) ; i++) {
- putc(((unsigned char *)common_tbl_offsets)[i], fp);
- }
-
-#ifdef NUM_LOCALES
- fseek(fp, (long) offsetof(__locale_mmap_t, locales), SEEK_SET);
- for (i=0 ; i < (NUM_LOCALES * WIDTH_LOCALES) ; i++) {
- putc(__locales[i], fp);
- }
-
- fseek(fp, (long) offsetof(__locale_mmap_t, locale_names5), SEEK_SET);
- for (i=0 ; i < 5 * NUM_LOCALE_NAMES ; i++) {
- putc(__locale_names5[i], fp);
- }
-
-#ifdef LOCALE_AT_MODIFIERS_LENGTH
- fseek(fp, (long) offsetof(__locale_mmap_t, locale_at_modifiers), SEEK_SET);
- for (i=0 ; i < LOCALE_AT_MODIFIERS_LENGTH ; i++) {
- putc(__locale_at_modifiers[i], fp);
- }
-#endif /* LOCALE_AT_MODIFIERS_LENGTH */
-#endif /* NUM_LOCALES */
-
- fseek(fp, (long) offsetof(__locale_mmap_t, lc_names), SEEK_SET);
- for (i=0 ; i < lc_names_LEN ; i++) {
- putc(lc_names[i], fp);
- }
-
-#ifdef __CTYPE_HAS_8_BIT_LOCALES
- fseek(fp, (long) offsetof(__locale_mmap_t, codeset_list), SEEK_SET);
- for (i=0 ; i < sizeof(CODESET_LIST) ; i++) {
- putc((unsigned char)(CODESET_LIST[i]), fp);
- }
-#endif /* __CTYPE_HAS_8_BIT_LOCALES */
-
-
- if (ferror(fp) || (fclose(fp) == EOF)) {
- printf("error - stream in error state or fclose failed!");
- return EXIT_FAILURE;
- }
-
- printf("sizeof(__locale_mmap_t) = %zd\n", sizeof(__locale_mmap_t));
-
- return EXIT_SUCCESS;
-}
-#endif
/* TODO:
* collate data (8-bit weighted single char only)
Index: gen_locale.c
===================================================================
RCS file: /var/cvs/uClibc/extra/locale/gen_locale.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gen_locale.c 22 Nov 2002 03:05:11 -0000 1.3
+++ gen_locale.c 20 Dec 2002 19:26:15 -0000 1.4
@@ -47,6 +47,7 @@
unsigned char lc_numeric_row;
unsigned char lc_monetary_row;
unsigned char lc_messages_row;
+ unsigned char lc_ctype_row;
#if CATEGORIES != 6
#error unsupported CATEGORIES value
#endif
@@ -68,6 +69,7 @@
static void do_lc_monetary(void);
static void do_lc_messages(void);
[...1363 lines suppressed...]
+ DO_NL_S(_NL_CTYPE_OUTDIGIT9_MB);
- if (!(r = p->name[0] - q->name[0])
- && !(r = p->name[1] - q->name[1])
- && !(r = p->name[3] - q->name[3])
- && !(r = p->name[4] - q->name[4])
- && !(r = p->name[2] - q->name[2])
- && !(r = -(p->cs - q->cs))
- ) {
- r = -(p->dot_cs - q->dot_cs);
- /* Reverse the ordering of the codesets so UTF-8 comes last.
- * Work-around (hopefully) for glibc bug affecting at least
- * the euro currency symbol. */
+ DL_LC_LOOPTAIL(ctype)
}
- return r;
+ DO_LC_COMMON(ctype)
}
-
Index: gen_wc8bit.c
===================================================================
RCS file: /var/cvs/uClibc/extra/locale/gen_wc8bit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gen_wc8bit.c 22 Nov 2002 03:05:11 -0000 1.2
+++ gen_wc8bit.c 20 Dec 2002 19:26:15 -0000 1.3
@@ -75,7 +75,7 @@
{
FILE *fp;
FILE *out;
- charset_data csd[20];
+ charset_data csd[30];
unsigned long max_wchar;
unsigned char *p;
int numsets;
Index: locale_mmap.h
===================================================================
RCS file: /var/cvs/uClibc/extra/locale/locale_mmap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- locale_mmap.h 22 Nov 2002 03:05:11 -0000 1.2
+++ locale_mmap.h 20 Dec 2002 19:26:15 -0000 1.3
@@ -45,12 +45,11 @@
/* width?? */
#endif /* __WCHAR_ENABLED */
+ COMMON_MMAP(ctype);
COMMON_MMAP(numeric);
COMMON_MMAP(monetary);
COMMON_MMAP(time);
-
- /* TODO -- collate*/
-
+ /* collate is different */
COMMON_MMAP(messages);
@@ -58,14 +57,14 @@
const codeset_8_bit_t codeset_8_bit[NUM_CODESETS];
#endif /* __CTYPE_HAS_8_BIT_LOCALES */
+ COMMON_MMIDX(ctype);
COMMON_MMIDX(numeric);
COMMON_MMIDX(monetary);
COMMON_MMIDX(time);
-
- /* TODO -- collate*/
-
+ /* collate is different */
COMMON_MMIDX(messages);
+ const uint16_t collate_data[__lc_collate_data_LEN];
unsigned char lc_common_item_offsets_LEN[CATEGORIES];
size_t lc_common_tbl_offsets[CATEGORIES * 4];
More information about the uClibc-cvs
mailing list