diff options
| -rw-r--r-- | cli/src/Makefile.am | 2 | ||||
| -rw-r--r-- | cli/src/cli-cmd-misc.c | 8 | ||||
| -rw-r--r-- | cli/src/cli-cmd-system.c | 80 | ||||
| -rw-r--r-- | cli/src/cli-cmd.c | 4 | ||||
| -rw-r--r-- | cli/src/cli-cmd.h | 2 |
5 files changed, 95 insertions, 1 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index fbbf44dd080..595cfad9df2 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -2,7 +2,7 @@ sbin_PROGRAMS = gluster gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c \ cli-cmd-volume.c cli-cmd-peer.c cli3_1-cops.c cli-cmd-parser.c\ - cli-cmd-misc.c + cli-cmd-system.c cli-cmd-misc.c gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\ $(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \ diff --git a/cli/src/cli-cmd-misc.c b/cli/src/cli-cmd-misc.c index 306a7628faa..ecef83d116e 100644 --- a/cli/src/cli-cmd-misc.c +++ b/cli/src/cli-cmd-misc.c @@ -40,6 +40,7 @@ extern rpc_clnt_prog_t *cli_rpc_prog; extern struct cli_cmd volume_cmds[]; extern struct cli_cmd cli_probe_cmds[]; extern struct cli_cmd cli_log_cmds[]; +extern struct cli_cmd cli_system_cmds[]; struct cli_cmd cli_misc_cmds[]; int @@ -61,6 +62,13 @@ cli_cmd_display_help (struct cli_state *state, struct cli_cmd_word *in_word, for (cmd = cli_probe_cmds; cmd->pattern; cmd++) cli_out ("%s - %s", cmd->pattern, cmd->desc); + /* + * commands for internal usage, don't expose + + for (cmd = cli_system_cmds; cmd->pattern; cmd++) + cli_out ("%s - %s", cmd->pattern, cmd->desc); + */ + for (cmd = cli_misc_cmds; cmd->pattern; cmd++) cli_out ("%s - %s", cmd->pattern, cmd->desc); diff --git a/cli/src/cli-cmd-system.c b/cli/src/cli-cmd-system.c new file mode 100644 index 00000000000..ec53b9848fb --- /dev/null +++ b/cli/src/cli-cmd-system.c @@ -0,0 +1,80 @@ +/* + Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com> + This file is part of GlusterFS. + + GlusterFS is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + GlusterFS is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see + <http://www.gnu.org/licenses/>. +*/ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <stdint.h> +#include <pthread.h> + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include "cli.h" +#include "cli-cmd.h" +#include "cli-mem-types.h" +#include "protocol-common.h" + +extern struct rpc_clnt *global_rpc; + +extern rpc_clnt_prog_t *cli_rpc_prog; + +int cli_cmd_system_help_cbk (struct cli_state *state, struct cli_cmd_word *in_word, + const char **words, int wordcount); + +struct cli_cmd cli_system_cmds[] = { + { "system:: help", + cli_cmd_system_help_cbk, + "display help for system commands"}, + + { NULL, NULL, NULL } +}; + +int +cli_cmd_system_help_cbk (struct cli_state *state, struct cli_cmd_word *in_word, + const char **words, int wordcount) +{ + struct cli_cmd *cmd = NULL; + + for (cmd = cli_system_cmds; cmd->pattern; cmd++) + cli_out ("%s - %s", cmd->pattern, cmd->desc); + + if (!state->rl_enabled) + exit (0); + + return 0; +} + +int +cli_cmd_system_register (struct cli_state *state) +{ + int ret = 0; + struct cli_cmd *cmd = NULL; + + for (cmd = cli_system_cmds; cmd->pattern; cmd++) { + ret = cli_cmd_register (&state->tree, cmd->pattern, cmd->cbk, + cmd->desc); + if (ret) + goto out; + } +out: + return ret; +} diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index 011edacfe90..f09c6210634 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -199,6 +199,10 @@ cli_cmds_register (struct cli_state *state) if (ret) goto out; + ret = cli_cmd_system_register (state); + if (ret) + goto out; + ret = cli_cmd_misc_register (state); if (ret) goto out; diff --git a/cli/src/cli-cmd.h b/cli/src/cli-cmd.h index 7dda509dd0c..89fc44cfaf5 100644 --- a/cli/src/cli-cmd.h +++ b/cli/src/cli-cmd.h @@ -49,6 +49,8 @@ int cli_cmd_volume_register (struct cli_state *state); int cli_cmd_probe_register (struct cli_state *state); +int cli_cmd_system_register (struct cli_state *state); + int cli_cmd_misc_register (struct cli_state *state); struct cli_cmd_word *cli_cmd_nextword (struct cli_cmd_word *word, |