locale: Add SHIFT-JIS as another name for SJIS

The iconv code uses SHIFT-JIS, so match that.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

newlib/libc/locale/locale.c

@@ -41,7 +41,7 @@ for instance <<"C.UTF-8">>, which keeps all settings as in the C locale,
 but uses the UTF-8 charset.
 
 The following charsets are recognized:
-<<"UTF-8">>, <<"JIS">>, <<"EUCJP">>, <<"SJIS">>, <<"KOI8-R">>, <<"KOI8-U">>,
+<<"UTF-8">>, <<"JIS">>, <<"EUCJP">>, <<"SHIFT-JIS">>, <<"KOI8-R">>, <<"KOI8-U">>,
 <<"KOI8-T">>, <<"GEORGIAN-PS">>, <<"PT154">>, <<"TIS-620">>, <<"ISO-8859-x">>
 with 1 <= x <= 16, or <<"CPxxx">> with xxx in [437, 720, 737, 775, 850, 852,
 855, 857, 858, 862, 866, 874, 932, 1125, 1250, 1251, 1252, 1253, 1254, 1255,
@@ -618,9 +618,9 @@ __loadlocale (struct __locale_t *loc, int category, char *new_locale)
     break;
     case 'S':
     case 's':
-      if (strcasecmp (charset, "SJIS"))
+      if (strcasecmp (charset, "SJIS") && strcasecmp (charset, "SHIFT-JIS"))
 	FAIL;
-      strcpy (charset, "SJIS");
+      strcpy (charset, "SHIFT-JIS");
       mbc_max = 2;
       l_wctomb = __sjis_wctomb;
       l_mbtowc = __sjis_mbtowc;

test/meson.build

@@ -618,9 +618,9 @@ if enable_native_tests
                        'CP874', 'CP1125', 'CP1250', 'CP1251', 'CP1252', 'CP1253',
                        'CP1254', 'CP1256', 'CP1257', 'KOI8-R', 'KOI8-U',
 
-                       'SJIS', 'EUC-JP']
+                       'SHIFT-JIS', 'EUC-JP']
         locale = 'C.' + ctype
-        if ctype == 'SJIS'
+        if ctype == 'SHIFT-JIS'
           ctype = 'SHIFT_JIS'
         elif ctype == 'CP437'
           ctype = 'IBM437'

test/test-ctype.c

@@ -103,7 +103,8 @@ static const char *locales[] = {
     "C.CP1254", "C.CP1256", "C.CP1257", "C.KOI8-R", "C.KOI8-U",
 #endif
 #ifdef HAVE_JIS_CHARSETS
-    "C.SJIS",
+    "C.SHIFT-JIS",
+    "C.EUC-JP",
 #endif
 };
 

test/test-encode.c

@@ -71,7 +71,7 @@ static const char *locales[] = {
 #ifdef HAVE_JIS_CHARSETS
 #define JIS_START       (NUM_LOCALE-2)
     "C.EUC-JP",
-    "C.SJIS",
+    "C.SHIFT-JIS",
 #endif
 };
 

test/test-wctype.c

@@ -111,7 +111,7 @@ static const char *locales[] = {
     "C.CP1254", "C.CP1256", "C.CP1257", "C.KOI8-R", "C.KOI8-U",
 #endif
 #ifdef HAVE_JIS_CHARSETS
-    "C.SJIS",
+    "C.SHIFT-JIS",
     "C.EUC-JP",
 #endif
 };