From 93693c4d820dac2f218e144f5126a5a761f1cfbf Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 5 Feb 2001 05:57:24 +0000 Subject: Update. 2001-02-04 Ulrich Drepper * iconv/Makefile (iconv_prog-modules): Define. Add vpath to find files in locale/programs. Add CFLAGS definition to allow compiling localedef files. * iconv/dummy-repertoire.c: New file. * iconv/iconv_charmap.c: New file. * iconv/iconv_prog.h: New file. * iconv/iconv_prog.c: Make verbose and omit_invalid global. (main): If parameter for -f and -t contain slashes try first to resolve the strings as filenames of charmap files. Use them for conversion in this case. * iconvdata/run-iconv-test.sh: If charmaps exist also run tests with iconv getting charmap names as parameters. * locale/programs/linereader.c (lr_token): Take extra parameters verbose and pass it to get_string. (get_string): Take extra parameters verbose. * locale/programs/charmap.c (parse_charmap): Take extra parameters verbose and be_quiet. Change all callers of lr_token and parse_charmap. * locale/programs/charmap.h: Likewise. * locale/programs/ld-address.c: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-identification.c: Likewise. * locale/programs/ld-measurement.c: Likewise. * locale/programs/ld-messages.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-name.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-paper.c: Likewise. * locale/programs/ld-telephone.c: Likewise. * locale/programs/ld-time.c: Likewise. * locale/programs/linereader.c: Likewise. * locale/programs/linereader.h: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/locfile.h: Likewise. * locale/programs/repertoire.c: Likewise. --- locale/programs/ld-numeric.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'locale/programs/ld-numeric.c') diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c index 80a557c..77633ef 100644 --- a/locale/programs/ld-numeric.c +++ b/locale/programs/ld-numeric.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1995. @@ -207,7 +207,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, do { - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); nowtok = now->tok; } while (nowtok == tok_eol); @@ -233,7 +233,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, /* Ingore empty lines. */ if (nowtok == tok_eol) { - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); nowtok = now->tok; continue; } @@ -251,7 +251,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, } \ \ ldfile->return_widestr = 1; \ - now = lr_token (ldfile, charmap, repertoire); \ + now = lr_token (ldfile, charmap, repertoire, verbose); \ if (now->tok != tok_string) \ goto err_label; \ if (numeric->cat != NULL) \ @@ -291,7 +291,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, break; } - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); if (now->tok != tok_minus1 && now->tok != tok_number) goto err_label; else @@ -338,11 +338,11 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, grouping[act++] = now->val.num; /* Next must be semicolon. */ - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); if (now->tok != tok_semicolon) break; - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); } while (now->tok == tok_minus1 || now->tok == tok_number); @@ -361,7 +361,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, case tok_end: /* Next we assume `LC_NUMERIC'. */ - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); if (now->tok == tok_eof) break; if (now->tok == tok_eol) @@ -378,7 +378,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, } /* Prepare for the next round. */ - now = lr_token (ldfile, charmap, NULL); + now = lr_token (ldfile, charmap, NULL, verbose); nowtok = now->tok; } -- cgit v1.1