Z65JS2wFMwkUsg1ifumte//9EcCzD0fJSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738698782; a=rsa-sha256; cv=none; b=idMVBkhvdehjqJXHyc+aGnj0w/lVHX5PSwj0StnR9/aZO3nIvc95u1ZfRNrFqKbNzGO+8+ tuSRQ0lrmCDJsFXmaaCYYA527z8CwSFN+wYuAhvxNs19GXfppp1agRQrqE1YpH01roeNic /a0fCOXXJ7eRyBGYTu+2N6dECOxvZddvKf+FK9JrMMXZgqiALu0pYfykAtL7KjewY3SiWz id24ZjEsC2GQbR+6r/mNIfTNU6xCDsjTrh8xNMtcRN8vyrxM8DYd3WSsXe2X1yc4r1wTtH 2yIZZ2hDlYCTRVa+8Jj8cneR9UbB8V+65XKTnlv2PGUJ3Poev3qx+U8N/cFZnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnYv21GH4z4hS; Tue, 04 Feb 2025 19:53:02 +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 514Jr2rB086396; Tue, 4 Feb 2025 19:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514Jr2fS086393; Tue, 4 Feb 2025 19:53:02 GMT (envelope-from git) Date: Tue, 4 Feb 2025 19:53:02 GMT Message-Id: <202502041953.514Jr2fS086393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d2e6eb604656 - main - genl: fix printing of a command with zero capabilities 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2e6eb6046560a848cf5627b4353a6fef1421ed4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d2e6eb6046560a848cf5627b4353a6fef1421ed4 commit d2e6eb6046560a848cf5627b4353a6fef1421ed4 Author: Gleb Smirnoff AuthorDate: 2025-02-04 19:52:35 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-04 19:52:35 +0000 genl: fix printing of a command with zero capabilities --- usr.bin/genl/genl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 51d2dfaa6364..4d2c252dab98 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -214,13 +214,19 @@ dump_operations(struct genl_ctrl_ops *ops) return; printf("\tsupported operations: \n"); for (uint32_t i = 0; i < ops->num_ops; i++) { - printf("\t - ID: %#02x, Capabilities: %#02x (", + bool p = true; + + printf("\t - ID: %#02x, Capabilities: %#02x", ops->ops[i]->id, ops->ops[i]->flags); for (size_t j = 0; j < nitems(op_caps); j++) - if ((ops->ops[i]->flags & op_caps[j].flag) == op_caps[j].flag) - printf("%s; ", op_caps[j].str); - printf("\b\b)\n"); + if ((ops->ops[i]->flags & op_caps[j].flag) == + op_caps[j].flag) { + printf("%s%s", p ? " (" : "; ", + op_caps[j].str); + p = false; + } + printf("%s\n", p ? "" : ")"); } }