diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-04-30 16:57:48 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-04-30 16:57:48 +0000 |
| commit | 69f155d4fc11f2f0e1dd1bfcd804192303ba1627 (patch) | |
| tree | ced40eb216ea58b252952737a6747f19d1db8e4f /locale/programs/localedef.c | |
| parent | 3dd2c3e24702b91473b30d5a0baf9954c37fd35b (diff) | |
| download | glibc-69f155d4fc11f2f0e1dd1bfcd804192303ba1627.tar.gz glibc-69f155d4fc11f2f0e1dd1bfcd804192303ba1627.tar.xz glibc-69f155d4fc11f2f0e1dd1bfcd804192303ba1627.zip | |
Update.
1998-04-30 16:45 Ulrich Drepper <drepper@cygnus.com> * inet/ether_aton.c: Including netinet/if_ether.h is not necessary. * locale/Makefile (distribute): Add programs/repertoire.h. (localedef-modules): Add repertoire. (CPPFLAGS): Define REPERTOIREMAP_PATH. * locale/programs/repertoire.c: New file. * locale/programs/repertoire.h: New file. * locale/programs/charmap.c: Starting fixing character set handling to handle multi-byte encodings. * locale/programs/charset.c: Likewise. * locale/programs/charset.h: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/linereader.c: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/locfile-kw.h: Likewise. * locale/programs/locfile-token.h: Likewise. * locale/programs/locfile.h: Likewise. * locale/programs/stringtrans.c: Likewise. 1998-04-18 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/arm/memset.S: Fix off by one error. * sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): On error, call __syscall_error rather than syscall_error directly. 1998-04-17 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/arm/mmap.S: New file; implementation of mmap() syscall for ARM. * sysdeps/unix/arm/start.c: New file; startup code for ARM a.out binaries.
Diffstat (limited to 'locale/programs/localedef.c')
| -rw-r--r-- | locale/programs/localedef.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 32437c12f5..831c36e429 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -81,8 +81,8 @@ static const char *charmap_file; /* Name of the locale definition file. */ static const char *input_file; -/* Name of the UCS file. */ -static const char *ucs_csn; +/* Name of the repertoire map file. */ +const char *repertoiremap; /* Name and version of program. */ @@ -99,9 +99,7 @@ static const struct argp_option options[] = { "charmap", 'f', "FILE", 0, N_("Symbolic character names defined in FILE") }, { "inputfile", 'i', "FILE", 0, N_("Source definitions are found in FILE") }, - { "code-set-name", 'u', "NAME", OPTION_HIDDEN, - N_("Specify code set for mapping ISO 10646 elements") }, - { "repertoire-map", 'u', NAME, 0, + { "repertoire-map", 'u', "FILE", 0, N_("file containing mapping from symbolic names to UCS4 values") }, { NULL, 0, NULL, 0, N_("Output control:") }, @@ -355,7 +353,7 @@ parse_opt (int key, char *arg, struct argp_state *state) input_file = arg; break; case 'u': - ucs_csn = arg; + repertoiremap = arg; break; case 'v': verbose = 1; @@ -377,10 +375,11 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ asprintf (&cp, gettext ("\ -System's directory for character maps: %s\n\ - locale files : %s\n\ +System's directory for character maps : %s\n\ + repertoire maps: %s\n\ + locale path : %s\n\ %s"), - CHARMAP_PATH, LOCALE_PATH, gettext ("\ + CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\ Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n")); return cp; default: |