From nobody Sun Jun 1 19:54:09 2025 X-Original-To: dev-commits-src-branches@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 4b9SNL5pyHz5y6BZ; Sun, 01 Jun 2025 19:54:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNL1RhTz3tJ1; Sun, 01 Jun 2025 19:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807650; 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=gkTWd1OarDCcXpiigWEIf9nmP960/fZnIApklFfypeA=; b=KhV1CFcFoIbDLYqCgb/NeHK+u+qVXrITEBz8QsNcJdvB89w6DmPPe4eYHwEcPfmf3aK2XA NewPyTtRSHJxwi6/cSj7A69ULTcudJdsfdEfwgclm/+5TulWX/xX4Q68UKW7u85rS3jo4a /nlaVCqr8Uc34D/z86zeV3bkXEPInkZkzgmK00ewkzuQAEJ1/SDwOh3hJfiS/D1NisLP/+ UvLIfwH1J3r/IFo1okiJJQZ8KcsTs2613oyvdIpHgPfDk+acIISuf2tBMUsVVyErci6VSF CMuACruHLzu2Lp5WXwgUYr1kEn9pegA5j3ZDFFxmIKmGUqjp3zi7sSO8Zq1mCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807650; 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=gkTWd1OarDCcXpiigWEIf9nmP960/fZnIApklFfypeA=; b=EfA+YTv6GVOvvYNsllEXDfhJhgNsvlivteeQzbrNpjs01Ld+Y3vrJiswfnyyTQnBodukj/ rP8MZNY/R5XMb/4slpkrmWhkLRxQlZEva98aK4Ul7n5alx+/TKEGJBL6xzWVMbac6HuXwl hswVDVHHIORhQr6EOqlNvGRvcp4oBPAK5Po1B2zYjbdnXWeDEffNXPCgGNRNsfZSq5W1lX aah0RGWiSwpPwfYwIfFJK0iYYxYfNCE5piAWHztSZ8Mulnn/qy4+cuha8x/GehgCMa69r0 B73z2y9I1UAOS+envaDcr7kktje7iUxWEWndE7OYmEaVQdSt5UzG2Sax+459RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807650; a=rsa-sha256; cv=none; b=nrRCBF6cJqeEthXad517nVAg199mBzg9bddpvpFBfVJmODTxMNr7w1efQH47QWRY5ij4ko 1Uuge0PTBkasyQpQt1SU2J/YjoGjly2mClCAIpL+i6aSpO/2yxJV4veYmiVaHoDFfGxhVx lc9xH73Hf+EFbs5ju+EM0vn0j8KJPgU2mmHH8eedU5eCZcACcSyl9OGclY07wscrwJexCD IoVhtidwrN3GpCDxGrAx6ohCqOuZwPSa19Pth/sPHQVW+98eNsTeKhN8+H2g86iMfXiIDZ R/k1OVb8kKHr1O6BGu/4d83vZqpfGLOEW6wzcl4R2z+Bh9seVijD+PSYDBHxFw== 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 4b9SNK0zzjzdWg; Sun, 01 Jun 2025 19:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 551Js9TT046326; Sun, 1 Jun 2025 19:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js9Qt046323; Sun, 1 Jun 2025 19:54:09 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:09 GMT Message-Id: <202506011954.551Js9Qt046323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5ea5220d1788 - stable/14 - du: Fix threshold on non-directory files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5ea5220d17881015df67e4f182e337bd269b9f34 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea5220d17881015df67e4f182e337bd269b9f34 commit 5ea5220d17881015df67e4f182e337bd269b9f34 Author: Michal Scigocki AuthorDate: 2025-04-07 11:14:44 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 du: Fix threshold on non-directory files PR: 265200 Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1648 (cherry picked from commit 0ae2b9e866d3aea1e9141841488561f12603f879) --- usr.bin/du/du.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index ead3e952ce0f..90b95b3d86e9 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -320,7 +320,9 @@ main(int argc, char *argv[]) howmany(p->fts_statp->st_size, cblocksize) : howmany(p->fts_statp->st_blocks, cblocksize); - if (aflag || p->fts_level == 0) { + if ((aflag || p->fts_level == 0) && threshold <= + threshold_sign * howmany(curblocks * cblocksize, + blocksize)) { if (hflag > 0) { prthumanval(curblocks); (void)printf("\t%s\n", p->fts_path);