diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2020-11-08 10:59:08 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2020-11-08 10:59:08 +0100 |
| commit | 22bb4b319b3d722ac7bf041a6374cd40afdc4d53 (patch) | |
| tree | a07d7d0764a8488f4b5ebef1561e2f3d8caacc05 /src/euc_jp.c | |
| parent | 0f259c3073f341c48468e80e93731daa31698030 (diff) | |
| parent | b4158caf13bc715096c1df7c040c9d25995d76f2 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/euc_jp.c')
| -rw-r--r-- | src/euc_jp.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/euc_jp.c b/src/euc_jp.c index 640b3e3..bfe91bf 100644 --- a/src/euc_jp.c +++ b/src/euc_jp.c @@ -2,7 +2,7 @@ euc_jp.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2019 K.Kosako + * Copyright (c) 2002-2020 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -114,10 +114,20 @@ static int code_to_mbclen(OnigCodePoint code) { if (ONIGENC_IS_CODE_ASCII(code)) return 1; - else if ((code & 0xff0000) != 0) return 3; - else if ((code & 0xff00) != 0) return 2; - else - return ONIGERR_INVALID_CODE_POINT_VALUE; + else if ((code & 0xff0000) != 0) { + if (EncLen_EUCJP[(int )(code >> 16) & 0xff] == 3) + return 3; + } + else if ((code & 0xff00) != 0) { + if (EncLen_EUCJP[(int )(code >> 8) & 0xff] == 2) + return 2; + } + else if (code < 256) { + if (EncLen_EUCJP[(int )(code & 0xff)] == 1) + return 1; + } + + return ONIGERR_INVALID_CODE_POINT_VALUE; } static int @@ -125,8 +135,13 @@ code_to_mbc(OnigCodePoint code, UChar *buf) { UChar *p = buf; - if ((code & 0xff0000) != 0) *p++ = (UChar )(((code >> 16) & 0xff)); - if ((code & 0xff00) != 0) *p++ = (UChar )(((code >> 8) & 0xff)); + if ((code & 0xff0000) != 0) { + *p++ = (UChar )(((code >> 16) & 0xff)); + *p++ = (UChar )(((code >> 8) & 0xff)); + } + else if ((code & 0xff00) != 0) + *p++ = (UChar )(((code >> 8) & 0xff)); + *p++ = (UChar )(code & 0xff); #if 1 |