--- libaitcli/inc/aitcli.h 2017/10/08 23:10:30 1.10.10.2 +++ libaitcli/inc/aitcli.h 2024/12/09 13:21:23 1.13.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.h,v 1.10.10.2 2017/10/08 23:10:30 misho Exp $ +* $Id: aitcli.h,v 1.13.6.1 2024/12/09 13:21:23 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 - 2017 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -205,6 +205,7 @@ typedef struct { /* Commands structure for CLI */ +#define CLI_CMD_DEFINE(x) int (x)(void *, int, char **) typedef int (*cmd_func_t)(/*linebuffer_t **/ void * __restrict cli_buffer, int idx, char ** __restrict args); struct tagCommand { @@ -229,6 +230,7 @@ typedef struct { int line_kill; char line_mode; + char line_porigin[STRSIZ]; char *line_prompt; int line_bol; @@ -248,6 +250,9 @@ typedef struct { int line_out; } linebuffer_t; +#ifdef __cplusplus +extern "C" { +#endif /* Error support functions */ @@ -524,13 +529,22 @@ void cliEnd(linebuffer_t * __restrict cli_buffer); linebuffer_t *cliInit(int fin, int fout, const char *prompt); /* - * cliInitLine() - Init CLI input line terminal + * cliSetLine() - Set CLI input line terminal * * @cli_buffer = CLI buffer - * return: none + * @old = Old terminal settings + * return: -1 error or 0 ok */ -int cliInitLine(linebuffer_t * __restrict cli_buffer); +int cliSetLine(linebuffer_t * __restrict cli_buffer, struct termios * __restrict old); /* + * cliResetLine() - Reset CLI input line terminal + * + * @cli_buffer = CLI buffer + * @old = Original terminal settings + * return: -1 error or 0 ok +*/ +int cliResetLine(linebuffer_t * __restrict cli_buffer, struct termios * __restrict orig); +/* * cliReadLine() - Read line from opened CLI session * * @cli_buffer = CLI buffer @@ -540,6 +554,16 @@ int cliInitLine(linebuffer_t * __restrict cli_buffer); char *cliReadLine(linebuffer_t * __restrict cli_buffer, int timeout); /* + * 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); + +/* * cliLoop() - CLI main loop * * @cli_buffer = CLI buffer @@ -561,5 +585,8 @@ int cliNetLoop(linebuffer_t * __restrict cli_buffer, c int sock, int timeout); #define cliKillLoop(_x) (assert((_x)), (_x)->line_kill = 1) +#ifdef __cplusplus +} +#endif #endif