From owner-svn-src-projects@freebsd.org Wed Jul 25 01:04:51 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E1F510351C3 for ; Wed, 25 Jul 2018 01:04:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4143E88D0A; Wed, 25 Jul 2018 01:04:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 227AE13559; Wed, 25 Jul 2018 01:04:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6P14puP000590; Wed, 25 Jul 2018 01:04:51 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6P14pHm000589; Wed, 25 Jul 2018 01:04:51 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201807250104.w6P14pHm000589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 25 Jul 2018 01:04:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r336694 - projects/bectl/sbin/bectl X-SVN-Group: projects X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: projects/bectl/sbin/bectl X-SVN-Commit-Revision: 336694 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2018 01:04:51 -0000 Author: kevans Date: Wed Jul 25 01:04:50 2018 New Revision: 336694 URL: https://svnweb.freebsd.org/changeset/base/336694 Log: bectl.c: Chase rename Modified: projects/bectl/sbin/bectl/bectl.c Modified: projects/bectl/sbin/bectl/bectl.c ============================================================================== --- projects/bectl/sbin/bectl/bectl.c Wed Jul 25 00:33:09 2018 (r336693) +++ projects/bectl/sbin/bectl/bectl.c Wed Jul 25 01:04:50 2018 (r336694) @@ -41,18 +41,18 @@ #include #include -static int be_cmd_activate(int argc, char *argv[]); -static int be_cmd_create(int argc, char *argv[]); -static int be_cmd_destroy(int argc, char *argv[]); -static int be_cmd_export(int argc, char *argv[]); -static int be_cmd_import(int argc, char *argv[]); -static int be_cmd_add(int argc, char *argv[]); -static int be_cmd_jail(int argc, char *argv[]); -static int be_cmd_list(int argc, char *argv[]); -static int be_cmd_mount(int argc, char *argv[]); -static int be_cmd_rename(int argc, char *argv[]); -static int be_cmd_unjail(int argc, char *argv[]); -static int be_cmd_unmount(int argc, char *argv[]); +static int bectl_cmd_activate(int argc, char *argv[]); +static int bectl_cmd_create(int argc, char *argv[]); +static int bectl_cmd_destroy(int argc, char *argv[]); +static int bectl_cmd_export(int argc, char *argv[]); +static int bectl_cmd_import(int argc, char *argv[]); +static int bectl_cmd_add(int argc, char *argv[]); +static int bectl_cmd_jail(int argc, char *argv[]); +static int bectl_cmd_list(int argc, char *argv[]); +static int bectl_cmd_mount(int argc, char *argv[]); +static int bectl_cmd_rename(int argc, char *argv[]); +static int bectl_cmd_unjail(int argc, char *argv[]); +static int bectl_cmd_unmount(int argc, char *argv[]); libbe_handle_t *be; @@ -62,20 +62,20 @@ usage(bool explicit) FILE *fp = explicit ? stdout : stderr; fprintf(fp, - "usage:\tbe ( -h | -? | subcommand [args...] )\n" - "\tbe activate [-t] beName\n" - "\tbe create [-e nonActiveBe | -e beName@snapshot] beName\n" - "\tbe create beName@snapshot\n" - "\tbe destroy [-F] beName | beName@snapshot⟩\n" - "\tbe export sourceBe\n" - "\tbe import targetBe\n" - "\tbe add (path)*\n" - "\tbe jail bootenv\n" - "\tbe list [-a] [-D] [-H] [-s]\n" - "\tbe mount beName [mountpoint]\n" - "\tbe rename origBeName newBeName\n" - "\tbe { ujail | unjail } ⟨jailID | jailName⟩ bootenv\n" - "\tbe { umount | unmount } [-f] beName\n"); + "usage:\tbectl ( -h | -? | subcommand [args...] )\n" + "\tbectl activate [-t] beName\n" + "\tbectl create [-e nonActiveBe | -e beName@snapshot] beName\n" + "\tbectl create beName@snapshot\n" + "\tbectl destroy [-F] beName | beName@snapshot⟩\n" + "\tbectl export sourceBe\n" + "\tbectl import targetBe\n" + "\tbectl add (path)*\n" + "\tbectl jail bootenv\n" + "\tbectl list [-a] [-D] [-H] [-s]\n" + "\tbectl mount beName [mountpoint]\n" + "\tbectl rename origBeName newBeName\n" + "\tbectl { ujail | unjail } ⟨jailID | jailName⟩ bootenv\n" + "\tbectl { umount | unmount } [-f] beName\n"); return (explicit ? 0 : EX_USAGE); } @@ -92,18 +92,18 @@ struct command_map_entry { static struct command_map_entry command_map[] = { - { "activate", be_cmd_activate }, - { "create", be_cmd_create }, - { "destroy", be_cmd_destroy }, - { "export", be_cmd_export }, - { "import", be_cmd_import }, - { "add", be_cmd_add }, - { "jail", be_cmd_jail }, - { "list", be_cmd_list }, - { "mount", be_cmd_mount }, - { "rename", be_cmd_rename }, - { "unjail", be_cmd_unjail }, - { "unmount", be_cmd_unmount }, + { "activate", bectl_cmd_activate }, + { "create", bectl_cmd_create }, + { "destroy", bectl_cmd_destroy }, + { "export", bectl_cmd_export }, + { "import", bectl_cmd_import }, + { "add", bectl_cmd_add }, + { "jail", bectl_cmd_jail }, + { "list", bectl_cmd_list }, + { "mount", bectl_cmd_mount }, + { "rename", bectl_cmd_rename }, + { "unjail", bectl_cmd_unjail }, + { "unmount", bectl_cmd_unmount }, }; static int @@ -123,7 +123,7 @@ get_cmd_index(char *cmd, int *index) static int -be_cmd_activate(int argc, char *argv[]) +bectl_cmd_activate(int argc, char *argv[]) { int err, opt; bool temp; @@ -171,7 +171,7 @@ be_cmd_activate(int argc, char *argv[]) // TODO: when only one arg is given, and it contains an "@" the this should // create that snapshot static int -be_cmd_create(int argc, char *argv[]) +bectl_cmd_create(int argc, char *argv[]) { int err, opt; char *snapname; @@ -244,7 +244,7 @@ be_cmd_create(int argc, char *argv[]) static int -be_cmd_export(int argc, char *argv[]) +bectl_cmd_export(int argc, char *argv[]) { int opt; char *bootenv; @@ -274,7 +274,7 @@ be_cmd_export(int argc, char *argv[]) static int -be_cmd_import(int argc, char *argv[]) +bectl_cmd_import(int argc, char *argv[]) { char *bootenv; int err; @@ -305,7 +305,7 @@ be_cmd_import(int argc, char *argv[]) static int -be_cmd_add(int argc, char *argv[]) +bectl_cmd_add(int argc, char *argv[]) { char *bootenv; @@ -325,7 +325,7 @@ be_cmd_add(int argc, char *argv[]) static int -be_cmd_destroy(int argc, char *argv[]) +bectl_cmd_destroy(int argc, char *argv[]) { int opt, err; bool force; @@ -361,7 +361,7 @@ be_cmd_destroy(int argc, char *argv[]) static int -be_cmd_jail(int argc, char *argv[]) +bectl_cmd_jail(int argc, char *argv[]) { char *bootenv; char mnt_loc[BE_MAXPATHLEN]; @@ -417,7 +417,7 @@ be_cmd_jail(int argc, char *argv[]) static int -be_cmd_list(int argc, char *argv[]) +bectl_cmd_list(int argc, char *argv[]) { int opt; bool show_all_datasets, show_space, hide_headers, show_snaps; @@ -460,7 +460,7 @@ be_cmd_list(int argc, char *argv[]) static int -be_cmd_mount(int argc, char *argv[]) +bectl_cmd_mount(int argc, char *argv[]) { int err; char result_loc[BE_MAXPATHLEN]; @@ -499,7 +499,7 @@ be_cmd_mount(int argc, char *argv[]) static int -be_cmd_rename(int argc, char *argv[]) +bectl_cmd_rename(int argc, char *argv[]) { char *src; char *dest; @@ -533,7 +533,7 @@ be_cmd_rename(int argc, char *argv[]) static int -be_cmd_unjail(int argc, char *argv[]) +bectl_cmd_unjail(int argc, char *argv[]) { int opt; char *cmd, *target; @@ -572,7 +572,7 @@ be_cmd_unjail(int argc, char *argv[]) static int -be_cmd_unmount(int argc, char *argv[]) +bectl_cmd_unmount(int argc, char *argv[]) { int err, flags, opt; char *cmd, *bootenv;