X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/78035a8db08025f8c0959b322d509d05e5559cbd..d530fed0a0505db5d2c9bfe283409cedb9598c88:/avr/cli.c

diff --git a/avr/cli.c b/avr/cli.c
index f11e932..7c45251 100644
--- a/avr/cli.c
+++ b/avr/cli.c
@@ -12,15 +12,10 @@
  */
 
 #include "cli.h"
-#include "common.h"
-
-#include <string.h>
+#include "command.h"
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #include "config.h"
-#include "command.h"
 #include "debug.h"
 #include "env.h"
 #include "cli_readline.h"
@@ -242,7 +237,7 @@ char *process_macros(char *input)
  * @returns
  *
  */
-static int cli_run_command(const char *cmd, int flag)
+static int cli_run_command(const char *cmd, uint_fast8_t flag)
 {
 	char cmdbuf[strlen(cmd) + 1];			/* working copy of cmd		*/
 	char *token;			/* start of token in cmdbuf	*/
@@ -314,6 +309,10 @@ static int cli_run_command(const char *cmd, int flag)
 		} else {
 			str = sep;			/* no more commands for next pass */
 		}
+		while (isblank(*token))
+			++token;
+		if (*token == '\0')		/* empty (comment only) */
+			continue;
 		debug_parser("token: \"%s\"\n", token);
 
 		/* find macros in this token and replace them */
@@ -369,7 +368,7 @@ static int cli_run_command_list(const char *cmd)
  * @param flag	Execution flags (CMD_FLAG_...)
  * @return 0 on success, or != 0 on error.
  */
-int run_command(const char *cmd, int flag)
+int run_command(const char *cmd, uint_fast8_t flag)
 {
 	/*
 	 * cli_run_command can return 0 or 1 for success, so clean up
@@ -388,7 +387,7 @@ int run_command(const char *cmd, int flag)
  * @param flag	Execution flags (CMD_FLAG_...)
  * @return 0 (not repeatable) or 1 (repeatable) on success, -1 on error.
  */
-static int run_command_repeatable(const char *cmd, int flag)
+static int run_command_repeatable(const char *cmd, uint_fast8_t flag)
 {
 	return cli_run_command(cmd, flag);
 }
@@ -407,7 +406,7 @@ void cli_loop(void)
 {
 	char *lastcommand = NULL;
 	int len;
-	int flag;
+	uint_fast8_t flag;
 	int rc = 1;
 
 	for (;;) {