From nobody Fri Mar 04 19:49:57 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 58A0919F2B87; Fri, 4 Mar 2022 19:49:58 +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 4K9JNQ0LpKz4vJr; Fri, 4 Mar 2022 19:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646423398; 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=hmaCFVYtetpeRYVktTBLbPK9UT99RgTd4Gjvhb3g/T0=; b=bZ+T2lFG7w/XEw0f2UaIQVPKDDA0ClKQsMy2Iol9uj58QY03ScRKyzVD3twcFoOUFOu6ol rinVM/kFwJt7XJLpBrSaNn3puFinVqp6pSlKXCoHRM1jyef2U277/DhT4zqdoheqcJ3cMR wPF47tqwP3Ven7cZT2qC3JyMvpDcVJ45WMxRwJqVZ0VIugaMiaWjzH0xyxWJw4ISZAgtSQ xjYGFXLD/fmYP9mBD8rWMuULGNXJzmIz3AQiQ2NLbDX3jKTslFr0J4lqjTrNAYTyzo0cvM HpQ7aHkbHPDqY0iIqiJR2HUvaDJfQStFrFMVv6pQ6Jz+x5SHQDNYhhVM16fr6g== 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 DBDDE126E0; Fri, 4 Mar 2022 19:49:57 +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 224Jnv2W069672; Fri, 4 Mar 2022 19:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 224JnvAj069671; Fri, 4 Mar 2022 19:49:57 GMT (envelope-from git) Date: Fri, 4 Mar 2022 19:49:57 GMT Message-Id: <202203041949.224JnvAj069671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 97b94f4332ac - stable/13 - 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: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 97b94f4332ac370b5fd04b973e96564fa99b043f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646423398; 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=hmaCFVYtetpeRYVktTBLbPK9UT99RgTd4Gjvhb3g/T0=; b=I8lWrbdhLIF/HKGO9EydV5L+qhjZmvkXohQx2RTeSk+eDZj9/GD/ytV09Sn4TrQILl1io/ 72NP7fH/AD8IlmzFsiKPyDjiukn6x+QZiupJMjNTAEVKtPoMZKTsGMDbDiGpMpyob+ef4h 46QzwiixHbFR8cjYQz9B3XoE2VevzY/g3lHeOxlsVDJO0e9j1hHTjRHL8/uVxEX6Q+iyE/ w3H3R88kk5GiduwF7cmP9Gecxm2H097P7CU63G83xCU2D7yzevtLJcJlgIE7MZs2ZDmGNm ybhIn6MgvLpZXuG30WxGOUV/LQgEZwGixUHQB42CRIoUxmqvNA7h4SNpCjLT2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646423398; a=rsa-sha256; cv=none; b=pf36T6VW7pKopgewX3UCpBwbUyVP1Lpx1o+zO1K+MbPSo1GhuXJ6eb2YjlQE4AVr3Kf2pb 76D1mYfb8xCVx4m2VvmFnuaJp5nRoGtwJzMPzwQPvRPfzYeJssY1mNGRPy/1ri37RaLU3j wufGxfLavZz87NtqpQZpasxP8+F1K+Ge9JXrD9KNtEqvwoydSVJ2LUolE00p4Py+KJ/j8s bLQh34OT9o14/RvtLsrb9h1eIITK23bDwJ3iG6IQVnIub+M9mS7UpqmrqbR7ZdlC5Fpjyt f0ATHxHbaWJ7W8Pk5WZd6/q58cU/yyCdYc1sWjLOg3cjPsDOFWLYqERKRlWDZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=97b94f4332ac370b5fd04b973e96564fa99b043f commit 97b94f4332ac370b5fd04b973e96564fa99b043f Author: Stefan Eßer AuthorDate: 2022-02-20 14:24:43 +0000 Commit: Stefan Eßer CommitDate: 2022-03-04 19:49:38 +0000 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. (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;