Merge pull request #6 from choco-technologies/copilot/fix-inline-comments-trimming

Fix inline comment stripping from INI values

Author: JohnAmadis

apps/test_dmini/test_dmini.c

@@ -301,6 +301,38 @@ static void test_comments_whitespace(void)
     TEST_PASS();
 }
 
+/**
+ * @brief Test: Inline comments are stripped from values
+ */
+static void test_inline_comments(void)
+{
+    TEST_START("Strip inline comments from values");
+
+    const char* ini_data =
+        "Port=A  ; some comment\n"
+        "key1=value1 # hash comment\n"
+        "[section1]\n"
+        "key2 = value2  ; trailing comment\n";
+
+    dmini_context_t ctx = dmini_create();
+    TEST_ASSERT(ctx != NULL, "Failed to create context");
+
+    int result = dmini_parse_string(ctx, ini_data);
+    TEST_ASSERT(result == 0, "Failed to parse string");
+
+    const char* val = dmini_get_string(ctx, NULL, "Port", "");
+    TEST_ASSERT(strcmp(val, "A") == 0, "Inline semicolon comment not stripped");
+
+    val = dmini_get_string(ctx, NULL, "key1", "");
+    TEST_ASSERT(strcmp(val, "value1") == 0, "Inline hash comment not stripped");
+
+    val = dmini_get_string(ctx, "section1", "key2", "");
+    TEST_ASSERT(strcmp(val, "value2") == 0, "Inline comment in section not stripped");
+
+    dmini_destroy(ctx);
+    TEST_PASS();
+}
+
 /**
  * @brief Main entry point for test application
  */
@@ -320,6 +352,7 @@ int main(int argc, char** argv)
     test_generate_string();
     test_file_io();
     test_comments_whitespace();
+    test_inline_comments();
 
     // Print summary
     Dmod_Printf("\n=== Test Summary ===\n");

src/dmini.c

@@ -71,6 +71,35 @@ static char* trim_whitespace(char* str)
 
 
 
+/**
+ * @brief Strip inline comment from a value string
+ *
+ * Finds the first ';' or '#' character and null-terminates the string there,
+ * effectively removing the inline comment. Note: quoted strings are not
+ * supported; a ';' or '#' inside a value will also be treated as a comment
+ * marker.
+ *
+ * @param str Value string to modify in place
+ */
+static void strip_inline_comment(char* str)
+{
+    if (!str)
+    {
+        return;
+    }
+
+    char* p = str;
+    while (*p)
+    {
+        if (*p == ';' || *p == '#')
+        {
+            *p = '\0';
+            break;
+        }
+        p++;
+    }
+}
+
 /**
  * @brief Compare section names (handles NULL values)
  */
@@ -489,6 +518,7 @@ int dmini_parse_string(dmini_context_t ctx, const char* data)
         {
             *equals = '\0';
             char* key = trim_whitespace(line);
+            strip_inline_comment(equals + 1);
             char* value = trim_whitespace(equals + 1);
 
             if (*key)
@@ -580,6 +610,7 @@ int dmini_parse_file(dmini_context_t ctx, const char* filename)
         {
             *equals = '\0';
             char* key = trim_whitespace(line);
+            strip_inline_comment(equals + 1);
             char* value = trim_whitespace(equals + 1);
 
             if (*key)