Date: Wed, 7 Nov 2018 23:17:48 +0900 From: =?utf-8?B?5YaF6JekIOelkOS4gOmDjg==?= <naito.yuichiro@gmail.com> To: Kouichi Hirabayashi <kh@mogami.com> Cc: freebsd-users-jp@freebsd.org Subject: [FreeBSD-users-jp 96347] Re: =?utf-8?b?RnJlZUJTRC0xMS4yIOOBriBqYV9KUC5ldWNKUCDnkrDlooM=?= Message-ID: <038F6229-6740-48FF-B347-5BF095189C94@gmail.com> In-Reply-To: <20181107174239.55278a66865a3b406a5ea219@mogami.com> References: <20181014194410.b466d0bbf0e976ffbcab2969@mogami.com> <20181024115101.f6049ef61a82a1fdbab1a404@mogami.com> <201811061314.wA6DErDn002299@conssluserg-02.nifty.com> <45FE3A88-FE74-4F73-800B-598A18AE5E6D@gmail.com> <20181107174239.55278a66865a3b406a5ea219@mogami.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_CCC79897-0340-4B3F-B1CF-FDD1AED7572F
Content-Transfer-Encoding: base64
Content-Type: text/plain;
charset=utf-8
5YaF6Jek44Gn44GZ44CCDQoNCj4gMjAxOC8xMS8wNyAxNzo0MuOAgUtvdWljaGkgSGlyYWJheWFz
aGkgPGtoQG1vZ2FtaS5jb20+44Gu44Oh44O844OrOg0KPiANCj4g5L6L44GI44Gw44CBL3Vzci9z
cmMvbGliL2xpYmVkaXQg44KS5LiL6KiY44Gu44KI44GG44Gr5pu444GN5o+b44GI44Gm44CBRVVD
LUpQDQo+IOOBriAyIOODkOOCpOODiOaWh+Wtl+OCkumAo+e2muOBl+OBpuiqreOBv+OAgeaWh+Wt
l+W5heOBruioiOeul+OCkuato+OBl+OBhOWApOOBq+OBmeOCjOOBsOOAgQ0KPiAvbGliL2xpYmVk
aXQuc28uNyDjgpLnva7jgY3mj5vjgYjjgovjgaDjgZHjgaflm57pgb/jgafjgY3jgovjgojjgYbj
gafjgZnjgIINCg0K44Gq44KL44G744Gp44CBIGN0X2VuY193aWR0aCgpIOOCkuebtOOBl+OBpuOB
guOBkuOCjOOBsOiJr+OBi+OBo+OBn+OCk+OBp+OBmeOBreOAgg0K44Gd44KM44Gq44KJ44Gw44CB
5re75LuY44GuIGxpYmVkaXQucGF0Y2gg44GnIGV1Y0pQIOOBr+OBhOOBkeOCi+OCiOOBhuOBq+OB
quOCi+OBr+OBmuOBp+OBmeOAgg0KDQrjg57jg6vjg4Hjg5DjgqTjg4jjga7lh6bnkIbjga8gd2N0
b21iKDMpIOOBqCBtYnJ0b3djKDMpIOOBjCBsb2NhbGUg44KS6KaL44Gm5Yem55CG44GX44Gm44GP
44KM44G+44GZ44GL44KJ44CBDQrjgZ3jgaHjgonjgavku7vjgZvjgovmlrnjgYznsKHljZjjgafj
gZnjgIINCg0KQ0hBUlNFVF9JU19VVEY4IOODleODqeOCsOOBruW9semfv+evhOWbsuOCkuOCguOB
huWwkeOBl+iJr+OBj+imi+OCi+W/heimgeOBjOOBguOCiuOBvuOBmeOBruOBp+OAgQ0KVVRGLTgg
44Gu5aC05ZCI44GvIC9iaW4vc2gg6LW35YuV5pmC44GrIGxvY2FsZSDjgYzoqK3lrprjgZXjgozj
gabjgYTjgovlv4XopoHjgYzjgYLjgorjgb7jgZnjgZHjgozjganjgoLjgIENCuOBqOOCiuOBguOB
iOOBmiBldWNKUCDjga7loLTlkIjjgpLoqabjgZfjgabjgoLjgonjgYjjgb7jgZnjgafjgZfjgofj
gYbjgYvvvJ8NCg0KLS0gDQrlhoXol6Qg56WQ5LiA6YOODQpuYWl0by55dWljaGlyb0BnbWFpbC5j
b20NCg0KDQo=
--Apple-Mail=_CCC79897-0340-4B3F-B1CF-FDD1AED7572F
Content-Disposition: attachment;
filename=libedit.patch
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="libedit.patch"
Content-Transfer-Encoding: 7bit
Index: lib/libedit/chartype.c
===================================================================
--- lib/libedit/chartype.c (revision 340214)
+++ lib/libedit/chartype.c (working copy)
@@ -182,17 +182,11 @@
protected size_t
ct_enc_width(Char c)
{
- /* UTF-8 encoding specific values */
- if (c < 0x80)
- return 1;
- else if (c < 0x0800)
- return 2;
- else if (c < 0x10000)
- return 3;
- else if (c < 0x110000)
- return 4;
- else
- return 0; /* not a valid codepoint */
+ char buf[MB_LEN_MAX];
+ int size;
+ if ((size = wctomb(buf, c)) < 0)
+ return 0;
+ return size;
}
protected ssize_t
Index: lib/libedit/read.c
===================================================================
--- lib/libedit/read.c (revision 340214)
+++ lib/libedit/read.c (working copy)
@@ -363,17 +363,6 @@
goto again;
}
case (size_t)-2:
- /*
- * We don't support other multibyte charsets.
- * The second condition shouldn't happen
- * and is here merely for additional safety.
- */
- if ((el->el_flags & CHARSET_IS_UTF8) == 0 ||
- cbp >= MB_LEN_MAX) {
- errno = EILSEQ;
- *cp = L'\0';
- return -1;
- }
/* Incomplete sequence, read another byte. */
goto again;
default:
--Apple-Mail=_CCC79897-0340-4B3F-B1CF-FDD1AED7572F--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?038F6229-6740-48FF-B347-5BF095189C94>