--- libaitcli/inc/aitcli.h	2013/11/22 15:17:22	1.10
+++ libaitcli/inc/aitcli.h	2022/10/17 22:04:24	1.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.h,v 1.10 2013/11/22 15:17:22 misho Exp $
+* $Id: aitcli.h,v 1.13 2022/10/17 22:04:24 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 <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2022
 	by Michael Pounov <misho@elwix.org>.  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;
@@ -343,13 +345,13 @@ unsigned int cli_telnet_GetCmd(struct telnetAttrs *att
  *
  * @attr = input attribute
  * @cmd = command
- * @opt = option, if 0xff not specified
+ * @optz = option, if 0xff not specified
  * @arg1 = sub-option code, if 0xff not specified
  * @arg2 = sub-option data, if NULL not specified
  * @arg3 = sub-option data size, if 0 not specified data
  * return: -1 can`t set command; !=-1 ok
 */
-int cli_telnet_SetCmd(struct telnetAttrs *attr, unsigned char cmd, unsigned char opt, ...);
+int cli_telnet_SetCmd(struct telnetAttrs *attr, unsigned char cmd, int optz, ...);
 
 /*
  * cli_telnet_Answer() - Automatic generate commands answer to send from telnet
@@ -524,13 +526,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
@@ -538,6 +549,16 @@ int cliInitLine(linebuffer_t * __restrict cli_buffer);
  * return: NULL if error or !=NULL readed line, must be e_free after use!
 */
 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