From 374f31e36471055ba32b0b2afb8729fbcf489251 Mon Sep 17 00:00:00 2001 From: Alex Dowad Date: Sun, 6 Sep 2020 13:10:52 +0200 Subject: [PATCH] Add mbstring identify filter for 'binary' encoding --- ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c | 6 ++++++ ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h | 1 + ext/mbstring/libmbfl/mbfl/mbfl_ident.c | 1 + 3 files changed, 8 insertions(+) diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index 4017829cf8..41081aa883 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -50,6 +50,12 @@ const mbfl_encoding mbfl_encoding_8bit = { &vtbl_wchar_8bit }; +const struct mbfl_identify_vtbl vtbl_identify_8bit = { + mbfl_no_encoding_8bit, + mbfl_filt_ident_common_ctor, + mbfl_filt_ident_true +}; + const struct mbfl_convert_vtbl vtbl_8bit_wchar = { mbfl_no_encoding_8bit, mbfl_no_encoding_wchar, diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h index acdf640fd7..64369b999d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h @@ -35,5 +35,6 @@ #include "mbfilter.h" MBFLAPI extern const mbfl_encoding mbfl_encoding_8bit; +extern const struct mbfl_identify_vtbl vtbl_identify_8bit; #endif /* MBFL_MBFILTER_8BIT_H */ diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c index 59bcdc84ca..e6163d538c 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c @@ -163,6 +163,7 @@ static const struct mbfl_identify_vtbl *mbfl_identify_filter_list[] = { &vtbl_identify_utf16, &vtbl_identify_utf16le, &vtbl_identify_utf16be, + &vtbl_identify_8bit, &vtbl_identify_false, NULL }; -- 2.50.1