:: commit 0357fdb4d85df09aa1f36782788ec75b344aa1b4

mintsuki <mintsuki@protonmail.com> — 2024-08-01 14:54

parents: d554392850

lib/config: Use / to start entry names instead of :

diff --git a/common/lib/config.c b/common/lib/config.c
index 27a4fbc7..15ff5e51 100644
--- a/common/lib/config.c
+++ b/common/lib/config.c
@@ -62,9 +62,9 @@ static int is_child(char *buf, size_t limit,
     if (strlen(buf) < current_depth + 1)
         return NOT_CHILD;
     for (size_t j = 0; j < current_depth; j++)
-        if (buf[j] != ':')
+        if (buf[j] != '/')
             return NOT_CHILD;
-    if (buf[current_depth] == ':')
+    if (buf[current_depth] == '/')
         return INDIRECT_CHILD;
     return DIRECT_CHILD;
 }
@@ -347,7 +347,7 @@ overflow:
     size_t s;
     char *c = config_get_entry(&s, 0);
     if (c != NULL) {
-        while (*c != ':') {
+        while (*c != '/') {
             c--;
         }
         if (c > config_addr) {
@@ -365,7 +365,7 @@ static bool config_get_entry_name(char *ret, size_t index, size_t limit) {
     char *p = config_addr;
 
     for (size_t i = 0; i <= index; i++) {
-        while (*p != ':') {
+        while (*p != '/') {
             if (!*p)
                 return false;
             p++;
@@ -396,7 +396,7 @@ static char *config_get_entry(size_t *size, size_t index) {
     char *p = config_addr;
 
     for (size_t i = 0; i <= index; i++) {
-        while (*p != ':') {
+        while (*p != '/') {
             if (!*p)
                 return NULL;
             p++;
@@ -413,7 +413,7 @@ static char *config_get_entry(size_t *size, size_t index) {
     ret = p;
 
 cont:
-    while (*p != ':' && *p)
+    while (*p != '/' && *p)
         p++;
 
     if (*p && *(p - 1) != '\n') {
diff --git a/test/limine.cfg b/test/limine.cfg
index 4a13bdfc..27c09385 100644
--- a/test/limine.cfg
+++ b/test/limine.cfg
@@ -10,7 +10,7 @@ verbose: yes
 term_wallpaper: ${WALLPAPER_PATH}
 term_backdrop: 008080
 
-:Limine Test
+/Limine Test
     comment: Test of the Limine boot protocol. ${ARCH}
 
     protocol: limine
@@ -22,7 +22,7 @@ term_backdrop: 008080
 
     module_path: boot:///boot/bg.jpg
 
-:Multiboot2 Test
+/Multiboot2 Test
     comment: Test of the multiboot2 boot protocol.
 
     protocol: multiboot2
@@ -32,22 +32,22 @@ term_backdrop: 008080
     module_path: boot:///boot/bg.jpg
     module_string: This is the first module.
 
-:EFI Chainloading
+/EFI Chainloading
     comment: Test EFI image chainloading.
 
     protocol: efi_chainload
     image_path: boot:///EFI/BOOT/BOOTX64.EFI
 
-:BIOS Chainloading
+/BIOS Chainloading
     comment: Test BIOS chainloading.
 
     protocol: bios_chainload
     drive: 1
 
-:+Legacy
+/+Legacy
     comment: Directory containing legacy entries.
 
-    ::Multiboot1 Test
+    //Multiboot1 Test
         comment: Test of the multiboot1 boot protocol.
 
         protocol: multiboot1
tab: 248 wrap: offon