about summary refs log tree commit diff
path: root/locale/programs/charmap.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-07 17:20:28 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-07 17:20:28 +0000
commit2a63199095b7f9f4881787876d29a17c971f87f0 (patch)
treef4e947542f98cbe5669a4574d914e01f9396dd40 /locale/programs/charmap.c
parent99ac5e47c0d9c9747b01190c3df82b078b9a8a07 (diff)
downloadglibc-2a63199095b7f9f4881787876d29a17c971f87f0.tar.gz
glibc-2a63199095b7f9f4881787876d29a17c971f87f0.tar.xz
glibc-2a63199095b7f9f4881787876d29a17c971f87f0.zip
Update.
2000-06-07  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/charmap.c: Allow string arguments for
	code_set_name and repertoiremap.
Diffstat (limited to 'locale/programs/charmap.c')
-rw-r--r--locale/programs/charmap.c4
1 files changed, 3 insertions, 1 deletions
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"),