--- libaitcli/src/aitcli.c 2013/11/22 15:17:22 1.12 +++ libaitcli/src/aitcli.c 2020/09/01 23:19:55 1.17 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.12 2013/11/22 15:17:22 misho Exp $ +* $Id: aitcli.c,v 1.17 2020/09/01 23:19:55 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2020 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -106,7 +106,7 @@ printfEOL(linebuffer_t * __restrict buf, int len, int } write(buf->line_out, buf->line_buf, len == -1 ? - buf->line_eol - buf->line_bol: len); + buf->line_eol - buf->line_bol : len); } } @@ -154,7 +154,8 @@ bufCHAR(int idx, void * __restrict cli_buffer) memcpy(buf->line_buf + pos, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len); buf->line_buf[buf->line_len - 1] = 0; - write(buf->line_out, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len); + if (buf->line_prompt) + write(buf->line_out, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len); if (buf->line_mode == LINEMODE_INS) { write(buf->line_out, (const u_char*) buf->line_buf + pos + buf->line_keys[idx].key_len, @@ -977,6 +978,7 @@ cliInit(int fin, int fout, const char *prompt) linebuffer_t *cli_buffer; bindkey_t *keys; register int i; + char szPrompt[STRSIZ] = {[0 ... STRSIZ - 1] = 0}; /* init buffer */ cli_buffer = e_malloc(sizeof(linebuffer_t)); @@ -993,7 +995,9 @@ cliInit(int fin, int fout, const char *prompt) SLIST_INIT(&cli_buffer->line_cmds); if (prompt) { - cli_buffer->line_prompt = e_strdup(prompt); + strlcpy(cli_buffer->line_porigin, prompt, sizeof cli_buffer->line_porigin); + snprintf(szPrompt, sizeof szPrompt, "%s{%d}> ", cli_buffer->line_porigin, cli_buffer->line_level); + cli_buffer->line_prompt = e_strdup(szPrompt); if (!cli_buffer->line_prompt) { LOGERR; e_free(cli_buffer); @@ -1050,7 +1054,7 @@ cliInit(int fin, int fout, const char *prompt) keys[i].key_func = bufEOL; if (cli_buffer->line_prompt && (i == *K_CTRL_H || i == *K_BACKSPACE)) keys[i].key_func = bufBS; - if (cli_buffer->line_prompt && i == *K_CTRL_C) + if (i == *K_CTRL_C) keys[i].key_func = bufCLR; if (cli_buffer->line_prompt && i == *K_CTRL_A) keys[i].key_func = bufBEGIN; @@ -1058,7 +1062,7 @@ cliInit(int fin, int fout, const char *prompt) keys[i].key_func = bufEND; if (cli_buffer->line_prompt && i == *K_TAB) keys[i].key_func = bufComp; - if (cli_buffer->line_prompt && i == *K_CTRL_Z) + if (i == *K_CTRL_Z) keys[i].key_func = bufEndNode; if (i >= *K_SPACE && i < *K_BACKSPACE) keys[i].key_func = bufCHAR; @@ -1303,17 +1307,11 @@ cliReadLine(linebuffer_t * __restrict cli_buffer, int memset(buf, 0, sizeof buf); readLen = read(cli_buffer->line_in, buf, BUFSIZ); - if (readLen == -1) { - LOGERR; - return str; + if (readLen < 1) { + if (readLen) + LOGERR; + return NULL; } - if (!readLen) { - if (cli_buffer->line_buf) - str = e_strdup(cli_buffer->line_buf); - else - cli_SetErr(EPIPE, "Unknown state ..."); - return str; - } recheck: for (code = RETCODE_OK, i = MAX_BINDKEY - 1; i > -1; i--) @@ -1360,7 +1358,7 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const int sock, int timeout) { u_char buf[BUFSIZ]; - int pid, stat, pty, r, s, alen, flg, attrlen = 0, ret = 0; + int pid, stat, pty, s, alen, flg, attrlen = 0, ret = 0; fd_set fds; struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; struct telnetAttrs *a, Attr[10]; @@ -1405,7 +1403,6 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const break; } - r = FD_ISSET(sock, &fds) ? sock : pty; s = FD_ISSET(sock, &fds) ? pty : sock; if (FD_ISSET(sock, &fds)) { @@ -1445,8 +1442,9 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const if (FD_ISSET(pty, &fds)) { memset(buf, 0, BUFSIZ); - if ((ret = read(pty, buf, BUFSIZ)) == -1) { - LOGERR; + if ((ret = read(pty, buf, BUFSIZ)) < 1) { + if (ret) + LOGERR; break; } @@ -1465,6 +1463,69 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const } /* + * cliRun() - CLI run command line + * + * @cli_buffer = CLI buffer + * @psInput = Input command line + * @prompt = Display prompt after command + * return: RETCODE_ERR error, RETCODE_OK ok +*/ +int +cliRun(linebuffer_t * __restrict cli_buffer, char *psInput, int prompt) +{ + char *line, *s, *t, **app, *items[MAX_PROMPT_ITEMS]; + register int i; + int ret = RETCODE_OK; + struct tagCommand *cmd; + + if (!psInput) + return RETCODE_ERR; + else + line = psInput; + + // clear whitespaces + for (s = line; isspace((int) *s); s++); + if (*s) { + for (t = s + strlen(s) - 1; t > s && isspace((int) *t); t--); + *++t = 0; + } + + if (*s) { + memset(items, 0, sizeof(char*) * MAX_PROMPT_ITEMS); + for (app = items; app < items + MAX_PROMPT_ITEMS - 1 && + (*app = strsep(&s, " \t")); *app ? app++ : app); + + // exec_cmd ... + i = 0; + SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) { + if (!(cmd->cmd_level & (1 << cli_buffer->line_level))) + continue; + if (*items[0] && !strncmp(cmd->cmd_name, items[0], strlen(items[0]))) + break; + else + i++; + } + + if (!cmd) { + cli_Printf(cli_buffer, "%sCommand '%s' not found!\n", + cli_buffer->line_prompt ? "\n" : "", items[0]); + ret = RETCODE_ERR; + } else + if (cmd->cmd_func) { + if (prompt && cli_buffer->line_prompt) + cli_Printf(cli_buffer, "\n"); + ret = cmd->cmd_func(cli_buffer, + cli_buffer->line_level, items); + } else if (prompt) { + clrscrEOL(cli_buffer); + printfCR(cli_buffer, 1); + } + } + + return ret; +} + +/* * cliLoop() - CLI main loop * * @cli_buffer = CLI buffer @@ -1475,10 +1536,8 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const int cliLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, int timeout) { - char *line, *s, *t, **app, *items[MAX_PROMPT_ITEMS]; - register int i; + char *line; int ret = RETCODE_OK; - struct tagCommand *cmd; /* --- main body of CLI --- */ cliInitLine(cli_buffer); @@ -1493,42 +1552,8 @@ cliLoop(linebuffer_t * __restrict cli_buffer, const ch break; } else cli_addHistory(cli_buffer, NULL); - // clear whitespaces - for (s = line; isspace((int) *s); s++); - if (*s) { - for (t = s + strlen(s) - 1; t > s && isspace((int) *t); t--); - *++t = 0; - } - if (*s) { - memset(items, 0, sizeof(char*) * MAX_PROMPT_ITEMS); - for (app = items; app < items + MAX_PROMPT_ITEMS - 1 && - (*app = strsep(&s, " \t")); *app ? app++ : app); - - // exec_cmd ... - i = 0; - SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) { - if (!(cmd->cmd_level & (1 << cli_buffer->line_level))) - continue; - if (*items[0] && !strncmp(cmd->cmd_name, items[0], strlen(items[0]))) - break; - else - i++; - } - - if (!cmd) { - cli_Printf(cli_buffer, "\nCommand '%s' not found!\n", items[0]); - ret = -1; - } else - if (cmd->cmd_func) { - cli_Printf(cli_buffer, "\n"); - ret = cmd->cmd_func(cli_buffer, - cli_buffer->line_level, items); - } else { - clrscrEOL(cli_buffer); - printfCR(cli_buffer, 1); - } - } + ret = cliRun(cli_buffer, line, 42); cli_freeLine(cli_buffer); cli_resetHistory(cli_buffer);