Skip to content

Commit e245985

Browse files
committed
Remove duplicate implementation of CP932 from mbstring
Sigh. Double sigh. After fruitlessly searching the Internet for information on this mysterious text encoding called "SJIS-open", I wrote a script to try converting every Unicode codepoint from 0-0xFFFF and compare the results from different variants of Shift-JIS, to see which one "SJIS-open" would be most similar to. The result? It's just CP932. There is no difference at all. So why do we have two implementations of CP932 in mbstring? In case somebody, somewhere is using "SJIS-open" (or its aliases "SJIS-win" or "SJIS-ms"), add these as aliases to CP932 so existing code will continue to work.
1 parent 7502c86 commit e245985

9 files changed

+4
-360
lines changed

ext/mbstring/config.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
117117
libmbfl/filters/mbfilter_qprint.c
118118
libmbfl/filters/mbfilter_singlebyte.c
119119
libmbfl/filters/mbfilter_sjis.c
120-
libmbfl/filters/mbfilter_sjis_open.c
121120
libmbfl/filters/mbfilter_sjis_mobile.c
122121
libmbfl/filters/mbfilter_sjis_mac.c
123122
libmbfl/filters/mbfilter_sjis_2004.c

ext/mbstring/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if (PHP_MBSTRING != "no") {
2626
mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \
2727
mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c \
2828
mbfilter_utf8_mobile.c mbfilter_euc_jp_2004.c mbfilter_uuencode.c \
29-
mbfilter_cp5022x.c mbfilter_sjis_open.c mbfilter_sjis_mobile.c \
29+
mbfilter_cp5022x.c mbfilter_sjis_mobile.c \
3030
mbfilter_sjis_mac.c mbfilter_iso2022jp_2004.c \
3131
mbfilter_iso2022jp_mobile.c mbfilter_singlebyte.c \
3232
mbfilter_tl_jisx0201_jisx0208.c", "mbstring");

ext/mbstring/libmbfl/filters/mbfilter_cp932.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const unsigned char mblen_table_sjis[] = { /* 0x80-0x9f,0xE0-0xFF */
5454
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
5555
};
5656

57-
static const char *mbfl_encoding_cp932_aliases[] = {"MS932", "Windows-31J", "MS_Kanji", NULL};
57+
static const char *mbfl_encoding_cp932_aliases[] = {"MS932", "Windows-31J", "MS_Kanji", "SJIS-win", "SJIS-ms", "SJIS-open", NULL};
5858

5959
const mbfl_encoding mbfl_encoding_cp932 = {
6060
mbfl_no_encoding_cp932,

ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c

Lines changed: 0 additions & 308 deletions
This file was deleted.

ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

ext/mbstring/libmbfl/mbfl/mbfl_convert.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "filters/mbfilter_euc_kr.h"
4545
#include "filters/mbfilter_iso2022_kr.h"
4646
#include "filters/mbfilter_sjis.h"
47-
#include "filters/mbfilter_sjis_open.h"
4847
#include "filters/mbfilter_sjis_2004.h"
4948
#include "filters/mbfilter_sjis_mobile.h"
5049
#include "filters/mbfilter_sjis_mac.h"

0 commit comments

Comments
 (0)