From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35739-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 12097 invoked by alias); 9 Jul 2015 04:31:13 -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>
X-Seq: 35739
Received: (qmail 15686 invoked from network); 9 Jul 2015 04:31:12 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2
	autolearn=ham autolearn_force=no version=3.4.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=RNDdnp2k393bIs1v4MeDw77Q8BEEaayYvQaDPinuDpw=;
        b=hBlsSE/E+eEi0MVF2C0rIxetoa0uW7KQgvKRfsKrxMrgjMhpUgV4gwYdGDL+o7Ti8y
         rKSrDqWVWhy846syMQmyaTLHhx7lFJPTHZ0pWAqqFaMC7/5Aqo+CURmuZ79nMjNbupPl
         X7x8Q3vEJ1PZQ64l2o7wuYgjneGrpcMljOpn25x96C1RApnLoTtAcEydcDf9mXsgily3
         M4Hf/PUyacVItLC0lDPrW9k3PffNSDOIIgdmVlzx62EsxQnxNG5TmlAdpgohRc19q9Ph
         x4UYg1WIOCOMwtlY/XLg0XBPQDQ8CLjO9vgUGm8JVaCJeyoRHmw42FxFwK19FmW/CUKI
         ZStg==
MIME-Version: 1.0
X-Received: by 10.107.136.89 with SMTP id k86mr23441046iod.53.1436416267814;
 Wed, 08 Jul 2015 21:31:07 -0700 (PDT)
In-Reply-To: <1436367975-2945-1-git-send-email-mikachu@gmail.com>
References: <1436366383-23389-1-git-send-email-mikachu@gmail.com>
	<1436367975-2945-1-git-send-email-mikachu@gmail.com>
Date: Thu, 9 Jul 2015 06:31:07 +0200
Message-ID: <CAHYJk3SgpaEqh2ZeMcCovnP=ykw-y0StSQd_G9q55eVq6M6wuQ@mail.gmail.com>
Subject: Re: PATCH: ztrftime: Handle all non-zsh format chars with strftime if
 present (v2)
From: Mikael Magnusson <mikachu@gmail.com>
To: zsh workers <zsh-workers@zsh.org>
Content-Type: text/plain; charset=UTF-8

On Wed, Jul 8, 2015 at 5:06 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
> At this point, even I find the code slightly questionable. And this doesn't even work properly yet:
> % print -P %D\{aa%14a\}
> aa%
> % print -P %D\{aaa%14a\}
> aaa           Wed
>
> ---
>  Src/utils.c | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/Src/utils.c b/Src/utils.c
> index 2d53a00..c18a8de 100644
> --- a/Src/utils.c
> +++ b/Src/utils.c
> @@ -2933,6 +2933,11 @@ ztrftime(char *buf, int bufsize, char *fmt, struct tm *tm, long usec)
>             if (ztrftimebuf(&bufsize, 2))
>                 return -1;
>  morefmt:
> +           if (!((fmt - fmtstart == 1) || (fmt - fmtstart == 2 && strip) || *fmt == '.')) {
> +               while (*fmt && strchr("OE^#_-0123456789", *fmt++));
> +               if (*fmt++)
> +                   goto strftimehandling;
> +           }
>             switch (*fmt++) {
>             case '.':
>                 if (ztrftimebuf(&bufsize, digs))

Okay, fun thinko here, should be
-               while (*fmt && strchr("OE^#_-0123456789", *fmt++));
+               while (*fmt && strchr("OE^#_-0123456789", *fmt))
+                   fmt++;

I even had to stare at this for a minute to realize why it fixes it.

-- 
Mikael Magnusson