summaryrefslogtreecommitdiffstats
path: root/cli/src/input.c
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2010-09-15 08:11:15 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-16 23:07:27 -0700
commit63ec13f022ae99c1664fbdbc9e6623903ba843af (patch)
treefdde04563f5081e4322c0bf75541631293100fd8 /cli/src/input.c
parent47bc630dca589235d7c10e2748cebaa5e419d5d7 (diff)
cli: add a simplistic option parser, convert "mode script" to "--mode=script"
Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
Diffstat (limited to 'cli/src/input.c')
-rw-r--r--cli/src/input.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/cli/src/input.c b/cli/src/input.c
index 2c67b354d4c..7c3e78b16ca 100644
--- a/cli/src/input.c
+++ b/cli/src/input.c
@@ -41,10 +41,7 @@ cli_batch (void *d)
state = d;
- if (state->mode == GLUSTER_MODE_SCRIPT)
- ret = cli_cmd_process (state, state->argc - 2, state->argv + 2);
- else
- ret = cli_cmd_process (state, state->argc, state->argv);
+ ret = cli_cmd_process (state, state->argc, state->argv);
gf_log ("", GF_LOG_NORMAL, "Exiting with: %d", ret);
exit (ret);
@@ -86,22 +83,8 @@ int
cli_input_init (struct cli_state *state)
{
int ret = 0;
- gf_boolean_t is_batch = _gf_false;
-
- if (1 < state->argc) {
- if (!strcmp ("mode", state->argv[0]) &&
- !strcmp ("script", state->argv[1])) {
- state->mode = GLUSTER_MODE_SCRIPT;
- if (2 < state->argc)
- is_batch = _gf_true;
- } else {
- is_batch = _gf_true;
- }
- } else if (1 == state->argc) {
- is_batch = _gf_true;
- }
- if (is_batch) {
+ if (state->argc) {
ret = pthread_create (&state->input, NULL, cli_batch, state);
return ret;
}