From nobody Tue Jul 4 04:40:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qw98168sCz4l6b5; Tue, 4 Jul 2023 04:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qw98153S3z4RJH; Tue, 4 Jul 2023 04:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688445617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W5m9R3AxJy43ZM1ypKJuvRtMxCF4fPF4HrSQzcwLHn4=; b=FqryLog1ADRgfHombsdeLX3szgNneFbgkk1B6M0EXo4/RwkLLTYdiLMFq7qJ+WBzcFc69H KQDKbt4WSYUvU9kmij78oYpoOt5msLY+PRm2QCV8U9flVMDwMfR/fLy2Gn4Z2d7TjSZ/yO 6igGu3axBW2BNs6Kd1IyuHcULKEeWd2RSmTTifMIkmBw3zmfynqjAHwE4NB3ulSG6iT3WT 6sNg2C/yFxaKll9GpgXSsyvkMrVQPPmYVln+Oo59d2NglJjv0aGoM7ezNZw91iKiUuGrg1 jv+n8ITkLMUJDJpCvkF23LoSmtkpl2cadO1QRlD02PJnnFKPnF7zYsiy2d/hxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688445617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W5m9R3AxJy43ZM1ypKJuvRtMxCF4fPF4HrSQzcwLHn4=; b=jjRrjVQIKsYRY7D89M4FGmQzMK82ilcnLiUlD7EiV3akCkuMVJ3L7vpplq8ezDsdNUrd7S L0HFP5djTVkJ39Sv9kwfGUJRW/HeXyBSPeHyB8S+osxCfMgDOyaW+SCD+wKLOQRRGjWo4w 48FqxTgodVaCrn2nHxPyjtoPdsva5IyeIt9EUl1o9MehRKpBlfqKrs/pGRHwX8miwlafMd I3pJhARtvg4MBOeLyzUktcZAxfAGpYuG80BiJl/Je4OvnUsl79nqocLNVt/NfF3Ru2ci2k XB45xR05J0uPBYd2HIT+/NyeC2rPxNKm8TLFmzN4OW/HwDnbdPsUshY6hlhiIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688445617; a=rsa-sha256; cv=none; b=LrcqGOGgV7CdhXmEBkd9fbi+kh/Gzg2y/2LAJu5yya50AoaCD1n3EdH2lLTV0e5TjPM9y0 7dweCpSphH3RpxUS7byRK7znaDLNHciZePAz4IpC+uqcHIPffRfarSEX7TnKB9GfGa/u4w +ywBhB1wWpNMvjWiqqm78qAzZh4oUoyg6wca0in+0uYTdzQs16t1rrC9No1pPDJsDn2j0j rk99fIdofGadtZpvzw4E5eXBKrBAa8EdyJQXt5uk992hrER8A62Q/kB/R13M//bru0EAnN z8yX5MjXi+xMKZwpIwtpmZc2P4Y02AqSog5oQt45jPAsXSb6s5lLjJcjHDDegQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qw9813WvWzJQv; Tue, 4 Jul 2023 04:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3644eHot051110; Tue, 4 Jul 2023 04:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3644eHqf051107; Tue, 4 Jul 2023 04:40:17 GMT (envelope-from git) Date: Tue, 4 Jul 2023 04:40:17 GMT Message-Id: <202307040440.3644eHqf051107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: 4ef3964b5f85 - main - bin/date: Upgrade calculations (take 2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ef3964b5f85f162c3a1bef5eeb5f18c253f08ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=4ef3964b5f85f162c3a1bef5eeb5f18c253f08ad commit 4ef3964b5f85f162c3a1bef5eeb5f18c253f08ad Author: Pedro F. Giffuni AuthorDate: 2023-07-04 04:39:00 +0000 Commit: Pedro F. Giffuni CommitDate: 2023-07-04 04:39:00 +0000 bin/date: Upgrade calculations (take 2) Use uint64_t instead of long, as this type is not correct for platforms like i386 or armv7. Pointed out by: imp --- bin/date/vary.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/bin/date/vary.c b/bin/date/vary.c index 6f3c59950ecf..a067489bb728 100644 --- a/bin/date/vary.c +++ b/bin/date/vary.c @@ -29,12 +29,13 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include "vary.h" struct trans { - long val; + int64_t val; const char *str; }; @@ -52,7 +53,7 @@ static struct trans trans_wday[] = { }; static char digits[] = "0123456789"; -static int adjhour(struct tm *, char, long, int); +static int adjhour(struct tm *, char, int64_t, int); static int domktime(struct tm *t, char type) @@ -125,7 +126,7 @@ daysinmonth(const struct tm *t) static int -adjyear(struct tm *t, char type, long val, int mk) +adjyear(struct tm *t, char type, int64_t val, int mk) { switch (type) { case '+': @@ -146,7 +147,7 @@ adjyear(struct tm *t, char type, long val, int mk) } static int -adjmon(struct tm *t, char type, long val, int istext, int mk) +adjmon(struct tm *t, char type, int64_t val, int istext, int mk) { int lmdays; @@ -206,7 +207,7 @@ adjmon(struct tm *t, char type, long val, int istext, int mk) } static int -adjday(struct tm *t, char type, long val, int mk) +adjday(struct tm *t, char type, int64_t val, int mk) { int lmdays; @@ -250,7 +251,7 @@ adjday(struct tm *t, char type, long val, int mk) } static int -adjwday(struct tm *t, char type, long val, int istext, int mk) +adjwday(struct tm *t, char type, int64_t val, int istext, int mk) { if (val < 0) return 0; @@ -286,7 +287,7 @@ adjwday(struct tm *t, char type, long val, int istext, int mk) } static int -adjhour(struct tm *t, char type, long val, int mk) +adjhour(struct tm *t, char type, int64_t val, int mk) { if (val < 0) return 0; @@ -331,7 +332,7 @@ adjhour(struct tm *t, char type, long val, int mk) } static int -adjmin(struct tm *t, char type, long val, int mk) +adjmin(struct tm *t, char type, int64_t val, int mk) { if (val < 0) return 0; @@ -372,7 +373,7 @@ adjmin(struct tm *t, char type, long val, int mk) } static int -adjsec(struct tm *t, char type, long val, int mk) +adjsec(struct tm *t, char type, int64_t val, int mk) { if (val < 0) return 0; @@ -419,7 +420,7 @@ vary_apply(const struct vary *v, struct tm *t) char which; char *arg; size_t len; - long val; + int64_t val; for (; v; v = v->next) { type = *v->arg;