Date: Fri, 22 Mar 2024 09:14:11 GMT From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d5d2452bf536 - stable/14 - bectl: Simplify command aliases. Message-ID: <202403220914.42M9EBto061439@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d2452bf53639ee4ce0570c61e863c03483048b commit d5d2452bf53639ee4ce0570c61e863c03483048b Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2024-03-22 08:07:03 +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 7632540aa7ad..63c3bb369b56 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 }, }; @@ -571,13 +573,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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403220914.42M9EBto061439>