Btrfs-progs: Complete the help information of btrfs send/receive

When typing command "btrfs send --help" or "btrfs receive --help",
the help information of the commands is incomplete, which only
shows a short usage.

This patch helps to display the complete infomation of the commands.

Signed-off-by: Cheng Yang <chenyang.fnst@cn.fujitsu.com>

diff --git a/btrfs.c b/btrfs.c
index 4a68c53..7b0e50f 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -247,8 +247,8 @@ const struct cmd_group btrfs_cmd_group = {
                { "device", cmd_device, NULL, &device_cmd_group, 0 },
                { "scrub", cmd_scrub, NULL, &scrub_cmd_group, 0 },
                { "inspect-internal", cmd_inspect, NULL, &inspect_cmd_group, 0 },
-               { "send", cmd_send, NULL, &send_cmd_group, 0 },
-               { "receive", cmd_receive, NULL, &receive_cmd_group, 0 },
+               { "send", cmd_send, cmd_send_usage, NULL, 0 },
+               { "receive", cmd_receive, cmd_receive_usage, NULL, 0 },
                { "quota", cmd_quota, NULL, &quota_cmd_group, 0 },
                { "qgroup", cmd_qgroup, NULL, &qgroup_cmd_group, 0 },
                { "replace", cmd_replace, NULL, &replace_cmd_group, 0 },

diff --git a/cmds-receive.c b/cmds-receive.c
index 2fae299..973687f 100644 (file)
--- a/cmds-receive.c
+++ b/cmds-receive.c
@@ -881,7 +881,7 @@ static const char * const receive_cmd_group_usage[] = {
        NULL
 };
 
-static const char * const cmd_receive_usage[] = {
+const char * const cmd_receive_usage[] = {
        "btrfs receive [-v] [-f <infile>] <mount>",
        "Receive subvolumes from stdin.",
        "Receives one or more subvolumes that were previously ",
@@ -893,7 +893,7 @@ static const char * const cmd_receive_usage[] = {
        "After receiving a subvolume, it is immediately set to",
        "read only.\n",
        "-v               Enable verbose debug output. Each",
-       "                 occurrency of this option increases the",
+       "                 occurrence of this option increases the",
        "                 verbose level more.",
        "-f <infile>      By default, btrfs receive uses stdin",
        "                 to receive the subvolumes. Use this",

diff --git a/cmds-send.c b/cmds-send.c
index b314c40..43355db 100644 (file)
--- a/cmds-send.c
+++ b/cmds-send.c
@@ -637,7 +637,7 @@ static const char * const send_cmd_group_usage[] = {
        NULL
 };
 
-static const char * const cmd_send_usage[] = {
+const char * const cmd_send_usage[] = {
        "btrfs send [-v] [-p <parent>] [-c <clone-src>] <subvol>",
        "Send the subvolume to stdout.",
        "Sends the subvolume specified by <subvol> to stdout.",
@@ -651,7 +651,7 @@ static const char * const cmd_send_usage[] = {
        "which case 'btrfs send' will determine a suitable parent among the",
        "clone sources itself.",
        "\n",
-       "-v               Enable verbose debug output. Each occurrency of",
+       "-v               Enable verbose debug output. Each occurrence of",
        "                 this option increases the verbose level more.",
        "-p <parent>      Send an incremental stream from <parent> to",
        "                 <subvol>.",
@@ -663,13 +663,6 @@ static const char * const cmd_send_usage[] = {
        NULL
 };
 
-const struct cmd_group send_cmd_group = {
-       send_cmd_group_usage, NULL, {
-               { "send", cmd_send_start, cmd_send_usage, NULL, 0 },
-               { 0, 0, 0, 0, 0 },
-        },
-};
-
 int cmd_send(int argc, char **argv)
 {
        return cmd_send_start(argc, argv);

diff --git a/commands.h b/commands.h
index 61d74d7..64988e7 100644 (file)
--- a/commands.h
+++ b/commands.h
@@ -91,6 +91,9 @@ extern const struct cmd_group quota_cmd_group;
 extern const struct cmd_group qgroup_cmd_group;
 extern const struct cmd_group replace_cmd_group;
 
+extern const char * const cmd_send_usage[];
+extern const char * const cmd_receive_usage[];
+
 int cmd_subvolume(int argc, char **argv);
 int cmd_filesystem(int argc, char **argv);
 int cmd_balance(int argc, char **argv);