From bb57714ac98b6c9a901bf0ca4b260cc34e66abe6 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Sat, 7 Jan 2023 22:51:47 +0100
Subject: [PATCH] Use configDirs to look for fastfetch configs

---
 src/common/init.c |  8 +++++++-
 src/fastfetch.c   | 32 ++++++++++----------------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/common/init.c b/src/common/init.c
index 190c2f286..9afdbae50 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -101,7 +101,7 @@ static void initConfigDirs(FFstate* state)
 
     #endif
 
-    #if !(defined(_WIN32) || defined(__APPLE__) || defined(__ANDROID__))
+    #if !defined(_WIN32) && !defined(__APPLE__)
 
     FFstrbuf xdgConfigDirs;
     ffStrbufInitA(&xdgConfigDirs, 64);
@@ -143,6 +143,12 @@ static void initConfigDirs(FFstate* state)
     ffStrbufAppendS(systemConfig, FASTFETCH_TARGET_DIR_ETC"/");
     FF_ENSURE_ONLY_ONCE_IN_LIST(systemConfig)
 
+    FFstrbuf* systemConfigInstall = ffListAdd(&state->configDirs);
+    ffStrbufInitA(systemConfigInstall, 64);
+    ffStrbufAppendS(systemConfigInstall, FASTFETCH_TARGET_DIR_INSTALL_SYSCONF"/");
+    FF_ENSURE_ONLY_ONCE_IN_LIST(systemConfigInstall)
+
+
     #endif
 
     #undef FF_ENSURE_ONLY_ONCE_IN_LIST
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 8b6c9008d..326e081b0 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1305,27 +1305,19 @@ error:
     }
 }
 
-FF_UNUSED_PARAM static void parseConfigFileSystem(FFinstance* instance, FFdata* data)
+static void parseConfigFiles(FFinstance* instance, FFdata* data)
 {
-    parseConfigFile(instance, data, FASTFETCH_TARGET_DIR_INSTALL_SYSCONF"/fastfetch/config.conf");
-}
-
-static void parseConfigFileUser(FFinstance* instance, FFdata* data)
-{
-    if(!data->loadUserConfig)
-        return;
-
-    FF_LIST_FOR_EACH(FFstrbuf, filename, instance->state.configDirs)
+    for(uint32_t i = instance->state.configDirs.length; i > 0; --i)
     {
-        uint32_t filenameLength = filename->length;
+        if(!data->loadUserConfig)
+            return;
 
-        ffStrbufAppendS(filename, "fastfetch/config.conf");
+        FFstrbuf* dir = ffListGet(&instance->state.configDirs, i - 1);
+        uint32_t dirLength = dir->length;
 
-        bool found = parseConfigFile(instance, data, filename->chars);
-
-        ffStrbufSubstrBefore(filename, filenameLength);
-
-        if(found) break;
+        ffStrbufAppendS(dir, "fastfetch/config.conf");
+        parseConfigFile(instance, data, dir->chars);
+        ffStrbufSubstrBefore(dir, dirLength);
     }
 }
 
@@ -1466,11 +1458,7 @@ int main(int argc, const char** argv)
     ffStrbufInitA(&data.structure, 256);
     data.loadUserConfig = true;
 
-    #ifndef _WIN32
-        parseConfigFileSystem(&instance, &data);
-    #endif
-
-    parseConfigFileUser(&instance, &data);
+    parseConfigFiles(&instance, &data);
     parseArguments(&instance, &data, argc, argv);
 
     //If we don't have a custom structure, use the default one