picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update.

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

	* locale/programs/charmap.c: Allow string arguments for
	code_set_name and repertoiremap.
This commit is contained in:
Ulrich Drepper 2000-06-07 17:20:28 +00:00
parent 99ac5e47c0
commit 2a63199095
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

4
locale/programs/charmap.c
View file

@ -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"),