From nobody Mon Jun 06 18:01:15 2022 X-Original-To: dev-commits-src-all@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 87B7D1BDF6A8; Mon, 6 Jun 2022 18:01:15 +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 4LH1Wb2Zngz4sLg; Mon, 6 Jun 2022 18:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654538475; 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=ajcfq0eEzcn8F/tvM41fQuEJ5T5uazv89CyW1KTKDYY=; b=TrkZQ20Kg674oaqBI795180ZFHzXGzlIh5IgiYmmfeZF9zlO8pg9x/ksC2XNcp6+Fk5Zgk 15zIt0X8lrD466JxPX74m/Siwsz76TVUkQu8gJsezNT8Z09Tnsea15DvPWJ0aQcwGE8PFJ kXMeD+7yOPQ/KRw+KAk56+YrIexet2ZhNnCVWJQHOhyT+aWvCJoHPRIDLd855l+DiqACu7 4n/gn6NjCdSdE1LmbCaXe372L8bcYP5fmPqq6skHjAEKA5+ZLJxE44vGRRbdAqbMD2KbsT U6RJ8oqlQ60bFN1NzzYiBmIJIF7/IkxAm1Y6lrVj/Ej83LFFucmB9c6xiEQoyA== 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 2253F29E1; Mon, 6 Jun 2022 18:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 256I1Fwb063154; Mon, 6 Jun 2022 18:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 256I1FNR063153; Mon, 6 Jun 2022 18:01:15 GMT (envelope-from git) Date: Mon, 6 Jun 2022 18:01:15 GMT Message-Id: <202206061801.256I1FNR063153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 02acb1db346e - stable/12 - MFC: fetch: make -S argument accept values > 2GB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 02acb1db346eccba328c35c2f5db8bd581f74839 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654538475; 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=ajcfq0eEzcn8F/tvM41fQuEJ5T5uazv89CyW1KTKDYY=; b=aTTOrCAM+QCd7Q8NL357lVevCzfGOVgG2tdVRHPQ8H2uhHpNkAmVrMkWoeM27zpvdlLA7s /v2O72kmNDMhkpniQjKp260HoX8Oe6OM4lr0jNDZPyj5LsSXcfHjL4mo2WNAM4eMoMpsDn hBU3npVj4/e5msDgnya2tZIfTTOWY2m2VttJ6spMRlw7/ARwMDOG0x72cqBJV2aOZKX8sm TIiaNagjMO459z0BrZ0IJXB9ebitHWNeL+162gMCoRqUIMOWP5KIbPf2SdP7+knuUJSACr ND4xp7jRrZlP3IHF3DduX3t161bgWobalwYuqN26mbMKkKSwd/UoPotI7nmjZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654538475; a=rsa-sha256; cv=none; b=p+8l8Lu/F8+ea5VHmbN4nyVTTRjxl76heQ0HYMekhD0N30PMyY0wP0fEk2jR8hnNa98dOK wxHhdCv7gkCDsmABXDpQxSuNGlSctBq0M1UxevQeuzMSjuZ1ks/yY4SLei/qpJ7d3GVWIT NfjN8QHtKtSt5/UFpy71RRDj+Enkgb6TnYFTyCQtKb2TUrVxYzYWC1cuWd42a9T9rM0o7m oiymoqotVBVC4Mvx4BAHM8MK7wEC888HsJZfhdtq2Pr4OQbKPXJ435geHWpDhna4MpckXd f6Xw+6HNH8C0BnwC1t3FE0sZ/G6iNlf3nxGbSWo79WDJt9C6xH4hdWtx8DzhJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=02acb1db346eccba328c35c2f5db8bd581f74839 commit 02acb1db346eccba328c35c2f5db8bd581f74839 Author: Stefan Eßer AuthorDate: 2022-02-20 14:24:43 +0000 Commit: Eugene Grosbein CommitDate: 2022-06-06 18:00:27 +0000 MFC: fetch: make -S argument accept values > 2GB Use strtoll() to parse the argument of the -S option. FreeBSD has supported 64 bit file offsets for more than 25 years on all architectures and off_t is a 64 bit integer type for that reason. While strtol() returns a 64 bit value on 64 LP64 architectures, it is limit to 32 bit on e.g. i386. The strtoll() function returns a 64 but result on all supported architectures and therefore supports the possible file lengths and file offsets on 32 bit archtectures. Reported by: antoine (cherry picked from commit 32066c96fa00fc19c8355e1956ca5aa9ead37673) --- usr.bin/fetch/fetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 73ee96541859..ad51de15f4d3 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -1005,7 +1005,7 @@ main(int argc, char *argv[]) r_flag = 1; break; case 'S': - S_size = (off_t)strtol(optarg, &end, 10); + S_size = strtoll(optarg, &end, 10); if (*optarg == '\0' || *end != '\0') errx(1, "invalid size (%s)", optarg); break;