Merge branch 'develop'

Author: MaJerle

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Develop
 
+## v1.1.0
+
+- Add support for `listcmd` to print all registered commands
+- Optimize code and remove unnecessary brackets
+
 ## v1.0.0
 
 - First stable release

dev/VisualStudio/lwshell_opts.h

@@ -29,7 +29,7 @@
  * This file is part of Lightweight shell library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.0
+ * Version:         v1.1.0
  */
 #ifndef LWSHELL_HDR_OPTS_H
 #define LWSHELL_HDR_OPTS_H
@@ -38,6 +38,7 @@
 
 #include "windows.h"
 
-#define LWSHELL_CFG_USE_OUTPUT          1
+#define LWSHELL_CFG_USE_OUTPUT              1
+#define LWSHELL_CFG_USE_ENABLE_LIST_CMD     1
 
 #endif /* LWSHELL_HDR_OPTS_H */

lwshell/src/include/lwshell/lwshell.h

@@ -29,7 +29,7 @@
  * This file is part of LwSHELL - Lightweight shell library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.0
+ * Version:         v1.1.0
  */
 #ifndef LWSHELL_HDR_H
 #define LWSHELL_HDR_H

lwshell/src/include/lwshell/lwshell_opt.h

@@ -1,4 +1,4 @@
-/**
+/**
  * \file            lwshell_opt.h
  * \brief           LwSHELL options
  */
@@ -29,7 +29,7 @@
  * This file is part of LwSHELL - Lightweight shell library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.0
+ * Version:         v1.1.0
  */
 #ifndef LWSHELL_HDR_OPT_H
 #define LWSHELL_HDR_OPT_H
@@ -97,6 +97,15 @@ extern "C" {
 #define LWSHELL_CFG_USE_OUTPUT                  1
 #endif
 
+/**
+ * \brief           Enables `1` or disables `0` generic ˙listcmd` command to list of registered commands
+ *
+ * \ref LWSHELL_CFG_USE_OUTPUT must be enabled to use this feature
+ */
+#ifndef LWSHELL_CFG_USE_ENABLE_LIST_CMD
+#define LWSHELL_CFG_USE_ENABLE_LIST_CMD         0
+#endif
+
 /**
  * \}
  */

lwshell/src/include/lwshell/lwshell_opts_template.h

@@ -29,7 +29,7 @@
  * This file is part of LwSHELL - Lightweight shell library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.0
+ * Version:         v1.1.0
  */
 #ifndef LWSHELL_HDR_OPTS_H
 #define LWSHELL_HDR_OPTS_H

lwshell/src/lwshell/lwshell.c

@@ -29,11 +29,16 @@
  * This file is part of LwSHELL - Lightweight shell library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.0
+ * Version:         v1.1.0
  */
 #include <string.h>
 #include "lwshell/lwshell.h"
 
+/* Check enabled features */
+#if LWSHELL_CFG_USE_ENABLE_LIST_CMD && !LWSHELL_CFG_USE_OUTPUT
+#error "To use list command feature, LWSHELL_CFG_USE_OUTPUT must be enabled"
+#endif
+
 /* Default characters */
 #define LWSHELL_ASCII_NULL                      0x00/*!< Null character */
 #define LWSHELL_ASCII_BACKSPACE                 0x08/*!< Backspace */
@@ -87,7 +92,6 @@ static lwshell_t shell;
 static void
 prv_parse_input(lwshell_t* lw) {
     size_t s_len;
-    char ch, prev_ch;
     char* str;
 
     lw = LWSHELL_GET_LW(lw);
@@ -100,14 +104,11 @@ prv_parse_input(lwshell_t* lw) {
 
     /* Must be more than `1` character since we have to include end of line */
     if (lw->buff_ptr > 0) {
-        uint8_t in_quote = 0;
-
         /* Set default values */
         lw->argc = 0;
         lw->argv[0] = lw->buff;
 
         /* Process complete input */
-        prev_ch = '\0';
         str = lw->buff;
 
         /* Process complete string */
@@ -140,7 +141,7 @@ prv_parse_input(lwshell_t* lw) {
                 }
             } else {
                 lw->argv[lw->argc++] = str;     /* Set start of argument directly on character */
-                while ((*str != ' ' && *str != '\0')) {
+                while (*str != ' ' && *str != '\0') {
                     if (*str == '"') {          /* Quote should not be here... */
                         *str = '\0';            /* ...add NULL termination to end token */
                     }
@@ -159,10 +160,12 @@ prv_parse_input(lwshell_t* lw) {
         /* Check for command */
         if (lw->argc > 0 && cmds_cnt > 0) {
             lwshell_cmd_t* c = NULL;
+            size_t arg_len = strlen(lw->argv[0]);
+
             /* Process all commands */
             for (size_t i = 0; i < cmds_cnt; ++i) {
-                if (strlen(lw->argv[0]) == strlen(cmds[i].name)
-                    && strncmp(cmds[i].name, lw->argv[0], strlen(lw->argv[0])) == 0) {
+                if (arg_len == strlen(cmds[i].name)
+                    && strncmp(cmds[i].name, lw->argv[0], arg_len) == 0) {
                     c = &cmds[i];
                     break;
                 }
@@ -178,6 +181,18 @@ prv_parse_input(lwshell_t* lw) {
                 } else {
                     c->fn(lw->argc, lw->argv);
                 }
+#if LWSHELL_CFG_USE_ENABLE_LIST_CMD
+            } else if (strncmp(lw->argv[0], "listcmd", 7) == 0) {
+                LW_OUTPUT(lw, "List of registered commands\r\n");
+                for (size_t i = 0; i < cmds_cnt; ++i) {
+                    LW_OUTPUT(lw, cmds[i].name);
+                    LW_OUTPUT(lw, "\t\t\t");
+                    LW_OUTPUT(lw, cmds[i].desc);
+                    LW_OUTPUT(lw, "\r\n");
+                }
+#endif /* LWSHELL_CFG_USE_ENABLE_LIST_CMD */
+            } else {
+                LW_OUTPUT(lw, "Unknown command\r\n");
             }
         }
     }