(charmap_read): If the charmap doesn't define a code_set_name provide one

based on the filename.

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index b815e5154b77034b666dbbbc87f0bd677a35ee02..22624bd39f38e84391ba2551c8b9fbcab7c781d1 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -198,6 +198,11 @@ character map file `%s' not found"), filename));
 default character map file `%s' not found"), DEFAULT_CHARMAP));
     }
 
+  if (result->code_set_name == NULL)
+    /* The input file does not specify a code set name.  This
+       shouldn't happen but we should cope with it.  */
+    result->code_set_name = basename (filename);
+
   /* Test of ASCII compatibility of locale encoding.
 
      Verify that the encoding to be used in a locale is ASCII compatible,