--- libaitcli/src/cli.c	2013/10/08 09:51:02	1.6.4.3
+++ libaitcli/src/cli.c	2013/10/08 10:45:08	1.6.4.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.6.4.3 2013/10/08 09:51:02 misho Exp $
+* $Id: cli.c,v 1.6.4.4 2013/10/08 10:45:08 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -54,7 +54,8 @@ SUCH DAMAGE.
  * @args = Parsed arguments array
  * return: RETCODE_EOF exit from Cli!
 */
-int cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
 	cli_Printf(cli_buffer, "\n");
 	return RETCODE_EOF;
@@ -68,7 +69,8 @@ int cli_Cmd_Exit(void * __restrict cli_buffer, int idx
  * @args = Parsed arguments array
  * return: RETCODE_ERR in error or RETCODE_OK
 */
-int cli_Cmd_Help(void * __restrict cli_buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Help(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
 	linebuffer_t *buf = cli_buffer;
 	struct tagCommand *cmd;
@@ -116,7 +118,8 @@ int cli_Cmd_Help(void * __restrict cli_buffer, int idx
  * @args = Parsed arguments array
  * return: RETCODE_OK ok
 */
-int cli_Cmd_Unsupported(void * __restrict cli_buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Unsupported(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
 	cli_Printf(cli_buffer, "Command %s not supported in this version ...\n", args[0]);
 	return RETCODE_OK;
@@ -130,8 +133,15 @@ int cli_Cmd_Unsupported(void * __restrict cli_buffer, 
  * @args = Parsed arguments array
  * return: RETCODE_ERR in error or RETCODE_OK
 */
-int cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
+	linebuffer_t *buf = cli_buffer;
+
+	if (idx == sizeof idx * 8)
+		return RETCODE_ERR;
+
+	buf->line_level++;
 	return RETCODE_OK;
 }
 
@@ -141,9 +151,33 @@ int cli_Cmd_Config(void * __restrict cli_buffer, int i
  * @cli_buffer = CLI buffer
  * @idx = Config level
  * @args = Parsed arguments array
- * return: RETCODE_ERR in error or RETCODE_OK
+ * return: RETCODE_EOF in level 0 or RETCODE_OK
 */
-int cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
+	linebuffer_t *buf = cli_buffer;
+
+	if (!idx)
+		cli_Cmd_Exit(cli_buffer, idx, args);
+
+	buf->line_level--;
+	return RETCODE_OK;
+}
+
+/*
+ * cli_Cmd_Top() - Builtin helper function for top level of Cli
+ *
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
+ * @args = Parsed arguments array
+ * return: RETCODE_OK ok
+*/
+int
+cli_Cmd_Top(void * __restrict cli_buffer, int idx, char ** __restrict args)
+{
+	linebuffer_t *buf = cli_buffer;
+
+	buf->line_level ^= buf->line_level;
 	return RETCODE_OK;
 }