--- libaitcli/src/aitcli.c	2010/06/07 12:30:28	1.2.2.8
+++ libaitcli/src/aitcli.c	2010/06/07 13:47:42	1.2.2.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.2.2.8 2010/06/07 12:30:28 misho Exp $
+* $Id: aitcli.c,v 1.2.2.9 2010/06/07 13:47:42 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -388,10 +388,30 @@ static int
 bufComp(int idx, void * __restrict buffer)
 {
 	linebuffer_t *buf = buffer;
+	char *str, *s, **app, *items[MAX_PROMPT_ITEMS];
+	register int i;
 
 	if (!buffer || idx < 0 || idx > MAX_BINDKEY)
 		return RETCODE_ERR;
 
+	str = strdup(buf->line_buf);
+	if (!str)
+		return RETCODE_ERR;
+	else {
+		s = str;
+		io_TrimStr((u_char*) s);
+	}
+
+	if (*s) {
+		memset(items, 0, sizeof(char*) * MAX_PROMPT_ITEMS);
+		for (app = items, i = 0; app < items + MAX_PROMPT_ITEMS - 1 && (*app = strsep(&s, " \t")); 
+			 	*app ? i++ : i, *app ? app++ : app);
+
+//		SLIST_FOREACH(cmd, &buf->line_cmds; cmd_next)
+//			if (!strncmp(cmd->cmd_name, items[i - 1], strlen(items[i - 1])))
+	}
+
+	free(str);
 	return RETCODE_OK;
 }
 
@@ -472,11 +492,12 @@ cli_BindKey(bindkey_t * __restrict key, linebuffer_t *
  * @funcCmd = Callback function when user call command
  * @csInfo = Inline information for command
  * @csHelp = Help line when call help
+ * @anComp = Completion array terminated with NULL element, -1 complete commands, NULL nothing
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
 cli_addCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel, cmd_func_t funcCmd, 
-		const char *csInfo, const char *csHelp)
+		const char *csInfo, const char *csHelp, const char **anComp)
 {
 	struct tagCommand *cmd;
 
@@ -494,6 +515,7 @@ cli_addCommand(linebuffer_t * __restrict buffer, const
 
 	cmd->cmd_level = cliLevel;
 	cmd->cmd_func = funcCmd;
+	cmd->cmd_comp = (char**) anComp;
 	cmd->cmd_len = strlcpy(cmd->cmd_name, csCmd, STRSIZ);
 	if (csInfo)
 		strlcpy(cmd->cmd_info, csInfo, STRSIZ);
@@ -540,11 +562,13 @@ cli_delCommand(linebuffer_t * __restrict buffer, const
  * @funcCmd = Callback function when user call command
  * @csInfo = Inline information for command
  * @csHelp = Help line when call help
+ * @anComp = Completion array terminated with NULL element, -1 complete commands, NULL nothing,
+ *		update only if funcCmd is not NULL
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
 cli_updCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel, cmd_func_t funcCmd, 
-		const char *csInfo, const char *csHelp)
+		const char *csInfo, const char *csHelp, const char **anComp)
 {
 	struct tagCommand *cmd;
 	int ret = RETCODE_OK;
@@ -558,8 +582,10 @@ cli_updCommand(linebuffer_t * __restrict buffer, const
 		if (cmd->cmd_level == cliLevel && !strcmp(cmd->cmd_name, csCmd)) {
 			ret = 1;
 
-			if (funcCmd)
+			if (funcCmd) {
 				cmd->cmd_func = funcCmd;
+				cmd->cmd_comp = (char**) anComp;
+			}
 			if (csInfo)
 				strlcpy(cmd->cmd_info, csInfo, STRSIZ);
 			if (csHelp)
@@ -879,8 +905,9 @@ cliInit(int fin, int fout, const char *prompt)
 		memset(keys, 0, sizeof(bindkey_t) * (MAX_BINDKEY + 1));
 
 	/* add helper functions */
-	cli_addCommand(buffer, "exit", 0, cli_Cmd_Exit, "exit <cr>", "Exit from console");
-	cli_addCommand(buffer, "help", 0, cli_Cmd_Help, "help [command] <cr>", "Help screen");
+	cli_addCommand(buffer, "exit", 0, cli_Cmd_Exit, "exit <cr>", "Exit from console", NULL);
+	cli_addCommand(buffer, "help", 0, cli_Cmd_Help, "help [command] <cr>", "Help screen", 
+			(const char**) -1);
 
 	/* fill key bindings */
 	// ascii chars & ctrl+chars