Added a test for unknown control sequences, update a couple of minor bugs

Author: AndreRenaud

embedded_cli.c

@@ -146,10 +146,13 @@ const char *embedded_cli_get_history(struct embedded_cli *cli,
         if (len == 0)
             return NULL;
         pos += len + 1;
-        if (pos == sizeof(cli->history))
+        if (pos >= sizeof(cli->history))
             return NULL;
     }
 
+    if (cli->history[pos] == '\0')
+        return NULL;
+
     return &cli->history[pos];
 #else
     (void)cli;
@@ -168,7 +171,7 @@ static void embedded_cli_extend_history(struct embedded_cli *cli)
         if (strcmp(cli->buffer, cli->history) == 0)
             return;
         memmove(&cli->history[len + 1], &cli->history[0],
-                sizeof(cli->history) - len + 1);
+                sizeof(cli->history) - (len + 1));
         memcpy(cli->history, cli->buffer, len + 1);
         // Make sure it's always nul terminated
         cli->history[sizeof(cli->history) - 1] = '\0';

embedded_cli.h

@@ -133,7 +133,7 @@ const char *embedded_cli_get_line(const struct embedded_cli *cli);
 
 /**
  * Parses the internal buffer and returns it as an argc/argc combo
- * @return number of values in argv (maximum of EMBEDDED_CLI_MAX_ARGC)
+ * @return number of values in argv (maximum of EMBEDDED_CLI_MAX_ARGC - 1)
  */
 int embedded_cli_argc(struct embedded_cli *cli, char ***argv);
 

tests/embedded_cli_test.c

@@ -18,6 +18,7 @@
 #define CTRL_L "\x0c"
 #define CTRL_R "\x12"
 #define CTRL_U "\x15"
+#define CTRL_X "\x18"
 
 static void cli_equals(const struct embedded_cli *cli, const char *line)
 {
@@ -214,6 +215,8 @@ static void test_multiple(void)
         {"abc" LEFT LEFT CTRL_L "\n", "abc"},
         {"abc" CTRL_U "\n", ""},
         {"abc" LEFT LEFT CTRL_U "\n", "bc"},
+        // The check below ensures we ignore unknown control sequences
+        {CTRL_X " " CTRL_X " " CTRL_X "\n", "  "},
         {NULL, NULL},
     };