Add command completion

completion.c

@@ -20,8 +20,28 @@ char **asmsh_completion(const char *buf, const char *text, int start, int end)
 {
 	if(end == 0)
 	{
-		// TODO catenate all !
-		return asmsh_compl_instr(text);
+		char **instr, **cmds, **ptr;
+		int ilen, clen;
+		cmds = asmsh_compl_cmds(text);
+		instr = asmsh_compl_instr(text);
+
+		ilen=clen=0;
+		for(ptr=cmds; *ptr; ptr++) { clen++; }
+		for(ptr=instr; *ptr; ptr++) { ilen++; }
+
+		ptr = realloc(cmds, sizeof(*cmds) * (ilen+clen+1));
+		if(!ptr)
+		{
+			perror("Unable to realloc all completions");
+			free(cmds);
+			free(instr);
+			return NULL;
+		}
+		cmds=ptr;
+		ptr=&cmds[clen];
+		memcpy(&cmds[clen], instr, ilen*sizeof(*instr));
+		cmds[ilen+clen]=NULL;
+		return cmds;
 	}
 	if(*buf != '.')
 	{
@@ -31,8 +51,7 @@ char **asmsh_completion(const char *buf, const char *text, int start, int end)
 		}
 		return asmsh_compl_arg(buf, text, start);
 	}
-	// command completion handling
-	return NULL;
+	return asmsh_compl_cmds(text);
 }
 
 
@@ -45,12 +64,12 @@ char **asmsh_compl_instr(const char *start)
 	char **ret;
 	int start_len, cmp;
 	ret = malloc(icount * 2 * sizeof(char*));
-	bzero(ret, icount * sizeof(char*));
 	if(!ret)
 	{
 		perror("Unable to allocate completion result");
 		return NULL;
 	}
+	bzero(ret, icount * 2 * sizeof(char*));
 	if(!start || !*start)
 	{
 		i=0;
@@ -131,6 +150,51 @@ err_strdup:
 }
 
 
+char **asmsh_compl_cmds(const char *start)
+{
+	const size_t ccount = sizeof(asmsh_CMDS)/sizeof(*asmsh_CMDS);
+	int i, slen, cmp;
+	char **ret;
+	const asmsh_cmd_t *ccmd;
+
+	ret = malloc(sizeof(*ret) * (ccount+1));
+	if(!ret)
+	{
+		perror("Unable to allocate cmd completion result");
+		return NULL;
+	}
+	bzero(ret, sizeof(*ret) * (ccount+1));
+
+	slen = (!start || !*start)?0:strlen(start);
+	for(i=0; i<ccount; i++)
+	{
+		ccmd = &asmsh_CMDS[i];
+		if(!ccmd->str) { break; }
+		if(!slen || !(cmp = strncmp(start, ccmd->str, slen)))
+		{
+			if(!(ret[i] = strdup(ccmd->str)))
+			{
+				perror("Unable to strdup cmd completion");
+				goto errdup;
+			}
+		}
+		if(slen && cmp < 0)
+		{
+			break;
+		}
+	}
+	return ret;
+
+errdup:
+	i--;
+	for(; i>=0; i--)
+	{
+		free(ret[i]);
+	}
+	free(ret);
+	return NULL;
+}
+
 
 /// match against macro
 static int _completion_macro_match(const char *macro, const char *buf, int mlen);

completion.h

@@ -26,6 +26,8 @@
 #include <readline/history.h>
 #endif
 
+#include "shell_cmds.h"
+
 #define ASHCOMP_NOARG	0x00
 #define ASHCOMP_REG8	0x01
 #define ASHCOMP_REG16	0x02
@@ -66,6 +68,9 @@ char **asmsh_rl_completion(const char *text, int start, int end);
 /** Return all possible instructions given a start */
 char **asmsh_compl_instr(const char *start);
 
+/** Return possible commands given a start */
+char **asmsh_compl_cmds(const char *start);
+
 char **asmsh_compl_arg(const char *buf, const char *text, int start);
 
 static const char * const M_conds[] = {"o","no","b","c","nae","ae","nb","nc","e","z","ne","nz","be","na","a","nbe","s","ns","p","pe","np","po","l","nge","ge","nl","le","ng","g","nle", NULL};