diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-02-05 05:57:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-02-05 05:57:24 +0000 |
| commit | 93693c4d820dac2f218e144f5126a5a761f1cfbf (patch) | |
| tree | 7371d326f24a3c9d73fed75e7792133d0d654a50 /locale/programs/linereader.c | |
| parent | 377c725f8e2dba91af36af27206e6deb85cf6e6f (diff) | |
| download | glibc-93693c4d820dac2f218e144f5126a5a761f1cfbf.tar.gz glibc-93693c4d820dac2f218e144f5126a5a761f1cfbf.tar.xz glibc-93693c4d820dac2f218e144f5126a5a761f1cfbf.zip | |
Update.
2001-02-04 Ulrich Drepper <drepper@redhat.com> * 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.
Diffstat (limited to 'locale/programs/linereader.c')
| -rw-r--r-- | locale/programs/linereader.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c index 01f5c9d692..5dba62f796 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -31,7 +31,11 @@ #include "charmap.h" #include "error.h" #include "linereader.h" -#include "localedef.h" + +/* Prototypes for a few program-wide used functions. */ +extern void *xmalloc (size_t __n); +extern void *xrealloc (void *__p, size_t __n); +extern char *xstrdup (const char *__str); /* Prototypes for local functions. */ @@ -40,7 +44,8 @@ static struct token *get_symname (struct linereader *lr); static struct token *get_ident (struct linereader *lr); static struct token *get_string (struct linereader *lr, const struct charmap_t *charmap, - const struct repertoire_t *repertoire); + const struct repertoire_t *repertoire, + int verbose); struct linereader * @@ -158,7 +163,7 @@ extern char *program_name; struct token * lr_token (struct linereader *lr, const struct charmap_t *charmap, - const struct repertoire_t *repertoire) + const struct repertoire_t *repertoire, int verbose) { int ch; @@ -290,7 +295,7 @@ lr_token (struct linereader *lr, const struct charmap_t *charmap, return &lr->token; case '"': - return get_string (lr, charmap, repertoire); + return get_string (lr, charmap, repertoire, verbose); case '-': ch = lr_getc (lr); @@ -563,7 +568,7 @@ get_ident (struct linereader *lr) static struct token * get_string (struct linereader *lr, const struct charmap_t *charmap, - const struct repertoire_t *repertoire) + const struct repertoire_t *repertoire, int verbose) { int return_widestr = lr->return_widestr; char *buf; |