From nobody Wed Mar 26 01:28:52 2025 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 4ZMq1x2m0Vz5s5hD; Wed, 26 Mar 2025 01:28:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZMq1w3jxdz3rMV; Wed, 26 Mar 2025 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952532; 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=SvzGi8WAONjkzYyDFQoYJm7LNjWp4Jewc9jWPxs0VCo=; b=p0B+fyVbTNAuziQEqtbT5fu1WrN6d0hAYhwdpDm4JbUxNVHzYmzFcUoK8gYh39OId+09G5 ndfXzKC2KPVSoPHTYJsUIH66ScNZp09if84EfgWZY7o0NgBMkEzFASWsi0HoYm95qw0JVf pSvL2XH4lGsSquqhuvVvlWmbK2gwlN33IygvNkC6ohnSecFYDMXvbmEqZ7ntxb7dagyXP5 WxYNC9tLcdHvUm6serBBxGwJxnCEDnrSht8YuK45w7f87zalotnofE433PawnwggPJp17q 90Qd9+4ZTpVDIApXOpSKjWHPpVNmMCyZHPevAuwtHUexAw/tN/A5EcQhOHME/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742952532; a=rsa-sha256; cv=none; b=rIwZfHt6d0GwvJCLqhzlvln/sznNVJNX+hBUW4dPylMyUSVR8uzK/7csc6AtwixgVZEdJa eU25HhDoNNL6s0oNMefw6OHVoZKLV2QlAS8mUJSXSS3q1y9uLDnGxe3L61VkfKWaZRrXj0 IHSSeBCPxekeKKvWLJaiuYBTlhouj9E16TXTH1PTXuoGM1aWkLmCOcJDFIGBL+1jnqz8zu 7AczlofMYXAyQRZa4KmaKLVQdmF4wfUne9TSX6FeZuOP28WTy0BzJVpPrvdY4NBe4EMqhb fEjnU1nTUDN908sahl7OKLvW2DILG3Cyml2AcbB+7bSid4VcHA2VUfK32YVkMg== 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=1742952532; 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=SvzGi8WAONjkzYyDFQoYJm7LNjWp4Jewc9jWPxs0VCo=; b=IOY7Oz5SgBicAgwcM+wcXBm7kUqLTL0YZ3UyPqwWFjWEpr4+SC1YUzBf5mH0AMt9rCYeIE Q8zf2qmvK3U2S0Ns2uDoIkquwowEeKrQfm/mA9yTA34MTnd8FecHg3Z5pvzAwh5y8I2BTy mxUryjtXsP8T4zcNtxhncdRQvvcaJaxcZ5Lzh1SSccrfDDLAjJhwFBtYL1ophe3x3r2OEU m4sLaaIvEbK6iAhmfTxx5RTilrO2PZuDUTUkiAU4ArRE4Lq6EXiRiKp8KCJOD2wrYjum66 CNYh33TGDxCq39WkJ992BKXhsaFyU3DV03VIUhuqRt+aMry3T8vMBU7wkLrDSw== 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 4ZMq1w2rvdz155S; Wed, 26 Mar 2025 01:28:52 +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 52Q1SqWM047016; Wed, 26 Mar 2025 01:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52Q1Sq3a047013; Wed, 26 Mar 2025 01:28:52 GMT (envelope-from git) Date: Wed, 26 Mar 2025 01:28:52 GMT Message-Id: <202503260128.52Q1Sq3a047013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: df872d66f24a - stable/14 - loader: Increase buffer size to accommodate longer commands 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df872d66f24a4f496cddb1e2da2222f10e3bc722 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=df872d66f24a4f496cddb1e2da2222f10e3bc722 commit df872d66f24a4f496cddb1e2da2222f10e3bc722 Author: Ahmad Khalifa AuthorDate: 2024-06-05 00:32:58 +0000 Commit: Warner Losh CommitDate: 2025-03-26 01:28:37 +0000 loader: Increase buffer size to accommodate longer commands The longest command we have is "efi-autoresizecons". That combined with the two spaces before and after the command gives us a total of 23 characters including the null-terminator. Also move the two trailing spaces to their own pager_output call so they don't get truncated if the command is too long and increase the minimum string length to 20 in order to fix alignment issues caused by the increased buffer size. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1277 (cherry picked from commit ab08da5328b4175e399d8e59adc4dfad0eea24f1) --- stand/common/commands.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stand/common/commands.c b/stand/common/commands.c index e6e4fd005f72..95d12ad95973 100644 --- a/stand/common/commands.c +++ b/stand/common/commands.c @@ -229,7 +229,7 @@ command_commandlist(int argc __unused, char *argv[] __unused) { struct bootblk_command **cmdp; int res; - char name[20]; + char name[23]; res = 0; pager_open(); @@ -238,9 +238,10 @@ command_commandlist(int argc __unused, char *argv[] __unused) if (res) break; if ((*cmdp)->c_name != NULL && (*cmdp)->c_desc != NULL) { - snprintf(name, sizeof(name), " %-15s ", + snprintf(name, sizeof(name), " %-20s", (*cmdp)->c_name); pager_output(name); + pager_output(" "); pager_output((*cmdp)->c_desc); res = pager_output("\n"); }