socsvn commit: r324146 - soc2017/kneitinger/libbe-head/sbin/be
kneitinger at FreeBSD.org
kneitinger at FreeBSD.org
Sat Jul 1 11:18:50 UTC 2017
Author: kneitinger
Date: Sat Jul 1 11:18:48 2017
New Revision: 324146
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=324146
Log:
be(1): rename subcommand functions to not conflict with libbe functions
Modified:
soc2017/kneitinger/libbe-head/sbin/be/Makefile
soc2017/kneitinger/libbe-head/sbin/be/be.c
Modified: soc2017/kneitinger/libbe-head/sbin/be/Makefile
==============================================================================
--- soc2017/kneitinger/libbe-head/sbin/be/Makefile Sat Jul 1 10:04:42 2017 (r324145)
+++ soc2017/kneitinger/libbe-head/sbin/be/Makefile Sat Jul 1 11:18:48 2017 (r324146)
@@ -5,6 +5,7 @@
MAN= be.1
LIBADD+= be
+LIBADD+= nvpair
CFLAGS+= -I${SRCTOP}/lib/libbe
Modified: soc2017/kneitinger/libbe-head/sbin/be/be.c
==============================================================================
--- soc2017/kneitinger/libbe-head/sbin/be/be.c Sat Jul 1 10:04:42 2017 (r324145)
+++ soc2017/kneitinger/libbe-head/sbin/be/be.c Sat Jul 1 11:18:48 2017 (r324146)
@@ -33,19 +33,21 @@
#include <sysexits.h>
#include <unistd.h>
+#include <libnvpair.h>
+
#include <be.h>
-static int be_activate(int argc, char *argv[]);
-static int be_create(int argc, char *argv[]);
-static int be_destroy(int argc, char *argv[]);
-static int be_jail(int argc, char *argv[]);
-static int be_list(int argc, char *argv[]);
-static int be_mount(int argc, char *argv[]);
-static int be_rename(int argc, char *argv[]);
-static int be_unjail(int argc, char *argv[]);
-static int be_unmount(int argc, char *argv[]);
+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_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[]);
-libbe_handle_t *libbe;
+libbe_handle_t *be;
static int
usage(bool explicit)
@@ -53,17 +55,17 @@
FILE *fp = explicit ? stdout : stderr;
fprintf(fp, "%s\n\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
- "usage: be ( -h | -? | subcommand [args...] )",
- " be activate [-t] beName",
- " be create [-r] [-e nonActiveBe | -e beName at snapshot] beName",
- " be create [-r] beName at snapshot",
- " be destroy [-F] ⟨beName | beName at snapshot⟩",
- " be jail ⟨jailID | jailName⟩ bootenv",
- " be list [-a] [-D] [-H] [-s]",
- " be mount beName [mountpoint]",
- " be rename origBeName newBeName",
- " be { ujail | unjail } ⟨jailID | jailName⟩ bootenv",
- " be { umount | unmount } [-f] beName");
+ "usage:\tbe ( -h | -? | subcommand [args...] )",
+ "\tbe activate [-t] beName",
+ "\tbe create [-r] [-e nonActiveBe | -e beName at snapshot] beName",
+ "\tbe create [-r] beName at snapshot",
+ "\tbe destroy [-F] ⟨beName | beName at snapshot⟩",
+ "\tbe jail ⟨jailID | jailName⟩ bootenv",
+ "\tbe list [-a] [-D] [-H] [-s]",
+ "\tbe mount beName [mountpoint]",
+ "\tbe rename origBeName newBeName",
+ "\tbe { ujail | unjail } ⟨jailID | jailName⟩ bootenv",
+ "\tbe { umount | unmount } [-f] beName");
return (explicit ? 0 : EX_USAGE);
}
@@ -80,15 +82,15 @@
static struct command_map_entry command_map[] =
{
- { "activate", be_activate },
- { "create", be_create },
- { "destroy", be_destroy },
- { "jail", be_jail },
- { "list", be_list },
- { "mount", be_mount },
- { "rename", be_rename },
- { "unjail", be_unjail },
- { "unmount", be_unmount },
+ { "activate", be_cmd_activate },
+ { "create", be_cmd_create },
+ { "destroy", be_cmd_destroy },
+ { "jail", be_cmd_jail },
+ { "list", be_cmd_list },
+ { "mount", be_cmd_mount },
+ { "rename", be_cmd_rename },
+ { "unjail", be_cmd_unjail },
+ { "unmount", be_cmd_unmount },
};
static int
@@ -108,7 +110,7 @@
static int
-be_activate(int argc, char *argv[])
+be_cmd_activate(int argc, char *argv[])
{
int opt;
bool temp;
@@ -144,7 +146,7 @@
static int
-be_create(int argc, char *argv[])
+be_cmd_create(int argc, char *argv[])
{
int opt;
bool recursive;
@@ -200,7 +202,7 @@
static int
-be_destroy(int argc, char *argv[])
+be_cmd_destroy(int argc, char *argv[])
{
int opt;
bool force;
@@ -251,7 +253,7 @@
static int
-be_jail(int argc, char *argv[])
+be_cmd_jail(int argc, char *argv[])
{
char *bootenv, *jail;
@@ -274,7 +276,7 @@
static int
-be_list(int argc, char *argv[])
+be_cmd_list(int argc, char *argv[])
{
int opt;
bool show_all_datasets, show_space, hide_headers, show_snaps;
@@ -309,14 +311,12 @@
return (usage(false));
}
- /* list logic goes here */
-
return (0);
}
static int
-be_mount(int argc, char *argv[])
+be_cmd_mount(int argc, char *argv[])
{
char *bootenv;
char *mountpoint;
@@ -341,7 +341,7 @@
static int
-be_rename(int argc, char *argv[])
+be_cmd_rename(int argc, char *argv[])
{
char *src;
char *dest;
@@ -366,7 +366,7 @@
static int
-be_unjail(int argc, char *argv[])
+be_cmd_unjail(int argc, char *argv[])
{
int opt;
char *cmd, *target;
@@ -405,7 +405,7 @@
static int
-be_unmount(int argc, char *argv[])
+be_cmd_unmount(int argc, char *argv[])
{
int opt;
bool force;
@@ -451,7 +451,7 @@
if (argc < 2) {
fprintf(stderr, "missing command\n");
- exit(usage(false));
+ return (usage(false));
}
command = argv[1];
@@ -466,22 +466,19 @@
}
if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) {
- exit(usage(true));
+ return (usage(true));
}
if (get_cmd_index(command, &command_index)) {
fprintf(stderr, "unknown command: %s\n", command);
- exit(usage(false));
+ return (usage(false));
}
- libbe = libbe_init();
+ be = libbe_init();
int rc = command_map[command_index].fn(argc-1, argv+1);
- fprintf(stdout, "libbe error description: %s\n",
- libbe_error_description(libbe));
-
- libbe_close(libbe);
+ libbe_close(be);
return (rc);
}
More information about the svn-soc-all
mailing list