Some work on matching xIni

include/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring

@@ -3,4 +3,9 @@
 
 #include <string.h>
 
-#endif
+namespace std
+{
+    char* strstr(char* haystack, const char* needle);
+}
+
+#endif

include/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h

@@ -16,10 +16,11 @@ char* strcat(char* dest, const char* source);
 int strcmp(const char* a, const char* b);
 int stricmp(const char* a, const char* b);
 int strcmpi(const char* a, const char* b);
+char* strstr(const char* haystack, const char* needle);
 int atoi(const char* s);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif

src/SB/Core/x/xIni.cpp

@@ -1,7 +1,181 @@
 #include "xIni.h"
+#include "xString.h"
+#include <rwplcore.h>
 
 #include <types.h>
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
+
+char* TrimWhitespace(char* string)
+{
+    // Skip through any leading whitespace
+    for (; *string == ' ' || *string == '\t'; string++)
+    {
+    }
+    // Return early if there's no other characters to go through
+    if (*string == '\0')
+    {
+        return string;
+    }
+
+    // Find first non-whitespace character at the end of the string
+    char* substring = &string[strlen(string) - 1];
+    for (; *substring == ' ' || *substring == '\t'; substring--)
+    {
+    }
+
+    // Set the null-terminator accordingly
+    substring[1] = '\0';
+
+    return string;
+}
+
+// Nonmatching: not finished yet
+xIniFile* xIniParse(char* a0, int32 sizemaybe)
+{
+    int32 carriage_returns = 1;
+    int32 iVar11 = 0;
+    int32 iVar12 = -1;
+    int32 newlines = 0;
+    for (int32 i = 0; i < sizemaybe; i++)
+    {
+        switch (a0[i])
+        {
+        case '\r':
+            carriage_returns++;
+            iVar11 = i;
+            break;
+        case '\n':
+            newlines++;
+            iVar11 = i;
+            break;
+        case '[':
+            iVar12++;
+            break;
+        }
+    }
+
+    if (newlines > carriage_returns)
+    {
+        carriage_returns = newlines;
+    }
+
+    xIniFile* ini = (xIniFile*)RwMalloc(sizeof(xIniFile) + (carriage_returns * sizeof(xIniValue)) +
+                                        (iVar12 * sizeof(xIniSection)) + (sizemaybe - iVar11));
+    ini->mem = NULL;
+    ini->NumValues = 0;
+    ini->NumSections = 0;
+    ini->Values = (xIniValue*)(ini + 1);
+    ini->Sections = (xIniSection*)(&ini->Values[carriage_returns]);
+    char* dest = (char*)(&ini->Sections[iVar12]);
+    uint32 n = sizemaybe - (iVar11 + 1);
+    strncpy(dest, a0 + iVar11 + 1, n);
+    dest[n] = 0;
+    if (iVar11 >= 0)
+    {
+        a0[iVar11] = '\0';
+    }
+    else
+    {
+        *a0 = '\0';
+    }
+
+    char* apcStack_28[1];
+    char* pcVar4; // = xStrTok(a0, "\n\r", apcStack_28);
+    if (xStrTok(a0, "\n\r", apcStack_28) == NULL)
+    {
+        pcVar4 = xStrTok(dest, "\n\r", apcStack_28);
+        dest = NULL;
+    }
+
+    while (pcVar4 != NULL)
+    {
+        char* trimmed = TrimWhitespace(pcVar4);
+        if (*trimmed != '#' && *trimmed != '\0')
+        {
+            if (*trimmed == '[')
+            {
+                char* idek = std::strstr(trimmed, "]");
+                if (idek != NULL)
+                {
+                    *idek = '\0';
+                    char* nowhitespace = TrimWhitespace(&trimmed[1]);
+                    if (*nowhitespace != '\0')
+                    {
+                        ini->Sections[ini->NumSections].sec = nowhitespace;
+                        ini->Sections[ini->NumSections].first = ini->NumValues;
+                        ini->Sections[ini->NumSections].count = 0;
+                        ini->NumSections++;
+                    }
+                }
+            }
+            else
+            {
+                char* pcVar5 = std::strstr(trimmed, "=");
+                if (pcVar5 != NULL)
+                {
+                    *pcVar5 = '\0';
+                    char* piVar6 = TrimWhitespace(pcVar4); // trimmed?
+                    if (*piVar6 != '\0')
+                    {
+                        char* meme = pcVar5 + 1;
+                        char* meme2 = std::strstr(meme, "#");
+                        if (meme2 != NULL)
+                        {
+                            *meme2 = '\0';
+                        }
+                        char* piVar7 = TrimWhitespace(meme);
+                        ini->Values[ini->NumValues].tok = piVar6;
+                        ini->Values[ini->NumValues].val = piVar7;
+                        ini->NumValues++;
+                        int32 sections = ini->NumSections;
+                        if (sections != 0)
+                        {
+                            ini->Sections[sections - 1].count++;
+                        }
+                    }
+                }
+            }
+        }
+
+        // pcVar4 = xStrTok(NULL, "\n\r", apcStack_28);
+        if (xStrTok(NULL, "\n\r", apcStack_28) == NULL && dest != NULL)
+        {
+            xStrTok(dest, "\n\r", apcStack_28);
+            dest = NULL;
+        }
+    }
+
+    return ini;
+}
+
+// FIXME(tgsm): This probably shouldn't be here.
+namespace std
+{
+    char* strstr(char* haystack, const char* needle)
+    {
+        return ::strstr(haystack, needle);
+    }
+} // namespace std
+
+void xIniDestroy(xIniFile* ini)
+{
+    RwFree(ini->mem);
+    RwFree(ini);
+}
+
+int32 xIniGetIndex(xIniFile* ini, int8* tok)
+{
+    for (int32 i = 0; i < ini->NumValues; i++)
+    {
+        if (xStricmp(ini->Values[i].tok, tok) == 0)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
 
 int32 xIniGetInt(xIniFile* ini, int8* tok, int32 def)
 {

src/SB/Core/x/xIni.h

@@ -30,4 +30,4 @@ struct xIniFile
 int32 xIniGetIndex(xIniFile* ini, int8* tok);
 int8* xIniGetString(xIniFile* ini, int8* tok, int8* def);
 
-#endif
+#endif