diff options
Diffstat (limited to 'cli/src/input.c')
-rw-r--r-- | cli/src/input.c | 102 |
1 files changed, 50 insertions, 52 deletions
diff --git a/cli/src/input.c b/cli/src/input.c index 10fc39cd6b..0583f648f9 100644 --- a/cli/src/input.c +++ b/cli/src/input.c @@ -19,74 +19,72 @@ #define CMDBUFSIZ 1024 void * -cli_batch (void *d) +cli_batch(void *d) { - struct cli_state *state = NULL; - int ret = 0; + struct cli_state *state = NULL; + int ret = 0; - state = d; + state = d; - ret = cli_cmd_process (state, state->argc, state->argv); + ret = cli_cmd_process(state, state->argc, state->argv); - gf_log ("", GF_LOG_INFO, "Exiting with: %d", ret); - exit (-ret); + gf_log("", GF_LOG_INFO, "Exiting with: %d", ret); + exit(-ret); - return NULL; + return NULL; } - void * -cli_input (void *d) +cli_input(void *d) { - struct cli_state *state = NULL; - int ret = 0; - char cmdbuf[CMDBUFSIZ]; - char *cmd = NULL; - size_t len = 0; - - state = d; - - for (;;) { - printf ("%s", state->prompt); - - cmd = fgets (cmdbuf, CMDBUFSIZ, stdin); - if (!cmd) - break; - len = strlen(cmd); - if (len > 0 && cmd[len - 1] == '\n') //strip trailing \n - cmd[len - 1] = '\0'; - ret = cli_cmd_process_line (state, cmd); - if (ret != 0 && state->mode & GLUSTER_MODE_ERR_FATAL) - break; - } - - exit (-ret); - - return NULL; + struct cli_state *state = NULL; + int ret = 0; + char cmdbuf[CMDBUFSIZ]; + char *cmd = NULL; + size_t len = 0; + + state = d; + + for (;;) { + printf("%s", state->prompt); + + cmd = fgets(cmdbuf, CMDBUFSIZ, stdin); + if (!cmd) + break; + len = strlen(cmd); + if (len > 0 && cmd[len - 1] == '\n') // strip trailing \n + cmd[len - 1] = '\0'; + ret = cli_cmd_process_line(state, cmd); + if (ret != 0 && state->mode & GLUSTER_MODE_ERR_FATAL) + break; + } + + exit(-ret); + + return NULL; } - int -cli_input_init (struct cli_state *state) +cli_input_init(struct cli_state *state) { - int ret = 0; + int ret = 0; - if (state->argc) { - ret = pthread_create (&state->input, NULL, cli_batch, state); - return ret; - } + if (state->argc) { + ret = pthread_create(&state->input, NULL, cli_batch, state); + return ret; + } - if (isatty (STDIN_FILENO)) { - state->prompt = "gluster> "; + if (isatty(STDIN_FILENO)) { + state->prompt = "gluster> "; - cli_rl_enable (state); - } else { - state->prompt = ""; - state->mode |= GLUSTER_MODE_SCRIPT | GLUSTER_MODE_ERR_FATAL; - } + cli_rl_enable(state); + } else { + state->prompt = ""; + state->mode |= GLUSTER_MODE_SCRIPT | GLUSTER_MODE_ERR_FATAL; + } - if (!state->rl_enabled) - ret = pthread_create (&state->input, NULL, cli_input, state); + if (!state->rl_enabled) + ret = pthread_create(&state->input, NULL, cli_input, state); - return ret; + return ret; } |