From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIMWL_WL_MED autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 2d06f42e for ; Fri, 28 Dec 2018 22:14:05 +0000 (UTC) Received: (qmail 12270 invoked by alias); 28 Dec 2018 22:13:46 -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: List-Unsubscribe: X-Seq: 43949 Received: (qmail 2889 invoked by uid 1010); 28 Dec 2018 22:13:46 -0000 X-Qmail-Scanner-Diagnostics: from mail-io1-f44.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.100.2/25112. spamassassin: 3.4.2. Clear:RC:0(209.85.166.44):SA:0(-1.9/5.0):. Processed in 2.907428 secs); 28 Dec 2018 22:13:46 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:date:references :to:in-reply-to:message-id; bh=8FfnD4jDEtGxUGte/5njxBkRcGlJQ0+Gq3M9eJws7hw=; b=bxEA9gQOCjjjopUIol0TACgLiKQRHjaERAEcw3i10RrvG6ZEyHzl9sIcoN2eUB9S83 MSKCf+AvOV98rQOJDeMoQ86yHtUIruxoiFHzxXPKcix9wNf+QDxcmA1e705dSlHNxu2P ezliuSVaXJUfMuXeim6bM4xS8SwUZyzJrGoagKqhQhAuE1tBUKxJ9q77EglsKXRJ6xK+ agxGM+MExDp6ia1Sr9qPLwzDyHQnryPa2XFmtUIPiHdDpmGzamSOP1Up7CE0WB6Gl2RJ PabaOowOuG8jYpomJN+fTxAN5G7wtdb9HuwtZLg6cUshfJK+2bGxoWHcevC0Oup4WclA CIRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:date:references:to:in-reply-to:message-id; bh=8FfnD4jDEtGxUGte/5njxBkRcGlJQ0+Gq3M9eJws7hw=; b=YZMc9r5lrizM1IizTMx/DmEINid4FtAopEGl626tlY/nDIlEgCk7n3F3ZJhO9qCGNO cntFAI7jt0dpdkAk89Jzv+KcXQb421pgwzd8Wui82+LS2tbrkQwOt1xeliG4lx2X3ggS d8cj4s0oC3qw8KGw4HPAetnm7XocRqgVbiy+k1l3CzbyBkRR0qIxfkuHjNLvqGuTzGDZ ZjkGRp2QDllLScnQnrSQEa6FaVU9yB6LeOOHodw3Seu43eLXPzUjpG07RsAwEAC01u+z VsNb6I/9W6OrXXaFYGr4vO9fOQAcm4EqUsWt4b/9L7vRJJbhQs8YtWSQrqfT4nNwlzNZ mY0w== X-Gm-Message-State: AJcUukcFOtJ1FtnlfcWr2ke7MPSbSHuD95avqJmmPZBZOILLACe4sF7t +f/JB25bt6C5qRq5swM7+cA3ezTDKR20Xg== X-Google-Smtp-Source: ALg8bN52JrrTSoBlVtshec3ck2/5Irw+kaf6AX6J/25ciIWUonGM+5QCNgHs8ZVN1y7St5G6C5rwCg== X-Received: by 2002:a6b:156:: with SMTP id 83mr19659521iob.63.1546035219887; Fri, 28 Dec 2018 14:13:39 -0800 (PST) From: dana Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 12.0 \(3445.100.39\)) Subject: Re: [PATCH] ztrftime(): Fix truncation for %. Date: Fri, 28 Dec 2018 16:16:03 -0600 References: <20181224054021.GK1941@sym.noone.org> <20181224071421.GL1941@sym.noone.org> <1545655545.1499531.1617344072.151563DD@webmail.messagingengine.com> <4E316F0B-5606-4E93-8988-28A5444612E6@dana.is> <20181224170601.i7fiz4zv5fboqtrw@tarpaulin.shahaf.local2> To: Zsh workers In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3445.100.39) On 24 Dec 2018, at 11:31, dana wrote: >Think i'll revisit it after Christmas :/ Maybe this is more reasonable...? dana diff --git a/Src/utils.c b/Src/utils.c index e43a3cdb4..6e70def81 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3334,19 +3334,27 @@ morefmt: #endif switch (*fmt++) { case '.': - if (ztrftimebuf(&bufsize, digs)) - return -1; + { if (digs > 9) digs = 9; + if (ztrftimebuf(&bufsize, digs)) + return -1; + long fnsec = nsec; if (digs < 9) { - int trunc; + int trunc, max = 10; + for (trunc = 1; trunc < digs; trunc++) + max *= 10; + max -= 1; for (trunc = 8 - digs; trunc; trunc--) - nsec /= 10; - nsec = (nsec + 8) / 10; + fnsec /= 10; + fnsec = (fnsec + 5) / 10; + if (fnsec > max) + fnsec = max; } - sprintf(buf, "%0*ld", digs, nsec); + sprintf(buf, "%0*ld", digs, fnsec); buf += digs; break; + } case '\0': /* Guard against premature end of string */ *buf++ = '%'; diff --git a/Test/V09datetime.ztst b/Test/V09datetime.ztst index 2041d9b40..3fee49e1d 100644 --- a/Test/V09datetime.ztst +++ b/Test/V09datetime.ztst @@ -114,3 +114,17 @@ strftime -r '%Y' 2> /dev/null 1:-r timestring not optional + + strftime '%Y-%m-%d %H:%M:%S.%3.' 1012615322 $(( 999_999 )) + for 1 in %. %1. %3. %6. %9. %12.; do + print -rn - "$1 " + strftime "%Y-%m-%d %H:%M:%S.$1" 1012615322 $(( 999_999_999 )) + done +0:%. truncation +>2002-02-02 02:02:02.001 +>%. 2002-02-02 02:02:02.999 +>%1. 2002-02-02 02:02:02.9 +>%3. 2002-02-02 02:02:02.999 +>%6. 2002-02-02 02:02:02.999999 +>%9. 2002-02-02 02:02:02.999999999 +>%12. 2002-02-02 02:02:02.999999999