nls: Update to Unicode 12.1.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 nls: Update to Unicode 12.1.0
Hi Ted,
Like the kernel version, here is the unicode 12.1 update I promissed. Feel free to squash it into the Unicode 12.0 update.
Signed-off-by Gabriel Krisman Bertazi <[email protected]>
--- lib/e2p/encoding.c | 2 +- lib/ext2fs/ext2_fs.h | 2 +- lib/ext2fs/nls.h | 4 ++-- lib/ext2fs/nls_utf8.c | 4 ++-- lib/ext2fs/utf8data.h | 17 ++++++++++------- 5 files changed, 16 insertions(+), 13 deletions(-)
lib/e2p/encoding.c +1 -1
@@ -29,7 +29,7 @@ static const struct { } ext4_encoding_map[] = { { - .encoding_magic = EXT4_ENC_UTF8_12_0, + .encoding_magic = EXT4_ENC_UTF8_12_1, .name = "utf8", .default_flags = 0, },
lib/ext2fs/ext2_fs.h +1 -1
@@ -1128,7 +1128,7 @@ struct mmp_struct {*/ #define EXT4_INLINE_DATA_DOTDOT_SIZE (4) -#define EXT4_ENC_UTF8_12_0 1 +#define EXT4_ENC_UTF8_12_1 1#define EXT4_ENC_STRICT_MODE_FL (1 << 0)/* Reject invalid sequences */
lib/ext2fs/nls.h +2 -2
@@ -43,13 +43,13 @@ struct nls_table {const struct nls_ops *ops; }; -extern const struct nls_table nls_utf8_12_0; +extern const struct nls_table nls_utf8_12_1;static const struct {int encoding_magic;const struct nls_table *tbl; } nls_map[] = { - {EXT4_ENC_UTF8_12_0 , &nls_utf8_12_0 }, + {EXT4_ENC_UTF8_12_1 , &nls_utf8_12_1 }, };static const struct nls_table *nls_load_table (int encoding)
lib/ext2fs/nls_utf8.c +2 -2
@@ -58,7 +58,7 @@ const static struct nls_ops utf8_ops = { .casefold = utf8_casefold, }; -const struct nls_table nls_utf8_12_0 = { +const struct nls_table nls_utf8_12_1 = { .ops = &utf8_ops, - .version =UNICODE_AGE (12 ,0 ,0 ), + .version =UNICODE_AGE (12 ,1 ,0 ), };
lib/ext2fs/utf8data.h +10 -7
@@ -3,7 +3,7 @@#error Only nls_utf8-norm.c should include this file.#endif -static const unsigned int utf8vers =0xc0000 ; +static const unsigned int utf8vers =0xc0100 ;static const unsigned int utf8agetab[] = {0 ,
@@ -27,7 +27,8 @@ static const unsigned int utf8agetab[] = {0x90000 ,0xa0000 ,0xb0000 , -0xc0000 +0xc0000 , +0xc0100 }; static const struct utf8data utf8nfdicfdata[] = {
@@ -52,7 +53,8 @@ static const struct utf8data utf8nfdicfdata[] = { { 0x90000, 3200 }, { 0xa0000, 3200 }, { 0xb0000, 3200 }, - { 0xc0000, 3200 } + { 0xc0000, 3200 }, + { 0xc0100, 3200 } }; static const struct utf8data utf8nfdidata[] = {
@@ -77,7 +79,8 @@ static const struct utf8data utf8nfdidata[] = { { 0x90000, 20736 }, { 0xa0000, 20736 }, { 0xb0000, 20736 }, - { 0xc0000, 20736 } + { 0xc0000, 20736 }, + { 0xc0100, 20736 } }; static const unsigned char utf8data[64256] = {
@@ -285,7 +288,7 @@ static const unsigned char utf8data[64256] = {0xe8 ,0x9a ,0x88 ,0x00 ,0x05 ,0xff ,0xe8 ,0x9c ,0x8e ,0x00 ,0xd1 ,0x10 ,0x10 ,0x08 ,0x05 ,0xff ,0xe8 ,0x9c ,0xa8 ,0x00 ,0x05 ,0xff ,0xe8 ,0x9d ,0xab ,0x00 ,0x10 ,0x08 ,0x05 ,0xff ,0xe8 ,0x9e ,0x86 ,0x00 ,0x05 ,0xff ,0xe4 ,0xb5 ,0x97 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -/* nfdicf_c0000 */ +/* nfdicf_c0100 */ 0xd7 ,0xb0 ,0x56 ,0x04 ,0x01 ,0x00 ,0x95 ,0xa8 ,0xd4 ,0x5e ,0xd3 ,0x2e ,0xd2 ,0x16 ,0xd1 ,0x0a ,0x10 ,0x04 ,0x01 ,0x00 ,0x01 ,0xff ,0x61 ,0x00 ,0x10 ,0x06 ,0x01 ,0xff ,0x62 ,0x00 ,0x01 ,0xff , 0x63,0x00,0xd1,0x0c,0x10,0x06,0x01,0xff,0x64,0x00,0x01,0xff,0x65,0x00,0x10,0x06,
@@ -1382,7 +1385,7 @@ static const unsigned char utf8data[64256] = {0x00 ,0x12 ,0x00 ,0x12 ,0x00 ,0x12 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -/* nfdi_c0000 */ +/* nfdi_c0100 */ 0x57 ,0x04 ,0x01 ,0x00 ,0xc6 ,0xe5 ,0xac ,0x13 ,0xe4 ,0x41 ,0x0c ,0xe3 ,0x7a ,0x07 ,0xe2 ,0xf3 ,0x01 ,0xc1 ,0xd0 ,0x1f ,0xcf ,0x86 ,0x55 ,0x04 ,0x01 ,0x00 ,0x94 ,0x15 ,0x53 ,0x04 ,0x01 ,0x00 , 0x52,0x04,0x01,0x00,0x91,0x09,0x10,0x04,0x01,0x00,0x01,0xff,0x00,0x01,0x00,0x01,
@@ -2698,7 +2701,7 @@ static const unsigned char utf8data[64256] = {0x04 ,0x01 ,0x00 ,0x54 ,0x04 ,0x01 ,0x00 ,0x93 ,0x10 ,0x92 ,0x0c ,0x91 ,0x08 ,0x10 ,0x04 ,0x01 ,0x00 ,0x06 ,0x00 ,0x06 ,0x00 ,0x06 ,0x00 ,0x06 ,0x00 ,0xcf ,0x86 ,0xd5 ,0x10 ,0x94 ,0x0c ,0x53 ,0x04 ,0x01 ,0x00 ,0x12 ,0x04 ,0x01 ,0x00 ,0x07 ,0x00 ,0x01 ,0x00 ,0x54 ,0x04 ,0x01 ,0x00 ,0x53 , -0x04 ,0x01 ,0x00 ,0x52 ,0x04 ,0x01 ,0x00 ,0x51 ,0x04 ,0x01 ,0x00 ,0x10 ,0x04 ,0x01 ,0x00 ,0x00 , +0x04 ,0x01 ,0x00 ,0x52 ,0x04 ,0x01 ,0x00 ,0x51 ,0x04 ,0x01 ,0x00 ,0x10 ,0x04 ,0x01 ,0x00 ,0x16 ,0x00 ,0xd1 ,0x30 ,0xd0 ,0x06 ,0xcf ,0x06 ,0x01 ,0x00 ,0xcf ,0x86 ,0x55 ,0x04 ,0x01 ,0x00 ,0x54 ,0x04 ,0x01 ,0x00 ,0xd3 ,0x10 ,0x52 ,0x04 ,0x01 ,0x00 ,0x51 ,0x04 ,0x01 ,0x00 ,0x10 ,0x04 ,0x01 , 0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x01,0x00,0x01,
Signature · 1 line
2.20.1
Quoted 6 lines · Gabriel Krisman Bertazi
Hi Ted,
Like the kernel version, here is the unicode 12.1 update I promissed. Feel free to squash it into the Unicode 12.0 update.
Signed-off-by Gabriel Krisman Bertazi <[email protected]>
Thanks, I squashed this into the Unicode 12.0.0 update.
- Ted