From 76c613496641fa64cd877cdec89b53aa3586f02b Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 30 Jun 2005 05:31:01 +0000 Subject: [PATCH] Fixed two bugs in Perl to C conversion that prevented locale name from being parsed correctly. OK'ed by: markm Approved by: re (scottl) MFC after: 3 days --- usr.sbin/kbdmap/kbdmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index 5f2bffdaffe4..b99b057c9a11 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -571,7 +571,7 @@ menu_read(void) /* en_US.ISO8859-1 -> en_..\.ISO8859-1 */ strlcpy(dialect, lang, sizeof(dialect)); - if (strlen(dialect) >= 6 && dialect[2] == '-') { + if (strlen(dialect) >= 6 && dialect[2] == '_') { dialect[3] = '.'; dialect[4] = '.'; } @@ -579,8 +579,8 @@ menu_read(void) /* en_US.ISO8859-1 -> en */ strlcpy(lang_abk, lang, sizeof(lang_abk)); - if (strlen(lang_abk) >= 3 && lang_abk[2] == '-') - lang_abk[2] = '.'; + if (strlen(lang_abk) >= 3 && lang_abk[2] == '_') + lang_abk[2] = '\0'; fprintf(stderr, "lang_default = %s\n", lang_default); fprintf(stderr, "dialect = %s\n", dialect);