diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-10-01 18:59:42 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-10-01 18:59:42 +0000 |
| commit | 4a9dcff10ec07770aaf0b4dedaac44eacbbaa110 (patch) | |
| tree | ab9c931b7f57f4ef5e82dc2260717b621f3650ff /locale/programs/charmap.c | |
| parent | 70440f48d8c4aa57f030485b60a7faf686f1dd4d (diff) | |
| download | glibc-4a9dcff10ec07770aaf0b4dedaac44eacbbaa110.tar.gz glibc-4a9dcff10ec07770aaf0b4dedaac44eacbbaa110.tar.xz glibc-4a9dcff10ec07770aaf0b4dedaac44eacbbaa110.zip | |
Update.
* charmaps/ISO-IR-197: Remove alias "none". 2000-09-30 Bruno Haible <haible@clisp.cons.org>
Diffstat (limited to 'locale/programs/charmap.c')
| -rw-r--r-- | locale/programs/charmap.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index f76bc24709..b8e994fdac 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -120,7 +120,7 @@ charmap_read (const char *filename) } } - if (result == NULL) + if (result == NULL && filename != NULL) { /* OK, one more try. We also accept the names given to the character sets in the files. Sometimes they differ from the @@ -155,12 +155,9 @@ 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 (filename != NULL - && strcasecmp (name, filename) == 0) + if (strcasecmp (name, filename) == 0) break; free (name); @@ -189,9 +186,6 @@ charmap_read (const char *filename) result = (cmfile == NULL ? NULL : parse_charmap (cmfile)); - if (result) - return result; - break; } } |