X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Finput.c;h=b515c4e10931db0c8e599d9820b991d974a6fb6b;hb=15d9a1045da36a709cc7b56f327253de6249e57f;hp=72e360cd5a87fcf61deaca181c8cc5a5ccd0a271;hpb=bc2e98d50f275471345c749e4d951a309a7f14a7;p=sysdb.git diff --git a/src/tools/sysdb/input.c b/src/tools/sysdb/input.c index 72e360c..b515c4e 100644 --- a/src/tools/sysdb/input.c +++ b/src/tools/sysdb/input.c @@ -25,19 +25,41 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * This module implements the core of the command line tool. It handles all + * input from the user and the remote server, interacting with the scanner and + * command handling as needed. + * + * The main loop is managed by the flex scanner which parses the user input. + * It will call into this module (using sdb_input_readline()) whenever it + * needs further input to continue parsing. Whenever it finds a full query + * (terminated by a semicolon), it will hand the query back to this module + * (using sdb_input_exec_query()) which will then execute it. + * + * Most of the process life-time will be spend waiting for input. User input + * and (asynchronous) server replies are handled at the same time. + */ + #if HAVE_CONFIG_H # include "config.h" #endif /* HAVE_CONFIG_H */ #include "tools/sysdb/input.h" +#include "tools/sysdb/command.h" +#include "utils/error.h" #include "utils/strbuf.h" +#include + #include #include #include +#include +#include + #if HAVE_EDITLINE_READLINE_H # include # if HAVE_EDITLINE_HISTORY_H @@ -55,70 +77,199 @@ # endif #endif /* READLINEs */ +extern int yylex(void); + +/* + * public variables + */ + +sdb_input_t *sysdb_input = NULL; + +/* + * private variables + */ + +static struct termios orig_term_attrs; + /* * private helper functions */ -static size_t -input_readline(sdb_strbuf_t *buf) +static void +reset_term_attrs(void) { - const char *prompt = "sysdb=> "; - char *line; + tcsetattr(STDIN_FILENO, TCSANOW, &orig_term_attrs); +} /* reset_term_attrs */ + +static void +term_rawmode(void) +{ + struct termios attrs; + + /* setup terminal to operate in non-canonical mode + * and single character input */ + memset(&orig_term_attrs, 0, sizeof(orig_term_attrs)); + tcgetattr(STDIN_FILENO, &orig_term_attrs); + atexit(reset_term_attrs); + + memset(&attrs, 0, sizeof(attrs)); + tcgetattr(STDIN_FILENO, &attrs); + attrs.c_lflag &= (tcflag_t)(~ICANON); + attrs.c_cc[VMIN] = 1; + tcsetattr(STDIN_FILENO, TCSANOW, &attrs); +} /* term_rawmode */ + +static void +handle_input(char *line) +{ + if (! line) { + sysdb_input->eof = 1; + return; + } + + sdb_strbuf_append(sysdb_input->input, line); + sdb_strbuf_append(sysdb_input->input, "\n"); + free(line); + rl_callback_handler_remove(); +} /* handle_input */ + +/* wait for a new line of data to be available */ +static ssize_t +input_readline(void) +{ size_t len; - if (sdb_strbuf_len(buf)) + fd_set fds; + int client_fd; + + const char *prompt = "sysdb=> "; + + if (sysdb_input->query_len) prompt = "sysdb-> "; - line = readline(prompt); + rl_callback_handler_install(prompt, handle_input); + client_fd = sdb_client_sockfd(sysdb_input->client); - if (! line) - return 0; + len = sdb_strbuf_len(sysdb_input->input); + while ((sdb_strbuf_len(sysdb_input->input) == len) + && (! sysdb_input->eof)) { + int n; - len = strlen(line) + 1; + /* XXX: some versions of libedit don't properly reset the terminal in + * rl_callback_read_char(); detect those versions */ + term_rawmode(); - sdb_strbuf_append(buf, line); - sdb_strbuf_append(buf, "\n"); - free(line); - return len; + FD_ZERO(&fds); + FD_SET(STDIN_FILENO, &fds); + FD_SET(client_fd, &fds); + + n = select(client_fd + 1, &fds, NULL, NULL, /* timeout = */ NULL); + if (n < 0) + return (ssize_t)n; + else if (! n) + continue; + + /* handle user input with highest priority */ + if (FD_ISSET(STDIN_FILENO, &fds)) { + rl_callback_read_char(); + continue; + } + + if (! FD_ISSET(client_fd, &fds)) + continue; + + if (sdb_client_eof(sysdb_input->client)) { + /* XXX: try to reconnect */ + printf("\n"); + sdb_log(SDB_LOG_ERR, "Remote side closed the connection."); + /* return EOF */ + return 0; + } + + /* some response / error message from the server pending */ + /* XXX: clear current line */ + printf("\n"); + sdb_command_print_reply(sysdb_input->client); + rl_forced_update_display(); + } + + /* new data available */ + return (ssize_t)(sdb_strbuf_len(sysdb_input->input) - len); } /* input_readline */ /* - * API + * public API */ +int +sdb_input_init(sdb_input_t *input) +{ + /* register input handler */ + sysdb_input = input; + + if (! isatty(STDIN_FILENO)) + return -1; + + term_rawmode(); + return 0; +} /* sdb_input_init */ + +int +sdb_input_mainloop(void) +{ + yylex(); + return 0; +} /* sdb_input_mainloop */ + ssize_t -sdb_input_readline(sdb_input_t *input, char *buf, - int *n_chars, size_t max_chars) +sdb_input_readline(char *buf, int *n_chars, size_t max_chars) { - const char *query; + const char *data; size_t len; - len = sdb_strbuf_len(input->buf) - input->tokenizer_pos; + len = sdb_strbuf_len(sysdb_input->input) - sysdb_input->tokenizer_pos; if (! len) { - size_t n = input_readline(input->buf); - if (! n) { + ssize_t n = input_readline(); + if (n <= 0) { *n_chars = 0; /* YY_NULL */ - return 0; + return n; } - len += n; + len += (size_t)n; } - query = sdb_strbuf_string(input->buf); - len = (len < max_chars) ? len : max_chars; - strncpy(buf, sdb_strbuf_string(input->buf) + input->tokenizer_pos, len); - input->tokenizer_pos += len; - *n_chars = (int)len; + data = sdb_strbuf_string(sysdb_input->input); + data += sysdb_input->tokenizer_pos; + strncpy(buf, data, len); - /* XXX */ - if (! strchr(query, (int)';')) - return (ssize_t)len; - sdb_strbuf_clear(input->buf); - input->tokenizer_pos = 0; + sysdb_input->tokenizer_pos += len; + *n_chars = (int)len; return (ssize_t)len; } /* sdb_input_readline */ +int +sdb_input_exec_query(void) +{ + char *query = sdb_command_exec(sysdb_input); + + HIST_ENTRY *current_hist; + const char *hist_line = NULL; + + if (! query) + return -1; + + current_hist = current_history(); + if (current_hist) + hist_line = current_hist->line; + + if (*query != ' ') + if ((! hist_line) || strcmp(hist_line, query)) + add_history(query); + free(query); + return 0; +} /* sdb_input_exec_query */ + /* vim: set tw=78 sw=4 ts=4 noexpandtab : */