From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8542 invoked by alias); 9 Oct 2017 09:42:54 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 41835 Received: (qmail 27529 invoked by uid 1010); 9 Oct 2017 09:42:54 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(205.235.26.22):SA:0(-1.2/5.0):. Processed in 1.232293 secs); 09 Oct 2017 09:42:54 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD,SPF_PASS,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: SRS0=+7k6=BI=yahoo.co.uk=okiddle@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.co.uk X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1507542143; bh=/VgoTvaZjs2amPr9uSS5uTpc04WV06yC9nfAIh8KIqQ=; h=From:References:To:Subject:Date:From:Subject; b=c1VOxrtoaRE2eGeUfNCeKku7U6RvtWO441EuWgxJhaz82v5ihkCXCSre/GyK8Galz1Jgl4gpNuxoPNIuAVf9nr/AJeykpzpY//N2zim+Iw60/g0LbtNHjBYqW5rkc7+fBfcNsSlcE21M+mLF0aK8OfQD3E8+kFHJMDqx40aKjOEXrwjfGMd/dY+z3RYzXOJjhwEggEyIdwx3mB7VfUheYDaq4IvBtYT457Dqp7UNjiKpEEiONGenKNbVk25E4ltV7VZ0vjv/BYKPabrIhzBGQXfNmsoOKVLlKjln5grzW7rTN1NPO6/s8DMBkKEe99vOFsowiiTESdC7A8PC2jE7qg== X-YMail-OSG: 3TusengVM1ktNf1dMvTscJJh.SPV9kPx4aeb7FQ8KZD_iQ8usIp23sUPWz_wiWu p8C9JbLvfX_z1sCR2.sy5cLscOuBCqFVY_utux9by3UvM3Ddr8nPDmvsLFmpMyfMj9We.._pAuOR 4XS0UNtzPhbZ9lU8xAl.XMVADEU2BQk1cBlS3n_hgRiRihrY4AFGL_qsBrCx6TzWu8niO84e6vqn Ui8SbiPLMymIbzOwtCaa3QnTZya7bkOOcL3.uk2GVswx2h92pz823yRlU9jmScb3L_1iylOfFPt3 XqyG.M_YFP6nQkIzUQnNdaufdOKFMvuv9ts0xF573VBBaDajrJ9vI7lJMQQozTFtCb3e9N5chYio ydt6Oo9z4a7VvOzbjKMinrZvMBAy1Xcr6nIwZaNs3wxUgI9NyA4qToKLBtKQ4kyWsiGXgH37N4pe h2tOKJhQTMFxCKwt8Aus0RGvhLpPs.AhosTVhQFqq2AXiK6PvmxrbkMCN.cF.WDZjQsusgA-- X-Yahoo-Newman-Id: 967230.97912.bm@smtp102.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 3TusengVM1ktNf1dMvTscJJh.SPV9kPx4aeb7FQ8KZD_iQ8 usIp23sUPWz_wiWup8C9JbLvfX_z1sCR2.sy5cLscOuBCqFVY_utux9by3Uv M3Ddr8nPDmvsLFmpMyfMj9We.._pAuOR4XS0UNtzPhbZ9lU8xAl.XMVADEU2 BQk1cBlS3n_hgRiRihrY4AFGL_qsBrCx6TzWu8niO84e6vqnUi8SbiPLMymI bzOwtCaa3QnTZya7bkOOcL3.uk2GVswx2h92pz823yRlU9jmScb3L_1iylOf FPt3XqyG.M_YFP6nQkIzUQnNdaufdOKFMvuv9ts0xF573VBBaDajrJ9vI7lJ MQQozTFtCb3e9N5chYioydt6Oo9z4a7VvOzbjKMinrZvMBAy1Xcr6nIwZaNs 3wxUgI9NyA4qToKLBtKQ4kyWsiGXgH37N4peh2tOKJhQTMFxCKwt8Aus0RGv hLpPs.AhosTVhQFqq2AXiK6PvmxrbkMCN.cF.WDZjQsusgA-- X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- In-reply-to: <22320.1507334630@thecus.kiddle.eu> From: Oliver Kiddle References: <22320.1507334630@thecus.kiddle.eu> To: Zsh workers Subject: PATCH: handle multibyte chars in compset -p/-s MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <17690.1507542140.1@thecus.kiddle.eu> Date: Mon, 09 Oct 2017 11:42:20 +0200 Message-ID: <17691.1507542140@thecus.kiddle.eu> On 7 Oct, I wrote: > Incidentally, while pondering such a solution, I noticed that > compset -p is removing bytes rather than characters to IPREFIX which > would have been useful in this case but should be corrected. Having further checked uses of compset -p, I'm satisfied that compset -p and -s should be handling multibyte characters so this is a patch to do that. Is mb_metacharlenconv and backwardmetafiedchar as used here the best way to do that? Oliver diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 68bdf2332..16f48c958 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -934,19 +934,45 @@ do_comp_vars(int test, int na, char *sa, int nb, char *sb, int mod) } case CVT_PRENUM: case CVT_SUFNUM: - if (!na) - return 1; - if (na > 0 && - (int)strlen(test == CVT_PRENUM ? compprefix : compsuffix) >= na) { - if (mod) { - if (test == CVT_PRENUM) - ignore_prefix(na); - else - ignore_suffix(na); - return 1; - } + if (na < 0) return 0; + if (na > 0 && mod) { +#ifdef MULTIBYTE_SUPPORT + if (isset(MULTIBYTE)) { + if (test == CVT_PRENUM) { + const char *ptr = compprefix; + int len = 1; + int sum = 0; + while (*ptr && na && len) { + wint_t wc; + len = mb_metacharlenconv(ptr, &wc); + ptr += len; + sum += len; + na--; + } + if (na) + return 0; + na = sum; + } else { + char *end = compsuffix + strlen(compsuffix); + char *ptr = end; + while (na-- && ptr > compsuffix) + ptr = backwardmetafiedchar(compsuffix, ptr, NULL); + if (na >= 0) + return 0; + na = end - ptr; + } + } else +#endif + if ((int)strlen(test == CVT_PRENUM ? compprefix : compsuffix) >= na) + return 0; + if (test == CVT_PRENUM) + ignore_prefix(na); + else + ignore_suffix(na); + return 1; } + return 1; case CVT_PREPAT: case CVT_SUFPAT: {