From nobody Fri Mar 22 09:15:06 2024 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 4V1GrC0WLdz5G90J; Fri, 22 Mar 2024 09:15:07 +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 4V1GrB639Kz4Y0Y; Fri, 22 Mar 2024 09:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098906; 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=q1UGLy24Xq//AH13ojO75s+fvc8Y9ooORe0ULR/4FnM=; b=floSzNd/kAqR92MEdi7QewNPsKKlYaBqnb1bH5sN1VYJjnLhEGempKLVOl4DJ5C6WlauvR jRQ03WxYbuDyTQhiJ2ahnuOfI79PRdJX0hsqkkxcs8hIPmy6epVmp6REoYfs1nJl5NQUaT f+c9L9J0+ddjoBYGNMzySj1/1l5KTt4iG4kiAu7m85DwwkEA96Z/oM6xTP7PBcz437lRb/ vMhl04p6Mri64VDStJWuEVZHoX5vxGdYaivhDtaIrXpfkvNxjyleVe09DpBL25Zl/jff+r eShHVqSiFOZkshxXxDTbFclbllcDdCWovGrwZK8rYR59VgP8ICMm4/jYxAnfgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098906; a=rsa-sha256; cv=none; b=YoDOAb1mc9gRM8WoTy4eA9sWodnhhYh5imjg3AEdfCNDBj7RVUfp00p+BcZvfn3jqANrVo kmLnhd8SAWvW0F6yAIGDLq6XWps0DRSfNXZb37nAe3WU0aJJnBPDcdDcCEj7fyArHR/wLS PjUsGps3jBaoCpp5ZaukeRhWYB/SNpjsLUgj0tAHQT72cpoLC72YyR+bCdf4m2v8iM48w+ nQyRVOQnlDxx6XWxxP3iB2RelliN+ZNYOoG9sDtfyYDMhg5XrzEIGQYxlOqo/xI0IB7nep lqiAL4lw2r/1t5DB3tqsy5Y+XOoKUeINNA5/ENX33eDkPJQjExZKtif5t6RRyg== 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=1711098906; 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=q1UGLy24Xq//AH13ojO75s+fvc8Y9ooORe0ULR/4FnM=; b=DCWpwqO8n/Udq6P3vRgF7+KzPCdNHAgAR5r+MeiX9RMaYNfbknBtKwNdazvqwVnG7wR6or DhYe+PO4FPHbiOhYC/o0CuE1Tf4oE/zXsAmNWxttVud/UHyI2WCZeTYCBOjDqV5F+OXGJ5 KfeDX/jaDpIrXCMFW/mIiUGO6LG1v4B1Mg6RjwULaJ8vnZMg7ceYJ2GA/h5Z3H7vxxnusd KugSZecrDhoi4+VTuuVTUbON3yz/IBKWbiAWEwKps1zQl+6FEmVTItcR3efmxm8OkLZGtS XSaFnfCISGVT8krJy3NX2qzsAy16OxBdMN7h2gaoCrM6FNMHvhl5ilPPd2Rp1w== 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 4V1GrB5c3Bz1CGP; Fri, 22 Mar 2024 09:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F6jw062020; Fri, 22 Mar 2024 09:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F6x9062017; Fri, 22 Mar 2024 09:15:06 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:06 GMT Message-Id: <202403220915.42M9F6x9062017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 36afe5ef45bf - stable/13 - bectl: Simplify command aliases. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36afe5ef45bf6fd588e07471cc72f9a74490683f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=36afe5ef45bf6fd588e07471cc72f9a74490683f commit 36afe5ef45bf6fd588e07471cc72f9a74490683f Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: Simplify command aliases. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44406 (cherry picked from commit a46217ce7d161ce563374899df4d94b6d000138f) --- sbin/bectl/bectl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 89d107431661..4a2d62348cbe 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -115,7 +115,9 @@ static struct command_map_entry command_map[] = { "mount", bectl_cmd_mount, false }, { "rename", bectl_cmd_rename, false }, { "unjail", bectl_cmd_unjail, false }, + { "ujail", bectl_cmd_unjail, false }, { "unmount", bectl_cmd_unmount, false }, + { "umount", bectl_cmd_unmount, false }, { "check", bectl_cmd_check, true }, }; @@ -570,13 +572,6 @@ main(int argc, char *argv[]) optreset = 1; optind = 1; - /* Handle command aliases */ - if (strcmp(command, "umount") == 0) - command = "unmount"; - - if (strcmp(command, "ujail") == 0) - command = "unjail"; - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false));