Update.

2000-06-07  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/charmap.c: Allow string arguments for
	code_set_name and repertoiremap.

diff --git a/ChangeLog b/ChangeLog
index aa2df2b491e33749f4e1ccaa3821a8bb7978c8b7..555199c8a307647bb88e0a6aa12e257399f98da6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-07  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/programs/charmap.c: Allow string arguments for
+       code_set_name and repertoiremap.
+
 2000-06-07  Andreas Jaeger  <aj@suse.de>
 
        * elf/Makefile: Build ldconfig only when building shared libraries.

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 3ccebcac488f6d038d9c0392a6c8be16705b2835..dec09a611816234dc57142659d84765b7f8fd337 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -155,6 +155,8 @@ charmap_read (const char *filename)
                        char junk[BUFSIZ];
 
                        if (fscanf (fp, " <code_set_name> %as", &name) == 1
+                           || (fscanf (fp, " <code_set_name> \"%as\"", &name)
+                               == 1)
                            || fscanf (fp, "%% alias %as", &name) == 1)
                          {
                            if (strcasecmp (name, filename) == 0)
@@ -317,7 +319,7 @@ parse_charmap (struct linereader *cmfile)
            {
            case tok_code_set_name:
            case tok_repertoiremap:
-             if (arg->tok != tok_ident)
+             if (arg->tok != tok_ident && arg->tok != tok_string)
                {
                badarg:
                  lr_error (cmfile, _("syntax error in prolog: %s"),