about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--locale/programs/charmap.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aa2df2b491..555199c8a3 100644
--- 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 3ccebcac48..dec09a6118 100644
--- 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"),