--- libaitcli/src/cli.c	2010/04/16 13:20:29	1.1.1.1
+++ libaitcli/src/cli.c	2010/06/07 11:54:00	1.1.1.1.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.1.1.1 2010/04/16 13:20:29 misho Exp $
+* $Id: cli.c,v 1.1.1.1.4.2 2010/06/07 11:54:00 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -11,15 +11,15 @@
 
 /*
  * cli_Cmd_Exit() Builtin helper function for Exit from Cli
- * @cmds = Commands list
+ * @buffer = CLI buffer
  * @idx = Selected command ID
- * @out = Output handle
  * @args = Parsed arguments array
- * return: 1 exit from Cli!
+ * return: RETCODE_EOF exit from Cli!
 */
-int cli_Cmd_Exit(void *cmds, int idx, FILE *out, char ** __restrict args)
+int cli_Cmd_Exit(void * __restrict buffer, int idx, char ** __restrict argv)
 {
-	return 1;
+	cli_Printf(buffer, "\n");
+	return RETCODE_EOF;
 }
 
 /*
@@ -30,6 +30,7 @@ int cli_Cmd_Exit(void *cmds, int idx, FILE *out, char 
  * @args = Parsed arguments array
  * return: -1 error, 0 = ok
 */
+/*
 int cli_Cmd_Help(void *cmds, int idx, FILE *out, char ** __restrict args)
 {
 	register int i;
@@ -60,6 +61,7 @@ int cli_Cmd_Help(void *cmds, int idx, FILE *out, char 
 
 	return 0;
 }
+*/
 
 /*
  * cli_Cmd_Unsupported() Builtin helper function for unsupported commands
@@ -71,38 +73,6 @@ int cli_Cmd_Help(void *cmds, int idx, FILE *out, char 
 */
 int cli_Cmd_Unsupported(void *cmds, int idx, FILE *out, char ** __restrict args)
 {
-	cli_Printf(out, "Command %s not supported in this version ...\n", args[0]);
+//	cli_Printf(out, "Command %s not supported in this version ...\n", args[0]);
 	return 0;
 }
-
-// ------------------------------------------------------------
-
-/*
- * cli_Comp_Filename() Builtin helper function for filename completion arguments
- * @text = Text line
- * @state = Position state
- * return: NULL not found filename, != NULL filename
-*/
-char *cli_Comp_Filename(const char *text, int state)
-{
-	return rl_filename_completion_function(text, state);
-}
-
-
-// ------------------------------------------------------------
-
-/*
- * cli_PrintHelp() Helper print for missing command arguments
- * @out = Output stream
- * @cmds = Commands list
- * @idx = Selected command ID
- * return: -1 error, !=-1 ok
- * return: none
-*/
-inline int cli_PrintHelp(FILE *out, void *cmds, int idx)
-{
-	cliCommands_t *c = cmds;
-
-	return cli_Printf(out, "%s\n", c[idx].cmd_help);
-}
-