From nobody Mon Apr 28 18:21:14 2025 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 4ZmWwq2zqWz5thNw; Mon, 28 Apr 2025 18:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmWwp69pcz3YKB; Mon, 28 Apr 2025 18:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745864474; 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=5ccFEptMPgNYCYF57R/IW6jrdZMc1taFX9RbiQGcnoc=; b=aM0xqeVggMoqK/dWYyS53yqO0AQoveZH7cpSR/5FBxmvB9R1UL5558wG9QL0SywIPy5v8W 4bWzMC7kF2nFV9105nzaHIbGNLAakxAxtaH5r47lQB2ANftsxdfPpmQ/yYijDzTRuUDmeN 2eScQhTFcJ7VYXebtDGgaBH4m8Do2SXJrGCd9FW8CXNKGH2x31GEOji8XDZVTNQfgYx1r9 0OGkqj2whRqm7CNsTpm6+unnalkXpOee4/3zTeLishjeGYrgHA5wLI0TminJ0G0wX3fdAq 6SGjbulkCUa0W+x10pOiZEPNnjTMM6jN5xQGGYbPze6ENWkCcyjfC7quNB8BEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745864474; a=rsa-sha256; cv=none; b=m5nCU/UvyxiSKRYEp+t42KOOROb90wL50DjvH+a8y97KCs5WmoOXZjLZctnOo/vBO16u88 lX26dB0q4BGFoSkhS2nCKQaoUy+bBXa1RhhxjnMSKhx6JLW1v/4SeNQwidwi539ogX2DbV I4eUwy2JQmgBylydbAiZqbmtT3JLEMtuSLKrdoBXNCLnLriGvJP8h6yDqKtQj5wGdyWS8W HTLfm99hb3Ex/KkK8ADkG89ttRr5ABl5QvbiY4H8WdL264gPV+BOWJJSSF7bQNdw8GrYB3 mjRC0tcsXQCRGR25aoorlTp1NWhikbNs74TPdU7FK4utHKT2nNqVKmTe/wsI7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745864474; 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=5ccFEptMPgNYCYF57R/IW6jrdZMc1taFX9RbiQGcnoc=; b=QrGb8YzfKGhOjYqOcQ49cv3/bK5EK7VY9c+T0KT8LbceV93N5+QyQhVk/aoasTeUvcYclq NTPbNQPBevERxre3frc8dP4TR/Ns9MnZg3roeiIYsMzKynk4fIPLb7nXB4jJIGDnLyUOXa +3DDWRrPA/T3vIIzS2/vgbC82pmcIo5R4OPxpzK2jSEMmH1RiV3w7q7n1Eu+ZG/l5IWoJF ZX3Yc6Mc02by1OIdqQEIwoDLIkzh6/ib6fcQ8dAPI+57AwVQCZgbQqBYH3tGvmwv/GH7gg XLSAVEV1P83DampNaMm4CivYJUO/bCDFkwboPX7hocFDUI6pHXL0u76WYuorcQ== 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 4ZmWwp5YZVzmgv; Mon, 28 Apr 2025 18:21:14 +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 53SILECS093237; Mon, 28 Apr 2025 18:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SILE7B093234; Mon, 28 Apr 2025 18:21:14 GMT (envelope-from git) Date: Mon, 28 Apr 2025 18:21:14 GMT Message-Id: <202504281821.53SILE7B093234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0ae2b9e866d3 - main - du: Fix threshold on non-directory files 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0ae2b9e866d3aea1e9141841488561f12603f879 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0ae2b9e866d3aea1e9141841488561f12603f879 commit 0ae2b9e866d3aea1e9141841488561f12603f879 Author: Michal Scigocki AuthorDate: 2025-04-07 11:14:44 +0000 Commit: Mark Johnston CommitDate: 2025-04-28 18:20:37 +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 --- 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 185a5cbe4465..5b71ceeb531f 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -322,7 +322,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)) { xo_open_instance("paths"); if (hflag > 0) { prthumanval("{:blocks/%4s}", curblocks);