From nobody Sat Jan 28 18:05:11 2023 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 4P42RD3Pr1z3bVNS; Sat, 28 Jan 2023 18:05:12 +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 4P42RD0YfLz4FlG; Sat, 28 Jan 2023 18:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674929112; 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=DVWJ/FmjQ1tqEAFEJmAsw02X/tupopVrQDnhlgGDuak=; b=lKc5ECJCvDm/osnL5GA9wHD/CHZfq0r6V7QjNEMGRKrcxc4LnnY1+u0o1i86jxe/h5o4hQ PRy990y+6fbXvNuPidwUP7h92TU1XNwVMu2Xc/doVt/8Ptw1hc777/DtD6lBbP1/kSMJa5 MOy7hPNr3dJkeDh54T7kLMsGMSeWhx3NpxBtVP1NjEZa6LXk1QgX1rNvcenQ75x0u8+84p ZjpfYcq3MhXEeluAcBiffv9zA2YCwbCaWLu/iKG9cJopF21Lqw8EsUR3leYju0/gENMcJ8 WxOFxpL3YIy/+YjCR59m4Oul+Dm/7XPESGV6E929/LqofpwGJ++YdSlvJoBPig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674929112; 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=DVWJ/FmjQ1tqEAFEJmAsw02X/tupopVrQDnhlgGDuak=; b=hmFEiKN1gd5KLLxrXmHsnR4T+SU8lgN7SclnhoRnhdWnfhAUOBWAeaZKOVon0R+SdnoowN YMR2I275PEXRw03fxNzi+EGwd4aOK9f282FC9T227WHo914LMGqG0LeGK1M1NeP4NtMX/k zCzUvdhN531ysPx+VciK7x20AgAPQ/poohiiQ8PVjC5bJ/HdiJdQSGipPqS/R040wH037C pbbXH+DRVTrQIhyj9NKGSkQVM9z+miSaun3aY2mryvyAy0nHycixGhH8GZ6n3DR2gYNj5y KKkGTVdzrGQuzVhtWfaK/QKB5KPhH4jWeA386HpSmohtAsFB/9ygkzmlEyYrLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674929112; a=rsa-sha256; cv=none; b=idZpBLAfVAmzqSKMpfqnjKP7W66QHMIb0P1Y8c8reZaNN9pxIvMcxzd264lTWPbXUdYrlp koI5Nih5uiOmeBJwm9ouTgX+f1bD1JEdNGXf1Vk4VjzPOJvb9lShWa57iVz3yvBzTieIFn wWzMkxj/ATVugHS77Qf2ZkwU8c2CELkoLJuhunenv4fGdXzzAqXay3J/XlA46XzOf2XsDb VPepx4OW/m1cS9IJg6+UUj215Cu7Na0FqZM1mCUdTccldmwaRELkwenxJKPeVqFFyQ5h5a XpHFX2oCdb/QL2ev4DI2mB/Dh8Nz3579qCNI5QsXC/XGBzC3RJYkZIgH8YLHbQ== 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 4P42RC6cQDzxsV; Sat, 28 Jan 2023 18:05:11 +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 30SI5BFZ065592; Sat, 28 Jan 2023 18:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30SI5B6f065591; Sat, 28 Jan 2023 18:05:11 GMT (envelope-from git) Date: Sat, 28 Jan 2023 18:05:11 GMT Message-Id: <202301281805.30SI5B6f065591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 050e4bca94e9 - main - stat(1): Do not pass S_IFBLK to devname unconditionally 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 050e4bca94e907c046e9ed63f90b5dd0e49fb405 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=050e4bca94e907c046e9ed63f90b5dd0e49fb405 commit 050e4bca94e907c046e9ed63f90b5dd0e49fb405 Author: Alexander Naumochkin AuthorDate: 2023-01-28 13:31:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-28 18:04:43 +0000 stat(1): Do not pass S_IFBLK to devname unconditionally PR: 269190 Reviewed by: kib MFC after: 1 week --- usr.bin/stat/stat.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 9d94399a6333..dca7363f4fcc 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -640,14 +640,9 @@ format1(const struct stat *st, small = (sizeof(st->st_dev) == 4); data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev; #if HAVE_DEVNAME - sdata = (what == SHOW_st_dev) ? - devname(st->st_dev, S_IFBLK) : - devname(st->st_rdev, - S_ISCHR(st->st_mode) ? S_IFCHR : - S_ISBLK(st->st_mode) ? S_IFBLK : - 0U); - if (sdata == NULL) - sdata = "???"; + sdata = devname(what == SHOW_st_dev ? st->st_dev : + st->st_rdev, S_ISCHR(st->st_mode) ? S_IFCHR : + (S_ISBLK(st->st_mode) ? S_IFBLK : 0)); #endif /* HAVE_DEVNAME */ if (hilo == HIGH_PIECE) { data = major(data);