X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/4bc81323e51ac138e733c14eeb6f283ae706e904..55027f3b53e5250768632efdd470c9e938e883e7:/avr/cli.c

diff --git a/avr/cli.c b/avr/cli.c
index 4b77499..be5df40 100644
--- a/avr/cli.c
+++ b/avr/cli.c
@@ -181,11 +181,11 @@ static int cli_run_command(const char *cmd, int flag)
 	if (!cmd || !*cmd)
 		return -1;	/* empty command */
 
-
-	cmdbuf = xmalloc(strlen(cmd) + 1);
+	cmdbuf = strdup(cmd);
 	finaltoken = xmalloc(CONFIG_SYS_CBSIZE);
+	if (!finaltoken)
+		return -1;	/* not enough memory */
 
-	strcpy(cmdbuf, cmd);
 	str = cmdbuf;
 
 	/* Process separators and check for invalid
@@ -232,7 +232,7 @@ static int cli_run_command(const char *cmd, int flag)
 			continue;
 		}
 
-		if (cmd_process(flag, argc, argv, &repeatable))
+		if (cmd_process(flag, argc, argv, &repeatable) != CMD_RET_SUCCESS)
 			rc = -1;
 
 		/* Did the user stop this? */
@@ -309,11 +309,8 @@ void cli_loop(void)
 
 		flag = 0;	/* assume no special flags for now */
 		if (len > 0) {
-			lastcommand = (char *) xrealloc(lastcommand, len+1);
-			if (lastcommand != NULL) {
-				strncpy(lastcommand, console_buffer, len+1);
-				lastcommand[len] = '\0';
-			}
+			free (lastcommand);
+			lastcommand = strdup(console_buffer);
 		} else if (len == 0)
 			flag |= CMD_FLAG_REPEAT;
 
@@ -331,7 +328,7 @@ void cli_loop(void)
 }
 
 
-int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	int i;
 	(void) cmdtp;
@@ -345,12 +342,12 @@ int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		arg = getenv(argv[i]);
 		if (arg == NULL) {
 			printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]);
-			return 1;
+			return CMD_RET_FAILURE;
 		}
 
 		if (run_command(arg, flag) != 0)
-			return 1;
+			return CMD_RET_FAILURE;
 	}
-	return 0;
+	return CMD_RET_SUCCESS;
 }