From 693cc1e7307dae275b4bb7f10d8ae52c7ff33c8a Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Thu, 13 Oct 2022 22:02:58 +0200
Subject: [PATCH] Fix build errors

---
 src/common/io.c                               |  1 -
 src/common/io.h                               |  2 +-
 src/common/settings.c                         |  3 +--
 src/detection/displayserver/linux/wmde.c      |  1 -
 src/detection/packages/packages_apple.c       | 19 +++++++++++--------
 src/detection/packages/packages_linux.c       |  7 ++-----
 src/detection/packages/packages_windows.c     |  6 +++---
 .../terminalfont/terminalfont_android.c       |  2 --
 src/fastfetch.c                               |  1 -
 9 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/common/io.c b/src/common/io.c
index 0f59205fe..be2cb6afb 100644
--- a/src/common/io.c
+++ b/src/common/io.c
@@ -1,7 +1,6 @@
 #include "fastfetch.h"
 #include "common/io.h"
 
-#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/src/common/io.h b/src/common/io.h
index a6ecbc5ac..2c4db8716 100644
--- a/src/common/io.h
+++ b/src/common/io.h
@@ -5,7 +5,7 @@
 
 #include "fastfetch.h"
 
-#include <sys/types.h> //mode_t
+#include <sys/stat.h> //mode_t
 
 bool ffWriteFDBuffer(int fd, const FFstrbuf* content);
 bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data);
diff --git a/src/common/settings.c b/src/common/settings.c
index 6f5a5cfcb..1222aa490 100644
--- a/src/common/settings.c
+++ b/src/common/settings.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
 #include "common/settings.h"
 #include "common/library.h"
-#include "common/io.h"
 #include "common/thread.h"
+#include "common/io.h"
 
 #include <string.h>
 
@@ -280,7 +280,6 @@ FFvariant ffSettingsGetXFConf(const FFinstance* instance, const char* channelNam
 
 #ifdef FF_HAVE_SQLITE3
 #include <sqlite3.h>
-#include <sys/stat.h>
 
 typedef struct SQLiteData
 {
diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c
index da942bbd7..0cb7c7493 100644
--- a/src/detection/displayserver/linux/wmde.c
+++ b/src/detection/displayserver/linux/wmde.c
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <sys/stat.h>
 
 static const char* parseEnv()
 {
diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c
index ecabe0771..70b736c12 100644
--- a/src/detection/packages/packages_apple.c
+++ b/src/detection/packages/packages_apple.c
@@ -1,4 +1,7 @@
 #include "packages.h"
+#include "common/parsing.h"
+
+#include <dirent.h>
 
 static uint32_t getNumElements(const char* dirname, unsigned char type)
 {
@@ -28,17 +31,17 @@ static uint32_t countBrewPackages(const char* dirname)
     ffStrbufInitS(&baseDir, dirname);
 
     uint32_t result = 0;
-    uint32_t baseDirLength = baseDir->length;
+    uint32_t baseDirLength = baseDir.length;
 
-    ffStrbufAppendS(baseDir, "/Caskroom");
-    result += getNumElements(baseDir->chars, DT_DIR);
-    ffStrbufSubstrBefore(baseDir, baseDirLength);
+    ffStrbufAppendS(&baseDir, "/Caskroom");
+    result += getNumElements(baseDir.chars, DT_DIR);
+    ffStrbufSubstrBefore(&baseDir, baseDirLength);
 
-    ffStrbufAppendS(baseDir, "/Cellar");
-    result += getNumElements(baseDir->chars, DT_DIR);
-    ffStrbufSubstrBefore(baseDir, baseDirLength);
+    ffStrbufAppendS(&baseDir, "/Cellar");
+    result += getNumElements(baseDir.chars, DT_DIR);
+    ffStrbufSubstrBefore(&baseDir, baseDirLength);
 
-    ffStrbufDestroy(baseDir);
+    ffStrbufDestroy(&baseDir);
     return result;
 }
 
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
index 4a2f6d88e..e2cab221d 100644
--- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c
@@ -1,15 +1,12 @@
 #include "packages.h"
 #include "common/io.h"
+#include "common/parsing.h"
+#include "common/processing.h"
 #include "common/properties.h"
 #include "common/settings.h"
-#include "common/processing.h"
-#include "common/parsing.h"
 #include "detection/os/os.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <dirent.h>
-#include <sys/stat.h>
 
 static uint32_t getNumElementsImpl(const char* dirname, unsigned char type)
 {
diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c
index 9ad5be848..8839fdb16 100644
--- a/src/detection/packages/packages_windows.c
+++ b/src/detection/packages/packages_windows.c
@@ -31,8 +31,8 @@ void ffDetectPackagesImpl(const FFinstance* instance, FFPackagesResult* result)
 
     FFstrbuf scoopPath;
     ffStrbufInitF(&scoopPath, "%s/scoop/apps/*", getenv("USERPROFILE"));
-    counts->scoop = getNumElements(scoopPath.chars, FILE_ATTRIBUTE_DIRECTORY);
-    if(counts->scoop > 0)
-        counts->scoop-- // scoop
+    result->scoop = getNumElements(scoopPath.chars, FILE_ATTRIBUTE_DIRECTORY);
+    if(result->scoop > 0)
+        result->scoop-- // scoop
     ffStrbufDestroy(&scoopPath);
 }
diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c
index 24a9baacd..8dd1ff2fe 100644
--- a/src/detection/terminalfont/terminalfont_android.c
+++ b/src/detection/terminalfont/terminalfont_android.c
@@ -3,8 +3,6 @@
 #include "detection/terminalshell/terminalshell.h"
 #include "common/io.h"
 
-#include <sys/stat.h>
-
 #ifdef FF_HAVE_FREETYPE
     #include "common/library.h"
     #include <ft2build.h>
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 817dd5dba..6d1a2b8d2 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include <sys/stat.h>
 
 #ifdef WIN32
     #include "util/windows/getline.h"