- Freed all allocs. No more memory leaks.

- Created a simple example.

Author: stefanpoeter

CMakeLists.txt

@@ -17,6 +17,10 @@ set(CMAKE_C_FLAGS "--std=gnu99" ${CMAKE_C_FLAGS})
 
 option(WITH-TESTS "Compile the test application." OFF)
 
+include_directories(${PROJECT_SOURCE_DIR}/src)
+
+add_executable(example-01 ${CMAKE_SOURCE_DIR}/examples/example_01.c ${CMAKE_SOURCE_DIR}/src/sap.c ${CMAKE_SOURCE_DIR}/src/sap.h)
+
 IF(WITH-TESTS)
     add_subdirectory(${PROJECT_SOURCE_DIR}/tests)
 endif()

examples/example_01.c

@@ -0,0 +1,42 @@
+
+#include "sap.h"
+
+
+static int default_handler(sap_command_list_t* commands, sap_option_list_t* options) {
+
+  sap_command_t* cc = commands->first;
+  while (cc) {
+    printf("Command %s\n", cc->label);
+    cc = cc->next;
+  }
+
+  unsigned int curIndex = 0;
+  sap_option_t* co = sap_get_option_by_index(options, curIndex);
+  while (co) {
+    if (co->is_flag) {
+      printf("flag %s\n", co->label);
+    } else {
+      printf("option %s with value %s.\n", co->label, co->value);
+    }
+
+    co = sap_get_option_by_index(options, ++curIndex);
+
+  }
+
+}
+
+int main(int argc, char** argv) {
+
+  sap_t parser;
+
+  sap_init(&parser, argc, argv);
+
+  sap_set_default(&parser, default_handler);
+
+  int retVal =  sap_execute(&parser);
+
+  sap_free(&parser);
+
+  return retVal;
+
+}

src/sap.c

@@ -2,6 +2,7 @@
 
 int sap_init(sap_t* parser, int argc, char** argv) {
 
+
     parser->argc = argc;
     parser->argv = argv;
 
@@ -10,6 +11,9 @@ int sap_init(sap_t* parser, int argc, char** argv) {
 
     parser->default_command = NULL;
 
+    parser->arg_commands = calloc(1, sizeof(sap_command_list_t));
+    parser->arg_options = calloc(1, sizeof(sap_option_list_t));
+
     parser->error_string = calloc(1, 100);
 
     return 0;
@@ -25,8 +29,6 @@ int sap_add_command(sap_t* parser, char* command, command_handler handler) {
     /* go through the command list and look for existing
      * commands, return -1 if so. */
 
-
-
     sap_command_t* current_command = parser->commands.first;
 
 
@@ -146,13 +148,14 @@ static sap_option_t* sap_parse_option(char* arg) {
      * and store this string as the options label */
 
     int len = match[1].rm_eo - match[1].rm_so;
-    char* label = calloc(1, len);
+    char* label = calloc(1, len + 1);
     memcpy(label, arg + match[1].rm_so, len);
 
     sap_option_t* option = calloc(1, sizeof(sap_option_t));
     option->label = label;
     option->value = NULL;
     option->is_flag = 1;
+    option->next = NULL;
 
     /* if there is no value assigned to the option then we mark
      * this option as flag. Meaning this option is enabled.
@@ -164,7 +167,7 @@ static sap_option_t* sap_parse_option(char* arg) {
     }
 
     len = match[3].rm_eo - match[3].rm_so;
-    char* value = calloc(1, len);
+    char* value = calloc(1, len + 1);
     memcpy(value, arg + match[3].rm_so, len);
 
     option->value = value;
@@ -205,34 +208,32 @@ static int sap_is_command(sap_t* parser, char* arg) {
 
 int sap_execute(sap_t* parser) {
 
-    sap_command_list_t* commands = calloc(1, sizeof(sap_command_list_t));
-    sap_option_list_t* options = calloc(1, sizeof(sap_option_list_t));
-
     sap_command_t* command = parser->default_command;
 
     for (unsigned int i = 1; i < parser->argc; i += 1) {
 
       char* command_str = parser->argv[i];
 
-      if (sap_is_command(parser, command_str)) {
-
-        sap_command_t* new_command = calloc(1, sizeof(sap_command_t));
-        new_command->label = calloc(1, strlen(command_str) + 1);
-        strcpy(new_command->label, command_str);
+      if (!sap_is_command(parser, command_str)) {
+        continue;
+      }
 
-        if (!commands->first) {
+      sap_command_t* new_command = calloc(1, sizeof(sap_command_t));
+      new_command->label = calloc(1, strlen(command_str) + 1);
+      strcpy(new_command->label, command_str);
 
-          commands->first = new_command; 
-          commands->last = new_command;
+      if (!parser->arg_commands->first) {
 
-        } else {
-        
-          commands->last->next = new_command;
-          commands->last = new_command;
+        parser->arg_commands->first = new_command; 
+        parser->arg_commands->last = new_command;
 
-        }
+      } else {
+      
+        parser->arg_commands->last->next = new_command;
+        parser->arg_commands->last = new_command;
 
       }
+
     }
 
     for (unsigned int i = 1; i < parser->argc; i += 1) {
@@ -241,33 +242,36 @@ int sap_execute(sap_t* parser) {
 
         /* check if current_string is option */
 
-        if (sap_is_option(parser, current_string)) {
+        if (!sap_is_option(parser, current_string)) {
+          continue;
+        }
 
-            sap_option_t* option = sap_parse_option(current_string);    
+        sap_option_t* option = sap_parse_option(current_string);    
 
-            if (!options->first) {
+        if (!option) {
+          continue;
+        }
 
-              options->first = option;
-              options->last = option;
+        if (!parser->arg_options->first) {
 
-              option->next = NULL;
+          parser->arg_options->first = option;
+          parser->arg_options->last = option;
 
-            } else {
-            
-              options->last->next = option;
-              options->last = option;
+          option->next = NULL;
 
-              option->next = NULL;
+        } else {
+        
+          parser->arg_options->last->next = option;
+          parser->arg_options->last = option;
 
-            }
+          option->next = NULL;
 
-        }
-           
+        }           
     }
 
     /* get command from the parsers commands list */
 
-    sap_command_t* first_command = commands->first;
+    sap_command_t* first_command = parser->arg_commands->first;
     sap_command_t* current_command = parser->commands.first;
 
     while (current_command) {
@@ -286,27 +290,30 @@ int sap_execute(sap_t* parser) {
 
     }
 
+    int retVal = -1;
 
     if (current_command) {
 
-      commands->first = commands->first->next;
-
-      int retVal = current_command->handler(commands, options);
+      sap_command_t* first = parser->arg_commands->first;
+      parser->arg_commands->first = parser->arg_commands->first->next;
 
-      free(commands->first);
+      retVal = current_command->handler(parser->arg_commands, parser->arg_options);
 
-      return retVal;
+      free(first->label);
+      free(first);
 
     } else if (parser->default_command) {
 
-      return parser->default_command->handler(commands, options);
+      retVal = parser->default_command->handler(parser->arg_commands, parser->arg_options);
 
     } else {
 
-      return -1;
+      retVal = -1;
 
     }
 
+    return retVal;
+
 }
 
 int sap_execute_ex(sap_t* parser, sap_command_list_t* commands, sap_option_list_t* options) {
@@ -332,27 +339,30 @@ int sap_execute_ex(sap_t* parser, sap_command_list_t* commands, sap_option_list_
 
     }
 
+    int retVal = -1;
 
     if (current_command && first_command) {
 
+      sap_command_t* first = commands->first;
       commands->first = commands->first->next;
 
-      int retVal = current_command->handler(commands, options);
-
-      free(commands->first);
+      retVal = current_command->handler(commands, options);
 
-      return retVal;
+      free(first->label);
+      free(first);
 
     } else if (parser->default_command) {
 
-      return parser->default_command->handler(commands, options);
+      retVal = parser->default_command->handler(commands, options);
 
     } else {
 
-      return -1;
+      retVal = 1;
 
     }
 
+    return retVal;
+
 }
 
 void sap_free(sap_t* parser) {
@@ -377,6 +387,30 @@ void sap_free(sap_t* parser) {
       free(tmp);
     }
 
+    sap_command_t* cc = parser->arg_commands->first;
+
+    while (cc) {
+      sap_command_t* nc = cc->next;
+      free(cc->label);
+      free(cc);
+      cc = nc;
+    }
+
+    sap_option_t* co = parser->arg_options->first;
+    while (co) {
+      sap_option_t* no = co->next;
+      free(co->label);
+      if (!co->is_flag) {
+        free(co->value);
+      }
+      free(co);
+      co = no;
+    }
+
+    free(parser->arg_commands);
+    free(parser->arg_options);
+
+
 }
 
 sap_option_t* sap_get_option_by_index(sap_option_list_t* options, unsigned int index) {
@@ -389,7 +423,6 @@ sap_option_t* sap_get_option_by_index(sap_option_list_t* options, unsigned int i
 
     sap_option_t* curOption = options->first;
 
-
     while (curOption) {
 
       if (counter == index) {
@@ -413,15 +446,11 @@ sap_option_t* sap_get_option_by_key(sap_option_list_t* options, char* key) {
 
     sap_option_t* curOption = options->first;
 
-
-    while (curOption) {
-    
+    while (curOption) { 
         if (strcmp(curOption->label, key) == 0) {
             return curOption;
         }
-
         curOption =curOption->next;
-
     }
 
     return NULL;

src/sap.h

@@ -64,6 +64,9 @@ struct sap_st {
     sap_command_list_t commands;
     sap_command_t* default_command;
 
+    sap_command_list_t* arg_commands;
+    sap_option_list_t* arg_options;
+
     int argc;
     char** argv;
 

tests/sap.test.cpp

@@ -4,13 +4,16 @@
 int call_count = 0;
 int return_value = 0;
 
-sap_option_list_t* catched_options;
-sap_command_list_t* catched_commands;
+sap_option_list_t* catched_options = NULL;
+sap_command_list_t* catched_commands = NULL;
 
 int default_handler(sap_command_list_t* commands, sap_option_list_t* options) {
 
     call_count += 1;
 
+    catched_options = options;
+    catched_commands = commands;
+
     return return_value;
 
 }
@@ -159,6 +162,7 @@ TEST(SAP, ExecuteMatchedHandlerWithOptions) {
     sap_option_t* third = sap_get_option_by_index(catched_options, 2);
 
     ASSERT_TRUE(first != NULL);
+    ASSERT_TRUE(first->label != NULL);
     ASSERT_STREQ(first->label, "key");
     ASSERT_STREQ(first->value, "value");
     ASSERT_EQ(0, first->is_flag);