From nobody Mon May 16 14:25:30 2022 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 A420A1AD58AE; Mon, 16 May 2022 14:25:30 +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 4L21kL48kwz3N4L; Mon, 16 May 2022 14:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652711130; 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=NBcZRaHtw739UthGE7qNZNFlg237T4q2G1Fhr3AmkWc=; b=kfFzAlXuhvZ95xTcTJLhk7qORHDtNdQhLphEEBvmx9Ls3qxaM0zIVpXLbGcwLQs+ZIFIhg XnzPRGwWJ39FVBBHM3GuQMoaLOOjhDwxCQGKjfwno+mFHvG6xDlb116sQSmxROtWP9ElCN vHbUQ31qNiaIEXtNg+Qu2t7VP4mQVEZ2zt02o8CFZ6vewaGv8l2shX6UY035n6BWc1f+Av hHJYmx6e3lKSLWQrirhCTCKSSi5RR8Kpd1MAS5QbsJHaGXK6OmRa8qVBP6ho2aZ68fXuuY UX8c0vpr2BbW606NNrodtIbYWFBokqY6BRpNEz0oBXLu31AGWDPjFaV1EH90Rg== 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 6E84C2165D; Mon, 16 May 2022 14:25:30 +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 24GEPUqS025619; Mon, 16 May 2022 14:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GEPU4h025618; Mon, 16 May 2022 14:25:30 GMT (envelope-from git) Date: Mon, 16 May 2022 14:25:30 GMT Message-Id: <202205161425.24GEPU4h025618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: ef303790efb6 - stable/13 - Fix formatting of the usage() output 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ef303790efb63591f2f85a52413a91b311550d5d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652711130; 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=NBcZRaHtw739UthGE7qNZNFlg237T4q2G1Fhr3AmkWc=; b=tgqZaYdeOwcQAvFWT3LbodBvEM3eMXdraRzi2dtfvKtgmk6qKaOiKbX8uiA44rVJlPgE1C UjtRI2U2OQ5Jfqu5l2nnMMW3/LRZLMUzNvDHlJedQ/wvY+OlFqE95oeXCk0wJ2qnLcT3sV 4QFaP04MiKHNd3VMsE4eQ6rNS8FX1rG7EaFgCrsPxza2c/UWXAE35XTvOOo+45E1niak5A yZmKaMsuxMcx5Vb3VCrJDRWcvWwRj2olbPqSJ9Z/h/4jTpHXG24KvD7oRgzHDmMVFYcQ3N hnuGLoB2a8B3AKvCmnh1xbg1o8wzWmix/J0bSh7+8vxa9OVe4OuN1NdgTKa2Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652711130; a=rsa-sha256; cv=none; b=lhNkSVFoEHMwA77gdGy+XPSPNkjsKmga1Qh/2ZDz/Q6xBqOiPNDzeac9LQ0q4uDE+jyvkw Op6s5E4YRxGBYBVFBlZR8XWaJ546l+UrshuIwzyieAIeh4DHPWI6xhfFIEKVLclh+I1tq4 ZeSLQGWSAAE89NV9XiWcjUwHkMkmijUimNWkLzIRXovOPdNeek9lzhuQEWyaUaKOby1zpc Ij7rtyoM+GjZF0xy2bDBakJdarLfRfy/wUP6kMawzV2rBaGvpmGKT32KelLqkU2tIeFgkQ JlY+4o4whMIyU420j9tkbJNKTIH9JIl9/7UYoKBwRtsJE5czqZbgLD2zA17BAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=ef303790efb63591f2f85a52413a91b311550d5d commit ef303790efb63591f2f85a52413a91b311550d5d Author: Scott Long AuthorDate: 2022-01-07 05:59:18 +0000 Commit: Alexander Motin CommitDate: 2022-05-16 13:53:01 +0000 Fix formatting of the usage() output (cherry picked from commit 638e2a132e38b51b385b2731822294c73621aea9) --- usr.sbin/mpsutil/mps_slot.c | 2 +- usr.sbin/mpsutil/mpsutil.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mpsutil/mps_slot.c b/usr.sbin/mpsutil/mps_slot.c index bb4a7324c461..396d5706cd5f 100644 --- a/usr.sbin/mpsutil/mps_slot.c +++ b/usr.sbin/mpsutil/mps_slot.c @@ -113,4 +113,4 @@ slot_set(int argc, char **argv) } MPS_COMMAND(slot, set, slot_set, "status " - "", "Set status of the slot in the directly attached enclosure"); + "", "\n Set status of the slot in the directly attached enclosure"); diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index 51fad0c9b981..cb9563cefa60 100644 --- a/usr.sbin/mpsutil/mpsutil.c +++ b/usr.sbin/mpsutil/mpsutil.c @@ -65,10 +65,10 @@ usage(void) } else { (*cmd)->handler(&args, &desc); if (strncmp((*cmd)->set, "top", 3) == 0) - fprintf(stderr, "%s %-30s\t%s\n", + fprintf(stderr, "%-16s %-28s%s\n", (*cmd)->name, args, desc); else - fprintf(stderr, "%s %s %-30s\t%s\n", + fprintf(stderr, "%-5s %-10s %-28s%s\n", (*cmd)->set, (*cmd)->name, args, desc); } } @@ -87,7 +87,7 @@ version(int ac, char **av) return (0); } -MPS_COMMAND(top, version, version, "", "version") +MPS_COMMAND(top, version, version, "", "Version number") int main(int ac, char **av)