aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/charmap.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-30 18:52:38 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-30 18:52:38 +0000
commit12a9fabe52b88bdb75e305bbe485573d34bfbc24 (patch)
tree1ca0bd207f63fc1ea0202aad84cd1e7c8c744b8c /locale/programs/charmap.c
parent69f155d4fc11f2f0e1dd1bfcd804192303ba1627 (diff)
downloadglibc-12a9fabe52b88bdb75e305bbe485573d34bfbc24.tar
glibc-12a9fabe52b88bdb75e305bbe485573d34bfbc24.tar.gz
glibc-12a9fabe52b88bdb75e305bbe485573d34bfbc24.tar.bz2
glibc-12a9fabe52b88bdb75e305bbe485573d34bfbc24.zip
Update.
* locale/programs/locfile.c: Interpret I18NPATH value as base of path, extended with "/locales/".
Diffstat (limited to 'locale/programs/charmap.c')
-rw-r--r--locale/programs/charmap.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 7114a237a0..e11df1cf29 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -211,8 +211,6 @@ parse_charmap (const char *filename)
memset (result, '\0', sizeof (struct charset_t));
/* The default DEFAULT_WIDTH is 1. */
result->width_default = 1;
- /* Let the user overwrite the repertoire map we use. */
- result->repertoiremap = repertoiremap;
#define obstack_chunk_alloc malloc
#define obstack_chunk_free free
@@ -269,17 +267,6 @@ parse_charmap (const char *filename)
lr_ignore_rest (cmfile, 1);
- /* Read the repertoire map now. */
- if (result->repertoiremap == NULL)
- /* This is fatal. */
- error (4, 0, _("no repertoire map specified: cannot proceed"));
-
- result->repertoire = repertoire_read (result->repertoiremap);
- if (result->repertoire == NULL)
- /* This is also fatal. */
- error (4, errno, _("cannot read repertoire map `%s'"),
- result->repertoiremap);
-
state = 2;
continue;
}
@@ -288,7 +275,7 @@ parse_charmap (const char *filename)
&& nowtok != tok_mb_cur_min && nowtok != tok_escape_char
&& nowtok != tok_comment_char && nowtok != tok_g0esc
&& nowtok != tok_g1esc && nowtok != tok_g2esc
- && nowtok != tok_g3esc && nowtok != tok_repertoiremap)
+ && nowtok != tok_g3esc)
{
lr_error (cmfile, _("syntax error in prolog: %s"),
_("illegal definition"));
@@ -320,18 +307,6 @@ parse_charmap (const char *filename)
lr_ignore_rest (cmfile, 1);
continue;
- case tok_repertoiremap:
- if (arg->tok != tok_ident)
- goto badarg;
-
- if (result->repertoiremap == NULL)
- result->repertoiremap = obstack_copy0 (&result->mem_pool,
- arg->val.str.start,
- arg->val.str.len);
-
- lr_ignore_rest (cmfile, 1);
- continue;
-
case tok_mb_cur_max:
case tok_mb_cur_min:
if (arg->tok != tok_number)