From 36afe5ef45bf6fd588e07471cc72f9a74490683f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 18 Mar 2024 14:49:23 +0100 Subject: [PATCH] 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));