From owner-freebsd-users-jp@freebsd.org Wed Nov 7 14:17:54 2018 Return-Path: Delivered-To: freebsd-users-jp@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7926112757A for ; Wed, 7 Nov 2018 14:17:54 +0000 (UTC) (envelope-from naito.yuichiro@gmail.com) Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E09BE6B6D0 for ; Wed, 7 Nov 2018 14:17:53 +0000 (UTC) (envelope-from naito.yuichiro@gmail.com) Received: by mail-pg1-x534.google.com with SMTP id r9-v6so7377510pgv.6 for ; Wed, 07 Nov 2018 06:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=NU3ebVPt4haK27OzcHQhCT/qkqxfDXfj5wRgxtOJuNo=; b=JXsQ/2eyrQugEYqsdCkTzPdJluERUaK15JJIDE9aRdRhFI9KTps8iz3XnjuzPqjrxw ER9Qwn0ul9fFJ8CBrkRScj7BZ+wC0pmc1xrb+774DrwmXrcaY6yNcI73C0RhCFUjYDjk kxaxL/jeGmM4JV5L9Mv5vIyyovj2KpV37a8h//4VWxjvcPyFrKwI5cq6VpVK6SANtcM9 wev+jylXhR9hcspXQmWD0EHZEAisMPo6yyu913uLeg0UNwD5V2Zb3LvO4w5orIzvWos2 vRdKnu5ywRa/VoqKKR58+H06qearMb2PbJ5WAH6VJ3tiKCFsdoEl1oWcv35dctKoAVnH ghiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=NU3ebVPt4haK27OzcHQhCT/qkqxfDXfj5wRgxtOJuNo=; b=JVOuTl1/ymV4NXJ51jCfYo8wISRx3uPZ/OiLdmdO0XmY1GHXxbuaBkwMV6Rk6Ggs7E w1OJgmL7+XSGMGg2ZOtlaYC3F/fOWdvd9lWvMCowvTeudKj7OTB/f7Aa/6+gohzFQmK5 2Y0k/wo+gO0IpBlLlNowZiW5UCRqxmXAn5D88+Igr1pOKZ1CMpJaRS0g41czOHqbpnaq pNJUdrtTSS6mwd4yokUlqc0jD3iCQ0BhQUSMXeyYt04Fbzjqjjzwrsm7VihuBDZrSRA9 hEoTJIvH1xBP9NK/55UBhWDsLRWmYRiIs123jiNDDNyffG0Nrg3EKhooF9rmE2kQgtB3 xPww== X-Gm-Message-State: AGRZ1gITpCzDk1VYU1f36yTVwiAjvuyq/JL2mX30zlciwy0gDO7anQnX B2yjUgxIomcqGXI/fcfH1CnkhCEXfU0= X-Google-Smtp-Source: AJdET5cLvKkvjoeAsWHmrBVI0Z8mNwq3Kt5ZQe2LO2Vmh89RTL+rewbiHw9XLuvLwp+JxASy5RTHbw== X-Received: by 2002:a62:6e47:: with SMTP id j68-v6mr365092pfc.197.1541600272842; Wed, 07 Nov 2018 06:17:52 -0800 (PST) Received: from ?IPv6:2400:2410:c120:8d00:92:6c93:21:2aff? ([2400:2410:c120:8d00:92:6c93:21:2aff]) by smtp.gmail.com with ESMTPSA id x123-v6sm891097pfb.124.2018.11.07.06.17.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 06:17:52 -0800 (PST) From: =?utf-8?B?5YaF6JekIOelkOS4gOmDjg==?= Message-Id: <038F6229-6740-48FF-B347-5BF095189C94@gmail.com> Content-Type: multipart/mixed; boundary="Apple-Mail=_CCC79897-0340-4B3F-B1CF-FDD1AED7572F" Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Date: Wed, 7 Nov 2018 23:17:48 +0900 In-Reply-To: <20181107174239.55278a66865a3b406a5ea219@mogami.com> Cc: freebsd-users-jp@freebsd.org To: Kouichi Hirabayashi 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> X-Mailer: Apple Mail (2.3445.9.1) X-Rspamd-Queue-Id: E09BE6B6D0 X-Spamd-Result: default: False [-3.44 / 200.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MV_CASE(0.50)[]; HAS_ATTACHMENT(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; MIME_BASE64_TEXT(0.10)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.54)[-0.539,0]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(-0.49)[ipnet: 2607:f8b0::/32(-1.03), asn: 15169(-1.34), country: US(-0.09)]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; R_DKIM_ALLOW(-0.20)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.996,0]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-users-jp@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[4.3.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0] X-Rspamd-Server: mx1.freebsd.org Subject: [FreeBSD-users-jp 96347] Re: =?utf-8?b?RnJlZUJTRC0xMS4yIOOBriBqYV9KUC5ldWNKUCDnkrDlooM=?= X-BeenThere: freebsd-users-jp@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion relevant to FreeBSD communities in Japan List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2018 14:17:54 -0000 --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--