From nobody Fri Feb 3 00:27:03 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 4P7GgX3jsdz3klT1; Fri, 3 Feb 2023 00:27:04 +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 4P7GgX0HjTz3q63; Fri, 3 Feb 2023 00:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675384024; 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=aqvGnquXIRJZSYP2L8AotRgSiN52odapEP/Vu1JcvpA=; b=viJRzIGS3qV1Gd22xMpO3lJgAyx70BduCzvNErh546R+4Rt0j/NzxT8hAHPfAy3vTSFhNs SIIltVm+JHjDiYF55FSKsgir9Gwbp/m6ysKAwCoaFbQXWELvTkbZHwA/fPT2R7O1rS07y1 cW/VVbVNrTFcb/oKAwvBNgBWwLm7tMXBzIIvvV3HYzZK//pCwjkw2EgkZntOI9JL+8mdzU g6Yku/dpW8Rxzm9M0RP6XmYtHdb5QiM1HvEd2LL9vzW2POjK3F7Di6fvPG3bSZd5qF1PFw egRDLTGH56orWgXeT17l0bd+dGhtK99ESP7m8B9LRapNemXowVzFQg9Z1NWyrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675384024; 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=aqvGnquXIRJZSYP2L8AotRgSiN52odapEP/Vu1JcvpA=; b=dQzY22jNf7F9gy90qQk3yDpfD+e1NITWeANpzLzkTYLu3nwN5epWywQ1AMetYapk4ZSqfi QVtUxSM/LyMKhbIqLZz+F4X3Ptg5WEcCGCU864PZD/h02RGkplE9Bdjr9PMJgmhGAIXEkX eWB9tNXc6EOEczefuUyToHucSRxIlN2CSETgPpwhbfx5+CmSZWQi0w3tJ9VEXwy0//5Fv9 PbQ6YoIwXaAjQIyiTfIFMJSAnCPky0sGRg/WF4NxTPbYTOsRZKGEVDNyw+yB8gdUXAdUl3 Ey+eW46lSAb1q4m76HQWaX7KeBOMqkCcc4Dhec2mNKH5EmgrWqa8yqrFALJlvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675384024; a=rsa-sha256; cv=none; b=Ikkm6OWKvzAD6QUtwlvxE8I1Poy3z8aNOxVaXkHs8RDB9Pq2mY6Qo/ujrTazFJchGfeyVW t5xmwGWRGaF/OAkod5ZXlPDmpnMHo590X3lHfpvuSloFNnTvFyr+CU/9VhWBKneiyS7VAv XBih8Y/sOdtAEG8VUOujULi3yQhGa0BljEgy30hWTkXviSv/6riJalVwyrYKXW0UFZvb47 3LAwE+pdQcT4Mq/908kI/7Y4yGns+VdrIQaIvmNhTlcaHkIx78VZYV/LuKdYKhC6kcqZRL fXsA2o5lPqpjxkgB6eTK3lO3NO5N6Nvg+ZdwEiteFFnSYoA8e9shymkamCriQQ== 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 4P7GgW5pnZzFgb; Fri, 3 Feb 2023 00:27:03 +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 3130R301006244; Fri, 3 Feb 2023 00:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3130R3Hn006243; Fri, 3 Feb 2023 00:27:03 GMT (envelope-from git) Date: Fri, 3 Feb 2023 00:27:03 GMT Message-Id: <202302030027.3130R3Hn006243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 75aa61400cba - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 75aa61400cba6a67ff0ad392d8a5cc2d3855bd3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=75aa61400cba6a67ff0ad392d8a5cc2d3855bd3b commit 75aa61400cba6a67ff0ad392d8a5cc2d3855bd3b Author: Alexander Naumochkin AuthorDate: 2023-01-28 13:31:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-03 00:26:12 +0000 stat(1): Do not pass S_IFBLK to devname unconditionally PR: 269190 (cherry picked from commit 050e4bca94e907c046e9ed63f90b5dd0e49fb405) --- 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 8229e742da87..0033ff2258a6 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);