From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-42480-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 16008 invoked by alias); 19 Mar 2018 00:09:21 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 42480
Received: (qmail 220 invoked by uid 1010); 19 Mar 2018 00:09:21 -0000
X-Qmail-Scanner-Diagnostics: from mail-pf0-f173.google.com by f.primenet.com.au (envelope-from <schaefer@brasslantern.com>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(209.85.192.173):SA:0(-1.9/5.0):. 
 Processed in 7.046541 secs); 19 Mar 2018 00:09:21 -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.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE,
	RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no
	version=3.4.1
X-Envelope-From: schaefer@brasslantern.com
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=brasslantern-com.20150623.gappssmtp.com; s=20150623;
        h=from:message-id:date:in-reply-to:comments:references:to:subject
         :mime-version;
        bh=XC/fb5JkW9Ghd1u4RL9NPWDNnLkk+qX1mTjRiDOyjoU=;
        b=tEUZApvzI8I2nNbybxm+P+zJ4pJimgHk7bw7WtKyXUW59CQnTaHgF7ITLw9q0ZZqB/
         6mKHoqukPMRvgQrUYmWWam8bsoeX8u5aV0Yv6eCQDhbH4/X0oiW7NRBQygsAPBZLmwWk
         4+o/gF1yNx0C0cJLw3xhbpmCwMKMMxONZaSIpx/0gMw5KbTYKykzehx4ckMHdezFXKTa
         ey8DdiNDb7pZzNMIx14umDuq2anSniivYUF7W8vXzMCb5EIjz1g1g9PDZHtwk6b+MLUT
         6u3SDBROSf1RtW+hgpEHmdF3SNXjWodZsKHNRUPqbWBB4FYCb2jyF7JevI9dlTWkP5Tn
         PhMw==
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:date:in-reply-to:comments
         :references:to:subject:mime-version;
        bh=XC/fb5JkW9Ghd1u4RL9NPWDNnLkk+qX1mTjRiDOyjoU=;
        b=KIxWuiFu7fsMUQoIgo8I6uRZyxQn2LjkAG/4C+/McTv/csH+W+mBx7iECVsb+9Bekm
         WZYEfEttzn1tFgKC4UNRpGnyaRTiw3QC5F2OxB4DNqJdtqu7hm1KFboemkJGTPc8b5UI
         vw9/hc8KwIggP9pEZVFL8nqnoMo/Gpvx9CwNlCfGxMUG0D6H6svFQMt3fSO2LIwNsysk
         E3/H+mA/87uN+Fmfz4wBkoiVPmB40YxRV0pXCIJ1zDzU0XB+tqaspiBCrSdtIbgx43uR
         6UiCjcppOP2bdUkGQ4d3CdUuT9NBBu9VLxDhmfmu9eURZMVFOalxjJkDc+YPwTuvldJs
         9vSA==
X-Gm-Message-State: AElRT7FZdaBYs0tVmHc3zMcrk1yY3m4u6OZu2fdTgXcneibBD0ptdKw3
	9b3i38vhFcMWAIh3u5Qdjz3baI12
X-Google-Smtp-Source: AG47ELvjvvxqu1Skx8Qcoc5V4q+WN4Wbcy3t4J+Z4UrW318pHOPs2db9XXT1f/VAsH/T6h3JGxDlSA==
X-Received: by 10.98.39.7 with SMTP id n7mr6845171pfn.161.1521418151718;
        Sun, 18 Mar 2018 17:09:11 -0700 (PDT)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-Id: <180318170909.ZM5976@torch.brasslantern.com>
Date: Sun, 18 Mar 2018 17:09:09 -0700
In-Reply-To: <20180315072550.GB10057@chaz.gmail.com>
Comments: In reply to Stephane Chazelas <stephane.chazelas@gmail.com>
        "EILSEQ in the C locale? (Was: $(<nofile) doesn't set $? to non-zero)" (Mar 15,  7:25am)
References: <CGME20180314103335epcas4p30222f0df02adda27cbddbe62075ff9ad@epcas4p3.samsung.com> 
	<20180314103254.GA10404@chaz.gmail.com> 
	<20180314105442.28c5554a@camnpupstephen> 
	<20180314144248.GC10404@chaz.gmail.com> 
	<20180314145004.6e4b971b@camnpupstephen> 
	<20180315071204.GA10057@chaz.gmail.com> 
	<20180315072550.GB10057@chaz.gmail.com>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: EILSEQ in the C locale? (Was: $(<nofile) doesn't set $? to non-zero)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

On Mar 15,  7:25am, Stephane Chazelas wrote:
}
} Maybe some optimisation could be done and things like mbstowc()
} avoided when MB_CUR_MAX is 1 or something like that?

The following seems to work for this particular case ($#var) but there
are other places where we walk a wide char array with mbrtowc() so this
is not complete.

diff --git a/Src/utils.c b/Src/utils.c
index 3b589aa..ba78f29 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -5496,7 +5496,7 @@ mb_metastrlenend(char *ptr, int width, char *eptr)
     wchar_t wc;
     int num, num_in_char, complete;
 
-    if (!isset(MULTIBYTE))
+    if (!isset(MULTIBYTE) || MB_CUR_MAX == 1)
 	return eptr ? (int)(eptr - ptr) : ztrlen(ptr);
 
     laststart = ptr;