From b64b93fc4a38e478802fd6e980d6498521678269 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Fri, 19 Dec 2025 23:24:56 +0800 Subject: [PATCH 01/67] Util (mallocHelper): implements `ffMallocUsableSize` and uses it --- CMakeLists.txt | 17 +++++++++++++++++ src/util/FFstrbuf.c | 23 ++++++++++++++++++++--- src/util/FFstrbuf.h | 6 ++++++ src/util/mallocHelper.h | 21 +++++++++++++++++++++ tests/strbuf.c | 11 ++++++++++- 5 files changed, 74 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47def7927..860cdd387 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1415,6 +1415,23 @@ elseif(GNU) target_compile_definitions(libfastfetch PUBLIC PATH_MAX=4096) endif() +if(WIN32) + check_function_exists(_msize HAVE_MSVC_MSIZE) + if(HAVE_MSVC_MSIZE) + target_compile_definitions(libfastfetch PUBLIC FF_HAVE_MSVC_MSIZE=1) + endif() +else() + check_function_exists(malloc_usable_size HAVE_MALLOC_USABLE_SIZE) + if(HAVE_MALLOC_USABLE_SIZE) + target_compile_definitions(libfastfetch PUBLIC FF_HAVE_MALLOC_USABLE_SIZE=1) + else() + check_function_exists(malloc_size HAVE_MALLOC_SIZE) + if(HAVE_MALLOC_SIZE) + target_compile_definitions(libfastfetch PUBLIC FF_HAVE_MALLOC_SIZE=1) + endif() + endif() +endif() + if(FreeBSD OR OpenBSD OR NetBSD) include(CheckStructHasMember) set(CMAKE_REQUIRED_DEFINITIONS "-D_IFI_OQDROPS=1") diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c index d66245520..aae3f1710 100644 --- a/src/util/FFstrbuf.c +++ b/src/util/FFstrbuf.c @@ -1,4 +1,5 @@ #include "FFstrbuf.h" +#include "util/mallocHelper.h" #include #include @@ -21,11 +22,27 @@ void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments) { assert(format != NULL); - int len = vasprintf(&strbuf->chars, format, arguments); + char* buffer = NULL; + int len = vasprintf(&buffer, format, arguments); assert(len >= 0); - strbuf->allocated = (uint32_t)(len + 1); - strbuf->length = (uint32_t)len; + ffStrbufInitMoveNS(strbuf, (uint32_t)len, buffer); +} + +// Takes ownership of `heapStr`. The caller must not free `heapStr` after calling this +// function; the memory will be managed and freed via the associated FFstrbuf. +void ffStrbufInitMoveNS(FFstrbuf* strbuf, uint32_t length, char* heapStr) +{ + assert(heapStr != NULL); + + strbuf->length = length; + size_t allocSize = ffMallocUsableSize(heapStr); + if (allocSize == 0) + allocSize = length + 1; + else if (allocSize > UINT32_MAX) + allocSize = UINT32_MAX; + strbuf->allocated = (uint32_t) allocSize; + strbuf->chars = heapStr; } void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free) diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h index 07fa98c61..a4bfcde4c 100644 --- a/src/util/FFstrbuf.h +++ b/src/util/FFstrbuf.h @@ -34,6 +34,7 @@ typedef struct FFstrbuf static inline void ffStrbufInit(FFstrbuf* strbuf); void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate); void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments); +void ffStrbufInitMoveNS(FFstrbuf* strbuf, uint32_t length, char* heapStr); void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free); void ffStrbufEnsureFixedLengthFree(FFstrbuf* strbuf, uint32_t free); @@ -212,6 +213,11 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateF(const char* format, ...) return strbuf; } +static inline void ffStrbufInitMoveS(FFstrbuf* strbuf, char* heapStr) +{ + ffStrbufInitMoveNS(strbuf, (uint32_t) strlen(heapStr), heapStr); +} + static inline void ffStrbufDestroy(FFstrbuf* strbuf) { extern char* CHAR_NULL_PTR; diff --git a/src/util/mallocHelper.h b/src/util/mallocHelper.h index 8e314841e..eaea5f3da 100644 --- a/src/util/mallocHelper.h +++ b/src/util/mallocHelper.h @@ -3,6 +3,12 @@ #include #include +#if FF_HAVE_MALLOC_USABLE_SIZE || FF_HAVE_MSVC_MSIZE + #include +#elif FF_HAVE_MALLOC_SIZE + #include +#endif + static inline void ffWrapFree(const void* pPtr) { assert(pPtr); @@ -11,3 +17,18 @@ static inline void ffWrapFree(const void* pPtr) } #define FF_AUTO_FREE __attribute__((__cleanup__(ffWrapFree))) + +// ptr MUST be a malloc'ed pointer +static inline size_t ffMallocUsableSize(const void* ptr) +{ + assert(ptr); + #if FF_HAVE_MALLOC_USABLE_SIZE + return malloc_usable_size((void*) ptr); + #elif FF_HAVE_MALLOC_SIZE + return malloc_size((void*) ptr); + #elif FF_HAVE_MSVC_MSIZE + return _msize((void*) ptr); + #else + return 0; // Not supported + #endif +} diff --git a/tests/strbuf.c b/tests/strbuf.c index 496ef4b09..466fb9297 100644 --- a/tests/strbuf.c +++ b/tests/strbuf.c @@ -229,9 +229,18 @@ int main(void) ffStrbufDestroy(&strbuf); + //initMoveS + { + char* heapStr = strdup("1234567890"); + ffStrbufInitMoveS(&strbuf, heapStr); + VERIFY(ffStrbufEqualS(&strbuf, "1234567890")); + VERIFY(strbuf.allocated >= 11); + ffStrbufDestroy(&strbuf); + } + //initF ffStrbufInitF(&strbuf, "%s", "1234567890123456789012345678901"); - VERIFY(strbuf.allocated == 32); + VERIFY(strbuf.allocated >= 32); VERIFY(ffStrbufEqualS(&strbuf, "1234567890123456789012345678901")); //containC From 34c0bf58cb5954f5f1804fd31e914b70585445bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 21 Dec 2025 18:07:07 +0800 Subject: [PATCH 02/67] Logo (Builtin): adds Tumbleweed braille logo --- src/logo/ascii/opensuse_tumbleweed2.txt | 19 +++++++++++++++++++ src/logo/builtin.c | 11 +++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/logo/ascii/opensuse_tumbleweed2.txt diff --git a/src/logo/ascii/opensuse_tumbleweed2.txt b/src/logo/ascii/opensuse_tumbleweed2.txt new file mode 100644 index 000000000..953bd12f6 --- /dev/null +++ b/src/logo/ascii/opensuse_tumbleweed2.txt @@ -0,0 +1,19 @@ + ⣀⣤⣤⣶⣶⣶⣶⣶⣤⣄⡀ + ⣠⣾⣿⣿⡿⠿⠛⠛⣿⣿⣿⣿⣿⣶⣄ + ⢠⣾⣿⣿⠛⠁ ⣿⣿⣿⠉⠻⣿⣿⣦ +⢀⣿⣿⡿⠁ ⣿⣿⣿ ⠙⣿⣿⣧ +⢸⣿⣿⠃ ⣿⣿⣿ ⢹⣿⣿⡀ +⢸⣿⣿⣤⣤⣤⣤⣤⣤⣤⣤⣿⣿⣿ ⢸⣿⣿⡇ +⠘⣿⣿⣿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿ ⢸⣿⣿⡇ + ⠹⣿⣿⣷⡀ ⢸⣿⣿⡇ + ⠙⢿⣿⣿⣷⣤⣄⣀⣀⣀⣀⣀⣀⣀⣀⣸⣿⣿⣇⣀⣀⣀⣀⣀⣀⣀⣀ + ⠉⠻⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣤⡀ + ⠈⠉⠉⠉⠉⠉⠉⠉⠉⢹⣿⣿⡏⠉⠉⠉⠉⠉⠉⠉⠉⠙⠛⢿⣿⣿⣷⡀ + ⢸⣿⣿⡇ ⠈⢻⣿⣿⣆ + ⢸⣿⣿⡇ ⢰⣶⣶⣶⣶⣶⣶⣶⣶⣶⣿⣿⣿⡄ + ⢸⣿⣿⡇ ⢸⣿⣿⠛⠛⠛⠛⠛⠛⠛⠛⣿⣿⡇ + ⠘⣿⣿⡇ ⢸⣿⣿ ⢰⣿⣿⡇ + ⢻⣿⣿⡄ ⢸⣿⣿ ⢀⣾⣿⡿⠁ + ⢻⣿⣿⣦⣀⢸⣿⣿ ⢀⣴⣿⣿⡿⠁ + ⠙⢿⣿⣿⣿⣿⣿⣤⣴⣶⣾⣿⣿⡿⠋ + ⠈⠙⠻⠿⠿⠿⠿⠿⠛⠋⠁ \ No newline at end of file diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 713a19503..ce573ac97 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -3611,6 +3611,17 @@ static const FFlogo O[] = { .colorKeys = FF_COLOR_FG_GREEN, .colorTitle = FF_COLOR_FG_GREEN, }, + // OpenSuseTumbleweed2 + { + .names = {"opensuse-tumbleweed2"}, + .lines = FASTFETCH_DATATEXT_LOGO_OPENSUSE_TUMBLEWEED2, + .type = FF_LOGO_LINE_TYPE_ALTER_BIT, + .colors = { + FF_COLOR_FG_DEFAULT, + }, + .colorKeys = FF_COLOR_FG_GREEN, + .colorTitle = FF_COLOR_FG_GREEN, + }, // openSUSESlowroll { .names = {"opensuse-slowroll", "opensuse-tumbleweed-slowroll"}, From a17f3dc3f89e4d0294ed046ccaca1faa2e1ae0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 22 Dec 2025 08:44:00 +0800 Subject: [PATCH 03/67] Util: fixes building on DragonFly BSD --- src/util/mallocHelper.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/mallocHelper.h b/src/util/mallocHelper.h index eaea5f3da..b784775a5 100644 --- a/src/util/mallocHelper.h +++ b/src/util/mallocHelper.h @@ -4,7 +4,11 @@ #include #if FF_HAVE_MALLOC_USABLE_SIZE || FF_HAVE_MSVC_MSIZE - #include + #if __has_include() + #include + #else + #include // For DragonFly BSD + #endif #elif FF_HAVE_MALLOC_SIZE #include #endif From 241aa3a02cb6b134932cc7ca0639754152100c74 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 22 Dec 2025 10:28:56 +0800 Subject: [PATCH 04/67] GPU (Linux): silences a strict-aliasing warning Fixes #2106 --- src/detection/gpu/gpu_wsl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/detection/gpu/gpu_wsl.cpp b/src/detection/gpu/gpu_wsl.cpp index 738a02546..55cd34fae 100644 --- a/src/detection/gpu/gpu_wsl.cpp +++ b/src/detection/gpu/gpu_wsl.cpp @@ -83,7 +83,7 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::InstanceLuid, sizeof(luid), &luid))) { static_assert(sizeof(luid) == sizeof(uint64_t), "LUID size mismatch"); - gpu->deviceId = ffGPUGeneral2Id(*(uint64_t*)&luid); + gpu->deviceId = ffGPUGeneral2Id((uint64_t) luid.HighPart << 32 | (uint64_t) luid.LowPart); } ffStrbufInit(&gpu->driver); From 302f0fc85f80d10959fe5aad97345a753cdd1d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 23 Dec 2025 11:05:50 +0800 Subject: [PATCH 05/67] TerminalFont (Linux): supports urxvt Fixes #2105 --- src/common/font.c | 328 +++++++++++++++++- src/common/font.h | 2 + .../terminalfont/terminalfont_linux.c | 38 ++ 3 files changed, 350 insertions(+), 18 deletions(-) diff --git a/src/common/font.c b/src/common/font.c index 308e094c4..d01629f9e 100644 --- a/src/common/font.c +++ b/src/common/font.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "util/FFlist.h" #include "util/FFstrbuf.h" +#include "util/stringUtils.h" #include "common/font.h" #include @@ -127,20 +128,20 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern } if( - strncasecmp(wordStart, "Ultra", 5) == 0 || - strncasecmp(wordStart, "Extra", 5) == 0 || - strncasecmp(wordStart, "Semi", 4) == 0 || - strncasecmp(wordStart, "Demi", 4) == 0 || - strncasecmp(wordStart, "Normal", wordLength) == 0 || - strncasecmp(wordStart, "Roman", wordLength) == 0 || - strncasecmp(wordStart, "Oblique", wordLength) == 0 || - strncasecmp(wordStart, "Italic", wordLength) == 0 || - strncasecmp(wordStart, "Thin", wordLength) == 0 || - strncasecmp(wordStart, "Light", wordLength) == 0 || - strncasecmp(wordStart, "Bold", wordLength) == 0 || - strncasecmp(wordStart, "Black", wordLength) == 0 || - strncasecmp(wordStart, "Condensed", wordLength) == 0 || - strncasecmp(wordStart, "Expanded", wordLength) == 0 + ffStrStartsWithIgnCase(wordStart, "Ultra") || + ffStrStartsWithIgnCase(wordStart, "Extra") || + ffStrStartsWithIgnCase(wordStart, "Semi") || + ffStrStartsWithIgnCase(wordStart, "Demi") || + ffStrStartsWithIgnCase(wordStart, "Normal") || + ffStrStartsWithIgnCase(wordStart, "Roman") || + ffStrStartsWithIgnCase(wordStart, "Oblique") || + ffStrStartsWithIgnCase(wordStart, "Italic") || + ffStrStartsWithIgnCase(wordStart, "Thin") || + ffStrStartsWithIgnCase(wordStart, "Light") || + ffStrStartsWithIgnCase(wordStart, "Bold") || + ffStrStartsWithIgnCase(wordStart, "Black") || + ffStrStartsWithIgnCase(wordStart, "Condensed") || + ffStrStartsWithIgnCase(wordStart, "Expanded") ) { if(alternativeBuffer == NULL) { @@ -151,10 +152,10 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-'); if( - strncasecmp(wordStart, "Ultra ", 6) == 0 || - strncasecmp(wordStart, "Extra ", 6) == 0 || - strncasecmp(wordStart, "Semi ", 5) == 0 || - strncasecmp(wordStart, "Demi ", 5) == 0 + ffStrStartsWithIgnCase(wordStart, "Ultra ") || + ffStrStartsWithIgnCase(wordStart, "Extra ") || + ffStrStartsWithIgnCase(wordStart, "Semi ") || + ffStrStartsWithIgnCase(wordStart, "Demi ") ) { fontPangoParseWord(data, font, alternativeBuffer); } @@ -194,6 +195,297 @@ void ffFontInitValues(FFfont* font, const char* name, const char* size) fontInitPretty(font); } +void ffFontInitXlfd(FFfont* font, const char* xlfd) +{ + assert(xlfd && *xlfd); + + // https://en.wikipedia.org/wiki/X_logical_font_description + ffFontInit(font); + + // XLFD: -foundry-family-weight-slant-setwidth-addstyle-pixelsize-pointsize-xres-yres-spacing-averagewidth-charsetregistry-charsetencoding + // It often starts with '-', which would create an empty first field. Skip it to align indexes. + if(*xlfd == '-') + xlfd++; + + const char* pstart = xlfd; + + for(int field = 0; field < 14; field++) + { + const char* pend = strchr(pstart, '-'); + uint32_t length = pend ? (uint32_t)(pend - pstart) : (uint32_t) strlen(pstart); + + if(length > 0) + { + if(field == 1) // family + { + ffStrbufAppendNS(&font->name, length, pstart); + } + else if(field == 7) // pointsize (decipoints, preferred) + { + // parse positive integer from substring + long deciPt = 0; + bool ok = true; + for(uint32_t i = 0; i < length; i++) + { + char c = pstart[i]; + if(c < '0' || c > '9') { ok = false; break; } + deciPt = deciPt * 10 + (c - '0'); + } + + if(ok && deciPt > 0) + { + ffStrbufClear(&font->size); + + char tmp[32]; + if(deciPt % 10 == 0) + snprintf(tmp, sizeof(tmp), "%ld", deciPt / 10); + else + snprintf(tmp, sizeof(tmp), "%ld.%ld", deciPt / 10, deciPt % 10); + + ffStrbufAppendS(&font->size, tmp); + } + } + else if(field == 6) // pixelsize (fallback if pointsize missing/invalid) + { + if(font->size.length == 0) + { + long px = 0; + bool ok = true; + for(uint32_t i = 0; i < length; i++) + { + char c = pstart[i]; + if(c < '0' || c > '9') { ok = false; break; } + px = px * 10 + (c - '0'); + } + + if(ok && px > 0) + ffStrbufAppendNS(&font->size, length, pstart); + } + } + else if(field >= 2 && field <= 5) // weight/slant/setwidth/addstyle + { + // ignore "normal" (case-insensitive) + if(!(length == 6 && ffStrStartsWithIgnCase(pstart, "normal"))) + { + FFstrbuf* style = (FFstrbuf*) ffListAdd(&font->styles); + ffStrbufInitNS(style, length, pstart); + } + } + } + + if(!pend) + break; + + pstart = pend + 1; + } + + fontInitPretty(font); +} + +void ffFontInitXft(FFfont* font, const char* xft) +{ + assert(xft); + + // https://en.wikipedia.org/wiki/Xft + // Xft/Fontconfig pattern examples: + // "DejaVu Sans Mono-10" + // "monospace:size=10:weight=bold:slant=italic" + // "Fira Code-12:style=Regular" + // Goal: extract family(name), size, and some common styles. + + ffFontInit(font); + + // 1) Parse "head" part before first ':' => usually "family[-size]" (may include commas) + const char* p = xft; + + while(*p == ' ' || *p == '\t') + ++p; + + const char* headStart = p; + while(*p != '\0' && *p != ':') + ++p; + const char* headEnd = p; + + // trim tail spaces + while(headEnd > headStart && (headEnd[-1] == ' ' || headEnd[-1] == '\t')) + --headEnd; + + // If multiple families are listed, take the first one (up to comma) + for(const char* q = headStart; q < headEnd; ++q) + { + if(*q == ',') + { + headEnd = q; + while(headEnd > headStart && (headEnd[-1] == ' ' || headEnd[-1] == '\t')) + --headEnd; + break; + } + } + + // Try parse trailing "-" as size, otherwise entire head is name + const char* dashPos = NULL; + const char* sizeStart = NULL; + + for(const char* q = headEnd; q > headStart; ) + { + --q; + if(*q == '-' && (q + 1) < headEnd && ffCharIsDigit(q[1])) + { + dashPos = q; + sizeStart = q + 1; + break; + } + } + + if(dashPos) + { + bool ok = true; + bool seenDigit = false; + for(const char* q = sizeStart; q < headEnd; ++q) + { + if(ffCharIsDigit(*q)) + seenDigit = true; + else if(*q == '.') + continue; + else + { + ok = false; + break; + } + } + + if(ok && seenDigit) + { + const char* nameEnd = dashPos; + while(nameEnd > headStart && (nameEnd[-1] == ' ' || nameEnd[-1] == '\t')) + --nameEnd; + + if(nameEnd > headStart) + ffStrbufAppendNS(&font->name, (uint32_t) (nameEnd - headStart), headStart); + + if(headEnd > sizeStart) + ffStrbufAppendNS(&font->size, (uint32_t) (headEnd - sizeStart), sizeStart); + } + else + { + if(headEnd > headStart) + ffStrbufAppendNS(&font->name, (uint32_t) (headEnd - headStart), headStart); + } + } + else + { + if(headEnd > headStart) + ffStrbufAppendNS(&font->name, (uint32_t) (headEnd - headStart), headStart); + } + + ffStrbufTrim(&font->name, ' '); + ffStrbufTrim(&font->name, '"'); + + // 2) Parse key=value fields after ':' (Fontconfig-like). Fields separated by ':'. + // Common keys: size, pixelsize, pointsize, style, weight, slant, width + while(*p == ':') + { + ++p; + + // key + const char* keyStart = p; + while(*p != '\0' && *p != '=' && *p != ':') + ++p; + const char* keyEnd = p; + + if(*p != '=') + continue; // skip tokens without '=' + + ++p; // skip '=' + + // value (until next ':', allow backslash-escaping) + FF_STRBUF_AUTO_DESTROY value = ffStrbufCreate(); + + while(*p != '\0' && *p != ':') + { + if(*p == '\\' && p[1] != '\0') + { + ++p; + ffStrbufAppendC(&value, *p); + ++p; + continue; + } + + ffStrbufAppendC(&value, *p); + ++p; + } + + ffStrbufTrim(&value, ' '); + ffStrbufTrim(&value, '"'); + + uint32_t keyLen = (uint32_t) (keyEnd - keyStart); + + // helper: set numeric size if not set yet + const bool sizeEmpty = (font->size.length == 0); + if(value.length > 0) + { + if(keyLen == 4 && ffStrStartsWithIgnCase(keyStart, "size")) + { + if(sizeEmpty) + { + if(ffStrbufEndsWithS(&value, "px") || ffStrbufEndsWithS(&value, "pt")) + ffStrbufSubstrBefore(&value, value.length - 2); + + if(ffCharIsDigit(value.chars[0])) + ffStrbufAppend(&font->size, &value); + } + } + else if( + (keyLen == 9 && ffStrStartsWithIgnCase(keyStart, "pixelsize")) || + (keyLen == 9 && ffStrStartsWithIgnCase(keyStart, "pointsize")) || + (keyLen == 8 && ffStrStartsWithIgnCase(keyStart, "fontsize")) + ) { + if(sizeEmpty) + { + if(ffStrbufEndsWithS(&value, "px") || ffStrbufEndsWithS(&value, "pt")) + ffStrbufSubstrBefore(&value, value.length - 2); + + if(ffCharIsDigit(value.chars[0])) + ffStrbufAppend(&font->size, &value); + } + } + else if(keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "style")) + { + // style may contain multiple words: "Bold Italic" + const char* s = value.chars; + while(*s != '\0') + { + while(*s == ' ' || *s == '\t' || *s == ',') + ++s; + + const char* w = s; + while(*s != '\0' && *s != ' ' && *s != '\t' && *s != ',') + ++s; + + if(s > w) + { + FFstrbuf* style = FF_LIST_ADD(FFstrbuf, font->styles); + ffStrbufInitNS(style, (uint32_t) (s - w), w); + } + } + } + else if( + (keyLen == 6 && ffStrStartsWithIgnCase(keyStart, "weight")) || + (keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "slant")) || + (keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "width")) + ) { + // normalize: remove '-' to align with other parsers ("Semi-Bold" -> "SemiBold") + FFstrbuf* style = FF_LIST_ADD(FFstrbuf, font->styles); + ffStrbufInit(style); + strbufAppendNSExcludingC(style, value.length, value.chars, '-'); + ffStrbufTrim(style, ' '); + } + } + } + + fontInitPretty(font); +} + void ffFontInitMoveValues(FFfont* font, FFstrbuf* name, FFstrbuf* size, FFstrbuf* style) { ffFontInit(font); diff --git a/src/common/font.h b/src/common/font.h index 2b94f463a..ac6932c8b 100644 --- a/src/common/font.h +++ b/src/common/font.h @@ -15,6 +15,8 @@ void ffFontInit(FFfont* font); void ffFontInitQt(FFfont* font, const char* data); void ffFontInitPango(FFfont* font, const char* data); void ffFontInitValues(FFfont* font, const char* name, const char* size); +void ffFontInitXlfd(FFfont* font, const char* xlfd); +void ffFontInitXft(FFfont* font, const char* xft); void ffFontInitMoveValues(FFfont* font, FFstrbuf* name, FFstrbuf* size, FFstrbuf* style); void ffFontInitWithSpace(FFfont* font, const char* rawName); void ffFontDestroy(FFfont* font); diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 8e1151a49..058b64c51 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -1,3 +1,4 @@ +#include "common/font.h" #include "terminalfont.h" #include "common/settings.h" #include "common/properties.h" @@ -418,6 +419,41 @@ static void detectWestonTerminal(FFTerminalFontResult* terminalFont) ffFontInitValues(&terminalFont->font, font.chars, size.chars); } +static void detectUrxvt(FFTerminalFontResult* terminalFont) +{ + FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate(); + + if (!(ffParsePropFileHomeValues(".Xresources", 1, (FFpropquery[]) { + {"URxvt.font:", &buffer}, + }) || ffParsePropFileHomeValues(".Xdefaults", 1, (FFpropquery[]) { + {"URxvt.font:", &buffer}, + }))) + { + ffStrbufAppendS(&terminalFont->error, "Could not find URxvt.font in .Xresources or .Xdefaults"); + return; + } + + uint32_t index = 0; + + char* line = NULL; + size_t len = 0; + while (ffStrbufGetdelim(&line, &len, ',', &buffer)) + { + FFfont* font = index == 0 ? &terminalFont->font : &terminalFont->fallback; + if (line[0] == '-') + ffFontInitXlfd(font, line); + else if (ffStrStartsWith(line, "xft:")) + ffFontInitXft(font, line + 4); + else + { + ffStrbufAppendF(&terminalFont->error, "Unknown URxvt font format: %s", line); + continue; + } + index++; + if (index > 1) break; + } +} + #ifdef __HAIKU__ static void detectHaikuTerminal(FFTerminalFontResult* terminalFont) { @@ -483,6 +519,8 @@ ffDetectTerminalFontPlatform #endif else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "termite")) detectFromConfigFile("termite/config", "font =", terminalFont); + else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "urxvt")) + detectUrxvt(terminalFont); else return false; return true; From 710df0b87ba69f4602b7aaf19f126efefdbb5e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 23 Dec 2025 13:56:48 +0800 Subject: [PATCH 06/67] TerminalFont (Linux): improves rxvt detection Ref #2105 --- src/common/font.c | 38 +++++++------------ .../terminalfont/terminalfont_linux.c | 4 +- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/common/font.c b/src/common/font.c index d01629f9e..599860bb7 100644 --- a/src/common/font.c +++ b/src/common/font.c @@ -46,7 +46,8 @@ static void fontInitPretty(FFfont* font) if(font->size.length > 0) { ffStrbufAppend(&font->pretty, &font->size); - ffStrbufAppendS(&font->pretty, "pt"); + if (!ffStrbufEndsWithS(&font->size, "pt") && !ffStrbufEndsWithS(&font->size, "px")) + ffStrbufAppendS(&font->pretty, "pt"); if(font->styles.length > 0) ffStrbufAppendS(&font->pretty, ", "); @@ -238,9 +239,9 @@ void ffFontInitXlfd(FFfont* font, const char* xlfd) char tmp[32]; if(deciPt % 10 == 0) - snprintf(tmp, sizeof(tmp), "%ld", deciPt / 10); + snprintf(tmp, sizeof(tmp), "%ldpt", deciPt / 10); else - snprintf(tmp, sizeof(tmp), "%ld.%ld", deciPt / 10, deciPt % 10); + snprintf(tmp, sizeof(tmp), "%ld.%ldpt", deciPt / 10, deciPt % 10); ffStrbufAppendS(&font->size, tmp); } @@ -259,7 +260,10 @@ void ffFontInitXlfd(FFfont* font, const char* xlfd) } if(ok && px > 0) + { ffStrbufAppendNS(&font->size, length, pstart); + ffStrbufAppendS(&font->size, "px"); + } } } else if(field >= 2 && field <= 5) // weight/slant/setwidth/addstyle @@ -424,29 +428,15 @@ void ffFontInitXft(FFfont* font, const char* xft) const bool sizeEmpty = (font->size.length == 0); if(value.length > 0) { - if(keyLen == 4 && ffStrStartsWithIgnCase(keyStart, "size")) + if( + (keyLen == 4 && ffStrStartsWithIgnCase(keyStart, "size")) || + (keyLen == 9 && ffStrStartsWithIgnCase(keyStart, "pixelsize")) + ) { - if(sizeEmpty) + if(sizeEmpty && ffCharIsDigit(value.chars[0])) { - if(ffStrbufEndsWithS(&value, "px") || ffStrbufEndsWithS(&value, "pt")) - ffStrbufSubstrBefore(&value, value.length - 2); - - if(ffCharIsDigit(value.chars[0])) - ffStrbufAppend(&font->size, &value); - } - } - else if( - (keyLen == 9 && ffStrStartsWithIgnCase(keyStart, "pixelsize")) || - (keyLen == 9 && ffStrStartsWithIgnCase(keyStart, "pointsize")) || - (keyLen == 8 && ffStrStartsWithIgnCase(keyStart, "fontsize")) - ) { - if(sizeEmpty) - { - if(ffStrbufEndsWithS(&value, "px") || ffStrbufEndsWithS(&value, "pt")) - ffStrbufSubstrBefore(&value, value.length - 2); - - if(ffCharIsDigit(value.chars[0])) - ffStrbufAppend(&font->size, &value); + ffStrbufAppend(&font->size, &value); + ffStrbufAppendS(&font->size, keyLen == 4 ? "pt" : "px"); } } else if(keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "style")) diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 058b64c51..3dca397ca 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -519,7 +519,9 @@ ffDetectTerminalFontPlatform #endif else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "termite")) detectFromConfigFile("termite/config", "font =", terminalFont); - else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "urxvt")) + else if(ffStrbufIgnCaseEqualS(&terminal->processName, "rxvt") + || ffStrbufIgnCaseEqualS(&terminal->processName, "urxvt") + || ffStrbufIgnCaseEqualS(&terminal->processName, "urxvtd")) detectUrxvt(terminalFont); else return false; From 8439204cefb31c64ea4c93a030b2e1b15002f789 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 23 Dec 2025 16:17:01 +0800 Subject: [PATCH 07/67] DisplayServer (Linux): upgrades kde-output-device-v2 wayland protocol files (again) --- .../kde-output-device-v2-client-protocol.h | 22 +++++++++++++++++++ .../wayland/kde-output-device-v2-protocol.c | 7 +++--- .../displayserver/linux/wayland/kde-output.c | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h b/src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h index bec7f9e37..529d26516 100644 --- a/src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h +++ b/src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h @@ -244,6 +244,10 @@ enum kde_output_device_v2_capability { * @since 18 */ KDE_OUTPUT_DEVICE_V2_CAPABILITY_CUSTOM_MODES = 0x2000, + /** + * @since 19 + */ + KDE_OUTPUT_DEVICE_V2_CAPABILITY_AUTO_BRIGHTNESS = 0x4000, }; /** * @ingroup iface_kde_output_device_v2 @@ -289,6 +293,10 @@ enum kde_output_device_v2_capability { * @ingroup iface_kde_output_device_v2 */ #define KDE_OUTPUT_DEVICE_V2_CAPABILITY_CUSTOM_MODES_SINCE_VERSION 18 +/** + * @ingroup iface_kde_output_device_v2 + */ +#define KDE_OUTPUT_DEVICE_V2_CAPABILITY_AUTO_BRIGHTNESS_SINCE_VERSION 19 #endif /* KDE_OUTPUT_DEVICE_V2_CAPABILITY_ENUM */ #ifndef KDE_OUTPUT_DEVICE_V2_VRR_POLICY_ENUM @@ -820,6 +828,16 @@ struct kde_output_device_v2_listener { void (*priority)(void *data, struct kde_output_device_v2 *kde_output_device_v2, uint32_t priority); + /** + * whether or not automatic brightness is enabled + * + * + * @param enabled 1 for enabled, 0 for disabled + * @since 20 + */ + void (*auto_brightness)(void *data, + struct kde_output_device_v2 *kde_output_device_v2, + uint32_t enabled); }; /** @@ -973,6 +991,10 @@ kde_output_device_v2_add_listener(struct kde_output_device_v2 *kde_output_device * @ingroup iface_kde_output_device_v2 */ #define KDE_OUTPUT_DEVICE_V2_PRIORITY_SINCE_VERSION 18 +/** + * @ingroup iface_kde_output_device_v2 + */ +#define KDE_OUTPUT_DEVICE_V2_AUTO_BRIGHTNESS_SINCE_VERSION 20 /** @ingroup iface_kde_output_device_v2 */ diff --git a/src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c b/src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c index 1c4fe0ef5..d9f0f285b 100644 --- a/src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c +++ b/src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c @@ -68,12 +68,13 @@ static const struct wl_message kde_output_device_v2_events[] = { { "edr_policy", "16u", kde_output_device_v2_types + 0 }, { "sharpness", "17u", kde_output_device_v2_types + 0 }, { "priority", "18u", kde_output_device_v2_types + 0 }, + { "auto_brightness", "20u", kde_output_device_v2_types + 0 }, }; WL_EXPORT const struct wl_interface kde_output_device_v2_interface = { - "kde_output_device_v2", 19, + "kde_output_device_v2", 20, 0, NULL, - 35, kde_output_device_v2_events, + 36, kde_output_device_v2_events, }; static const struct wl_message kde_output_device_mode_v2_events[] = { @@ -85,7 +86,7 @@ static const struct wl_message kde_output_device_mode_v2_events[] = { }; WL_EXPORT const struct wl_interface kde_output_device_mode_v2_interface = { - "kde_output_device_mode_v2", 19, + "kde_output_device_mode_v2", 20, 0, NULL, 5, kde_output_device_mode_v2_events, }; diff --git a/src/detection/displayserver/linux/wayland/kde-output.c b/src/detection/displayserver/linux/wayland/kde-output.c index 7d986ba14..c541e4ed8 100644 --- a/src/detection/displayserver/linux/wayland/kde-output.c +++ b/src/detection/displayserver/linux/wayland/kde-output.c @@ -179,6 +179,7 @@ static struct kde_output_device_v2_listener outputListener = { .edr_policy = (void*) stubListener, .sharpness = (void*) stubListener, .priority = (void*) stubListener, + .auto_brightness = (void*) stubListener, }; const char* ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry, uint32_t name, uint32_t version) From fa630388629eb40e0e27e0d0e9c9a2643b4d5e78 Mon Sep 17 00:00:00 2001 From: Joe_ <126924661+me-joe@users.noreply.github.com> Date: Fri, 26 Dec 2025 19:38:12 +0700 Subject: [PATCH 08/67] Logo (Builtin): renames HydraPWK to NetHydra --- src/logo/ascii/{hydrapwk.txt => nethydra.txt} | 0 src/logo/builtin.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) rename src/logo/ascii/{hydrapwk.txt => nethydra.txt} (100%) diff --git a/src/logo/ascii/hydrapwk.txt b/src/logo/ascii/nethydra.txt similarity index 100% rename from src/logo/ascii/hydrapwk.txt rename to src/logo/ascii/nethydra.txt diff --git a/src/logo/builtin.c b/src/logo/builtin.c index ce573ac97..c954ccba3 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -2340,15 +2340,6 @@ static const FFlogo H[] = { .colorKeys = FF_COLOR_FG_LIGHT_BLACK, .colorTitle = FF_COLOR_FG_DEFAULT, }, - // HydraPWK - { - .names = {"HydraPWK"}, - .lines = FASTFETCH_DATATEXT_LOGO_HYDRAPWK, - .colors = { - FF_COLOR_FG_RED, - FF_COLOR_FG_DEFAULT, - }, - }, // LAST {}, }; @@ -3412,6 +3403,15 @@ static const FFlogo N[] = { FF_COLOR_FG_RED, }, }, + // NetHydra + { + .names = {"NetHydra"}, + .lines = FASTFETCH_DATATEXT_LOGO_NETHYDRA, + .colors = { + FF_COLOR_FG_RED, + FF_COLOR_FG_DEFAULT, + }, + }, // LAST {}, }; From 7e557a06b3d502920ae100acfa6f61dde6a0761a Mon Sep 17 00:00:00 2001 From: 3ventic Date: Sat, 27 Dec 2025 04:15:04 +0200 Subject: [PATCH 09/67] JsonSchema: correct references for keyboard, mouse items (#2119) [ci skip] --- doc/json_schema.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/json_schema.json b/doc/json_schema.json index 64ca981e5..b226d5705 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -2964,8 +2964,11 @@ "keyWidth": { "$ref": "#/$defs/keyWidth" }, + "outputColor": { + "$ref": "#/$defs/outputColor" + }, "format": { - "$ref": "#/$defs/memoryFormat" + "$ref": "#/$defs/keyboardFormat" }, "condition": { "$ref": "#/$defs/conditions" @@ -3296,8 +3299,11 @@ "keyWidth": { "$ref": "#/$defs/keyWidth" }, + "outputColor": { + "$ref": "#/$defs/outputColor" + }, "format": { - "$ref": "#/$defs/memoryFormat" + "$ref": "#/$defs/mouseFormat" }, "condition": { "$ref": "#/$defs/conditions" From 9c870a57f0e7979f652cf29fb1bb0b7c0f7201ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 27 Dec 2025 15:57:20 +0800 Subject: [PATCH 10/67] PhysicalMemory (macOS): improves performance on Apple Silicon --- .../physicalmemory/physicalmemory_apple.m | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m index 243b35aca..b7b25d528 100644 --- a/src/detection/physicalmemory/physicalmemory_apple.m +++ b/src/detection/physicalmemory/physicalmemory_apple.m @@ -2,6 +2,7 @@ #include "common/processing.h" #include "util/smbiosHelper.h" #include "util/stringUtils.h" +#include "util/apple/cf_helpers.h" #import @@ -64,7 +65,7 @@ static void appendDevice( } } -const char* ffDetectPhysicalMemory(FFlist* result) +static const char* detectFromSystemProfiler(FFlist* result) { FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate(); if (ffProcessAppendStdOut(&buffer, (char* const[]) { @@ -119,3 +120,43 @@ const char* ffDetectPhysicalMemory(FFlist* result) return NULL; } + +FF_MAYBE_UNUSED static const char* detectFromIokit(FFlist* result) +{ + FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t entryDevice = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/chosen"); + if (!entryDevice) + return "IORegistryEntryFromPath() failed"; + + FF_CFTYPE_AUTO_RELEASE CFTypeRef dramType = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("dram-type"), kCFAllocatorDefault, 0); + FF_CFTYPE_AUTO_RELEASE CFTypeRef dramSize = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("dram-size"), kCFAllocatorDefault, 0); + FF_CFTYPE_AUTO_RELEASE CFTypeRef dramVendor = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("dram-vendor"), kCFAllocatorDefault, 0); + if (!dramType || !dramSize || !dramVendor) + return "IORegistryEntryCreateCFProperty() failed"; + + FFPhysicalMemoryResult* device = ffListAdd(result); + ffStrbufInit(&device->type); + ffStrbufInit(&device->formFactor); + ffStrbufInit(&device->locator); + ffStrbufInit(&device->vendor); + ffStrbufInit(&device->serial); + ffStrbufInit(&device->partNumber); + device->size = 0; + device->maxSpeed = 0; + device->runningSpeed = 0; + device->ecc = false; + + ffCfStrGetString(dramType, &device->type); + ffCfStrGetString(dramVendor, &device->vendor); + ffCfNumGetInt64(dramSize, (int64_t*) &device->size); + return NULL; +} + +const char* ffDetectPhysicalMemory(FFlist* result) +{ + #if __aarch64__ + if (detectFromIokit(result) == NULL) + return NULL; + #endif + + return detectFromSystemProfiler(result); +} From d01fc56ea2645d45e46acf42f0d0969449940374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 27 Dec 2025 16:11:16 +0800 Subject: [PATCH 11/67] Bootmgr (macOS): supports secure boot detection --- src/detection/bootmgr/bootmgr_apple.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c index bd4c5dc98..dc8de14b2 100644 --- a/src/detection/bootmgr/bootmgr_apple.c +++ b/src/detection/bootmgr/bootmgr_apple.c @@ -1,5 +1,25 @@ #include "bootmgr.h" #include "common/io/io.h" +#include "util/apple/cf_helpers.h" + +#include + +FF_MAYBE_UNUSED static const char* detectFromIokit(bool* secureBoot) +{ + FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t entryDevice = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/chosen"); + if (!entryDevice) + return "IORegistryEntryFromPath() failed"; + + FF_CFTYPE_AUTO_RELEASE CFTypeRef prop = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("secure-boot"), kCFAllocatorDefault, 0); + if (!prop) + return "IORegistryEntryCreateCFProperty() failed"; + + if (CFGetTypeID(prop) != CFDataGetTypeID() || CFDataGetLength((CFDataRef) prop) == 0) + return "Invalid secure-boot property"; + + *secureBoot = (bool) *CFDataGetBytePtr((CFDataRef) prop); + return NULL; +} const char* ffDetectBootmgr(FFBootmgrResult* result) { @@ -8,5 +28,7 @@ const char* ffDetectBootmgr(FFBootmgrResult* result) ffStrbufSetStatic(&result->name, "iBoot"); + detectFromIokit(&result->secureBoot); + return NULL; } From 01917b781b140cf90166e410b3c28c300ddc7a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 27 Dec 2025 18:12:23 +0800 Subject: [PATCH 12/67] Bootmgr (macOS): supports secure boot detection on Intel --- src/detection/bootmgr/bootmgr_apple.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c index dc8de14b2..764489974 100644 --- a/src/detection/bootmgr/bootmgr_apple.c +++ b/src/detection/bootmgr/bootmgr_apple.c @@ -4,8 +4,9 @@ #include -FF_MAYBE_UNUSED static const char* detectFromIokit(bool* secureBoot) +static const char* detectSecureBoot(bool* result) { + #if __aarch64__ FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t entryDevice = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/chosen"); if (!entryDevice) return "IORegistryEntryFromPath() failed"; @@ -17,7 +18,22 @@ FF_MAYBE_UNUSED static const char* detectFromIokit(bool* secureBoot) if (CFGetTypeID(prop) != CFDataGetTypeID() || CFDataGetLength((CFDataRef) prop) == 0) return "Invalid secure-boot property"; - *secureBoot = (bool) *CFDataGetBytePtr((CFDataRef) prop); + *result = (bool) *CFDataGetBytePtr((CFDataRef) prop); + #else + FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t entryDevice = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options"); + if (!entryDevice) + return "IORegistryEntryFromPath() failed"; + + FF_CFTYPE_AUTO_RELEASE CFTypeRef prop = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("94b73556-2197-4702-82a8-3e1337dafbfb:AppleSecureBootPolicy"), kCFAllocatorDefault, 0); + if (!prop) + return "IORegistryEntryCreateCFProperty() failed"; + + if (CFGetTypeID(prop) != CFDataGetTypeID() || CFDataGetLength((CFDataRef) prop) == 0) + return "Invalid secure-boot property"; + + *result = *CFDataGetBytePtr((CFDataRef) prop) != 0x02 /* Permissive Security */; + #endif + return NULL; } @@ -28,7 +44,7 @@ const char* ffDetectBootmgr(FFBootmgrResult* result) ffStrbufSetStatic(&result->name, "iBoot"); - detectFromIokit(&result->secureBoot); + detectSecureBoot(&result->secureBoot); return NULL; } From 53116d65f10fea8a7f0c2264abb707c82608d65e Mon Sep 17 00:00:00 2001 From: Carter Li Date: Sun, 28 Dec 2025 19:13:46 +0800 Subject: [PATCH 13/67] WM (Linux): supports niri version detection Fixes #2121 --- src/detection/wm/wm_linux.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c index 4697976e8..25abcc4da 100644 --- a/src/detection/wm/wm_linux.c +++ b/src/detection/wm/wm_linux.c @@ -162,6 +162,22 @@ static const char* getLabwc(FFstrbuf* result) return "Failed to run command `labwc --version`"; } +static const char* getNiri(FFstrbuf* result) +{ + if (ffProcessAppendStdOut(result, (char* const[]){ + "niri", + "--version", + NULL + }) == NULL) + { // niri 25.11 (b35bcae) + ffStrbufSubstrBeforeLastC(result, ' '); + ffStrbufSubstrAfterFirstC(result, ' '); + return NULL; + } + + return "Failed to run command `niri --version`"; +} + #ifdef __linux__ static const char* getWslg(FFstrbuf* result) { @@ -299,6 +315,9 @@ const char* ffDetectWMVersion(const FFstrbuf* wmName, FFstrbuf* result, FF_MAYBE if (ffStrbufEqualS(wmName, "labwc")) return getLabwc(result); + if (ffStrbufEqualS(wmName, "niri")) + return getNiri(result); + #if __linux__ if (ffStrbufEqualS(wmName, "WSLg")) return getWslg(result); From 7925469e2f6983ea5a925b786ee108e62f700e25 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Sun, 28 Dec 2025 19:50:23 +0800 Subject: [PATCH 14/67] DE (Linux): detect COSMIC version --- src/detection/de/de_linux.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index 5913c66c9..c4138777b 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -234,6 +234,21 @@ static const char* getTrinity(FFstrbuf* result, FFDEOptions* options) return "All methods failed"; } +static const char* getCosmic(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* options) +{ + if (ffProcessAppendStdOut(result, (char* const[]){ + "cosmic-comp", + "--version", + NULL + }) == NULL) { + // cosmic-comp 0.1.0 (git commit fa88002ba41d2edec25dd7ffdee9719fbb928fc0) + ffStrbufSubstrBeforeLastC(result, ' '); + ffStrbufSubstrAfterFirstC(result, ' '); + return NULL; + } + + return "All methods failed"; +} const char* ffDetectDEVersion(const FFstrbuf* deName, FFstrbuf* result, FFDEOptions* options) { @@ -257,6 +272,8 @@ const char* ffDetectDEVersion(const FFstrbuf* deName, FFstrbuf* result, FFDEOpti getUnity(result, options); else if (ffStrbufEqualS(deName, "trinity")) getTrinity(result, options); + else if (ffStrbufEqualS(deName, "COSMIC")) + getCosmic(result, options); else return "Unsupported DE"; return NULL; From 4708a5e59c33efd39a645d574b2bb3c00837c246 Mon Sep 17 00:00:00 2001 From: qaqland Date: Mon, 29 Dec 2025 20:10:49 +0800 Subject: [PATCH 15/67] Logo (Builtin): fix colors of deepin --- src/logo/builtin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index c954ccba3..5e7e64f8d 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -1402,15 +1402,15 @@ static const FFlogo D[] = { .colorKeys = FF_COLOR_FG_RED, .colorTitle = FF_COLOR_FG_RED, }, - // Deepin + // deepin { - .names = {"Deepin", "deepin-linux"}, + .names = {"deepin", "deepin-linux"}, .lines = FASTFETCH_DATATEXT_LOGO_DEEPIN, .colors = { - FF_COLOR_FG_GREEN, + FF_COLOR_FG_BLUE, }, - .colorKeys = FF_COLOR_FG_GREEN, - .colorTitle = FF_COLOR_FG_GREEN, + .colorKeys = FF_COLOR_FG_BLUE, + .colorTitle = FF_COLOR_FG_BLUE, }, // DesaOS { From 0b1e2faba1e5c1ac51a2edfdf84cda2c5aabfa64 Mon Sep 17 00:00:00 2001 From: qaqland Date: Mon, 29 Dec 2025 20:11:15 +0800 Subject: [PATCH 16/67] Logo (Builtin): fix colors of UOS --- src/logo/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 5e7e64f8d..b646e3d46 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -5147,10 +5147,10 @@ static const FFlogo U[] = { .names = {"UOS"}, .lines = FASTFETCH_DATATEXT_LOGO_UOS, .colors = { - FF_COLOR_FG_RED, + FF_COLOR_FG_BLUE, }, .colorKeys = FF_COLOR_FG_DEFAULT, - .colorTitle = FF_COLOR_FG_YELLOW, + .colorTitle = FF_COLOR_FG_BLUE, }, // UrukOS { From bcbc5a4bff537f7182b633f5a2ed3a17903e6e81 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 1 Jan 2026 22:29:11 +0800 Subject: [PATCH 17/67] DE (Linux): fix COSMIC version detection --- src/detection/de/de_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index c4138777b..dc333c53f 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -242,8 +242,8 @@ static const char* getCosmic(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* opti NULL }) == NULL) { // cosmic-comp 0.1.0 (git commit fa88002ba41d2edec25dd7ffdee9719fbb928fc0) - ffStrbufSubstrBeforeLastC(result, ' '); ffStrbufSubstrAfterFirstC(result, ' '); + ffStrbufSubstrBeforeFirstC(result, ' '); return NULL; } From f03a0bc2023876f015049e49ff5405c41cac8df7 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 1 Jan 2026 22:32:32 +0800 Subject: [PATCH 18/67] Terminal (Linux): supports cosmic-term version detection --- src/detection/terminalshell/terminalshell.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index dc7c2c33b..015bbfcac 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -875,6 +875,9 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe if(ffStrbufIgnCaseEqualS(processName, "termite")) return getTerminalVersionTermite(exe, version); + if(ffStrbufIgnCaseEqualS(processName, "cosmic-term")) + return getTerminalVersionTmux(exe, version); + #endif #ifdef _WIN32 From 37fe446a585229e04016078c9d65289b9c3617b6 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 1 Jan 2026 22:52:03 +0800 Subject: [PATCH 19/67] TerminalFont (Linux): supports cosmic-term --- .../terminalfont/terminalfont_linux.c | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 3dca397ca..7eb8c2cef 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -454,6 +454,32 @@ static void detectUrxvt(FFTerminalFontResult* terminalFont) } } +static bool detectCosmicTerm(FFTerminalFontResult* terminalFont) +{ + FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreate(); + FF_STRBUF_AUTO_DESTROY fontSize = ffStrbufCreate(); + + FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateCopy(&instance.state.platform.homeDir); + ffStrbufAppendS(&path, ".config/cosmic/com.system76.CosmicTerm/v1/"); + uint32_t baseLen = path.length; + + ffStrbufAppendS(&path, "font_name"); + ffReadFileBuffer(path.chars, &fontName); + ffStrbufTrim(&path, '"'); + ffStrbufSubstrBefore(&path, baseLen); + if (fontName.length == 0) ffStrbufSetStatic(&fontName, "Noto Sans Mono"); + + ffStrbufAppendS(&path, "font_size"); + if (ffReadFileBuffer(path.chars, &fontSize)) + ffStrbufAppendS(&fontSize, "px"); + ffStrbufSubstrBefore(&path, baseLen); + if (fontSize.length == 0) ffStrbufSetStatic(&fontSize, "14px"); + + ffFontInitValues(&terminalFont->font, fontName.chars, fontSize.chars); + + return true; +} + #ifdef __HAIKU__ static void detectHaikuTerminal(FFTerminalFontResult* terminalFont) { @@ -513,6 +539,8 @@ ffDetectTerminalFontPlatform detectTerminator(terminalFont); else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "sakura")) detectFromConfigFile("sakura/sakura.conf", "font=", terminalFont); + else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "cosmic-term")) + detectCosmicTerm(terminalFont); #ifdef __HAIKU__ else if(ffStrbufStartsWithIgnCaseS(&terminal->processName, "Terminal")) detectHaikuTerminal(terminalFont); From e96b0f7a73ff5921af89368050a034ed807817e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 1 Jan 2026 23:33:14 +0800 Subject: [PATCH 20/67] Netif (Linux): skips local/loopback routes Fixes #2127 --- src/common/netif/netif_linux.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/common/netif/netif_linux.c b/src/common/netif/netif_linux.c index 49976b695..7867d1a1e 100644 --- a/src/common/netif/netif_linux.c +++ b/src/common/netif/netif_linux.c @@ -151,6 +151,12 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) continue; } + // Skip local/loopback routes + if (rtm->rtm_scope == RT_SCOPE_HOST || rtm->rtm_type == RTN_LOCAL) { + FF_DEBUG("Skipping local route #%d (scope=%d, type=%d)", routeCount, rtm->rtm_scope, rtm->rtm_type); + continue; + } + FF_DEBUG("Processing IPv4 default route candidate #%d", routeCount); entry = (__typeof__(entry)) { }; // Default to zero metric (no RTA_PRIORITY found) @@ -360,6 +366,12 @@ bool ffNetifGetDefaultRouteImplV6(FFNetifDefaultRouteResult* result) continue; } + // Skip local/loopback routes + if (rtm->rtm_scope == RT_SCOPE_HOST || rtm->rtm_type == RTN_LOCAL) { + FF_DEBUG("Skipping local route #%d (scope=%d, type=%d)", routeCount, rtm->rtm_scope, rtm->rtm_type); + continue; + } + FF_DEBUG("Processing IPv6 default route candidate #%d", routeCount); entry = (__typeof__(entry)) { }; // Default to zero metric (no RTA_PRIORITY found) From bdc867031a6d7588e92353c961be651777b1a2b2 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Sun, 4 Jan 2026 10:41:24 +0800 Subject: [PATCH 21/67] TerminalFont (Linux): check `xterm.vt100.faceName` for xterm font detection --- src/detection/terminalfont/terminalfont_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 7eb8c2cef..7b4cbf92f 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -287,6 +287,14 @@ static void detectXterm(FFTerminalFontResult* terminalFont) {"xterm*faceSize:", &fontSize}, }); + if (fontName.length == 0) + { + ffParsePropFileHomeValues(".Xresources", 2, (FFpropquery[]) { + {"xterm.vt100.faceName:", &fontName}, + {"xterm.vt100.faceSize:", &fontSize}, + }); + } + if (fontName.length == 0) ffStrbufAppendS(&fontName, "fixed"); if (fontSize.length == 0) From e23edae91718ebdef09f1d17d320fef2be7803db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 4 Jan 2026 15:37:11 +0800 Subject: [PATCH 22/67] Board (macOS): removes an unused #include --- src/detection/board/board_apple.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/detection/board/board_apple.c b/src/detection/board/board_apple.c index dca906bc3..1a760fd8b 100644 --- a/src/detection/board/board_apple.c +++ b/src/detection/board/board_apple.c @@ -1,6 +1,5 @@ #include "board.h" -#include "common/sysctl.h" #include "util/apple/cf_helpers.h" const char* ffDetectBoard(FFBoardResult* result) From 6f87026b0c16a928b96cce612b2ccd879d1d5f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 4 Jan 2026 15:37:49 +0800 Subject: [PATCH 23/67] Host (macOS): uses `IORegistryEntryFromPath` if applicatable --- src/detection/host/host_apple.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c index d61fbc028..990f6c671 100644 --- a/src/detection/host/host_apple.c +++ b/src/detection/host/host_apple.c @@ -1,13 +1,12 @@ #include "host.h" #include "common/sysctl.h" #include "util/apple/cf_helpers.h" -#include "util/stringUtils.h" #include const char* getProductNameWithIokit(FFstrbuf* result) { - FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t registryEntry = IOServiceGetMatchingService(MACH_PORT_NULL, IOServiceNameMatching("product")); + FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t registryEntry = IORegistryEntryFromPath(MACH_PORT_NULL, "IODeviceTree:/product"); if (!registryEntry) return "IOServiceGetMatchingService() failed"; From 32e3ed1fda34a59691433f1097d1d65eb1f8ad23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 4 Jan 2026 16:45:02 +0800 Subject: [PATCH 24/67] SMC: optimises code --- src/util/apple/smc_temps.c | 205 ++++++++++++++++++------------------- 1 file changed, 100 insertions(+), 105 deletions(-) diff --git a/src/util/apple/smc_temps.c b/src/util/apple/smc_temps.c index d16c6e3d5..bd89b0138 100644 --- a/src/util/apple/smc_temps.c +++ b/src/util/apple/smc_temps.c @@ -156,113 +156,108 @@ static const char *smcReadValue(io_connect_t conn, const UInt32Char_t key, doubl if (val.dataSize == 0) return "Empty SMC result"; - if (ffStrEquals(val.dataType, "ui8 ") || - ffStrEquals(val.dataType, "ui16") || - ffStrEquals(val.dataType, "ui32") || - ffStrEquals(val.dataType, "ui64")) + switch (val.dataType[0]) { - uint64_t tmp = 0; - for (uint32_t i = 0; i < val.dataSize; i++) - tmp += (uint64_t)((uint8_t)(val.bytes[i]) * pow(256, val.dataSize - 1 - i)); - *value = (double)tmp; + case 'u': // unsigned integer types + if (val.dataType[1] == 'i') + { + switch (val.dataSize) + { + case 1: *value = *(uint8_t *)(val.bytes); break; + case 2: *value = ntohs(*(uint16_t *)(val.bytes)); break; + case 4: *value = ntohl(*(uint32_t *)(val.bytes)); break; + case 8: *value = ntohll(*(uint64_t *)(val.bytes)); break; + default: + return "Unsupported SMC unsigned integer data size"; + } + } + else + return "Unsupported SMC unsigned data type"; + break; + + case 'f': // floating point types + if (ffStrEquals(val.dataType, "flt ") && val.dataSize == 4) + *value = *(float *)(val.bytes); + else if (val.dataType[1] == 'p' && val.dataSize == 2) // fixed point types + { + if (ffStrEquals(val.dataType, "fp1f")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 32768.0; + else if (ffStrEquals(val.dataType, "fp4c")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 4096.0; + else if (ffStrEquals(val.dataType, "fp5b")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 2048.0; + else if (ffStrEquals(val.dataType, "fp6a")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 1024.0; + else if (ffStrEquals(val.dataType, "fp79")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 512.0; + else if (ffStrEquals(val.dataType, "fp88")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 256.0; + else if (ffStrEquals(val.dataType, "fpa6")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 64.0; + else if (ffStrEquals(val.dataType, "fpc4")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 16.0; + else if (ffStrEquals(val.dataType, "fpe2")) + *value = ntohs(*(uint16_t *)(val.bytes)) / 4.0; + else + return "Unsupported SMC floating point data type"; + } + else + return "Unsupported SMC floating point data type"; + break; + + case 's': // signed integer types + if (val.dataType[1] == 'i') + { + switch (val.dataSize) + { + case 1: *value = *(int8_t *)(val.bytes); break; + case 2: *value = ntohs(*(int16_t *)(val.bytes)); break; + case 4: *value = ntohl(*(int32_t *)(val.bytes)); break; + case 8: *value = ntohll(*(int64_t *)(val.bytes)); break; + default: return "Unsupported SMC signed integer data size"; + } + } + else if (val.dataType[1] == 'p' && val.dataSize == 2) // signed fixed point types + { + if (ffStrEquals(val.dataType, "sp1e")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 16384.0; + else if (ffStrEquals(val.dataType, "sp3c")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 4096.0; + else if (ffStrEquals(val.dataType, "sp4b")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 2048.0; + else if (ffStrEquals(val.dataType, "sp5a")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 1024.0; + else if (ffStrEquals(val.dataType, "sp69")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 512.0; + else if (ffStrEquals(val.dataType, "sp78")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 256.0; + else if (ffStrEquals(val.dataType, "sp87")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 128.0; + else if (ffStrEquals(val.dataType, "sp96")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 64.0; + else if (ffStrEquals(val.dataType, "spb4")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 16.0; + else if (ffStrEquals(val.dataType, "spf0")) + *value = (int16_t)ntohs(*(int16_t *)(val.bytes)) / 1.0; + else + return "Unsupported SMC signed integer data type"; + } + else + return "Unsupported SMC signed data type"; + break; + + case '{': // special types like pwm + if (ffStrEquals(val.dataType, "{pwm") && val.dataSize == 2) + { + *value = (double)ntohs(*(uint16_t *)(val.bytes)) * 100 / 65536.0; + } + else + return "Unsupported SMC special data type"; + break; + + default: + return "Unsupported SMC data type"; } - else if (ffStrEquals(val.dataType, "flt ")) - { - *value = *(float *)(val.bytes); - } - else if (ffStrEquals(val.dataType, "fp1f") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 32768.0; - } - else if (ffStrEquals(val.dataType, "fp4c") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 4096.0; - } - else if (ffStrEquals(val.dataType, "fp5b") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 2048.0; - } - else if (ffStrEquals(val.dataType, "fp6a") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 1024.0; - } - else if (ffStrEquals(val.dataType, "fp79") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 512.0; - } - else if (ffStrEquals(val.dataType, "fp88") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 256.0; - } - else if (ffStrEquals(val.dataType, "fpa6") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 64.0; - } - else if (ffStrEquals(val.dataType, "fpc4") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 16.0; - } - else if (ffStrEquals(val.dataType, "fpe2") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 4.0; - } - else if (ffStrEquals(val.dataType, "sp1e") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 16384.0; - } - else if (ffStrEquals(val.dataType, "sp3c") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 4096.0; - } - else if (ffStrEquals(val.dataType, "sp4b") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 2048.0; - } - else if (ffStrEquals(val.dataType, "sp5a") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 1024.0; - } - else if (ffStrEquals(val.dataType, "sp69") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 512.0; - } - else if (ffStrEquals(val.dataType, "sp78") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 256.0; - } - else if (ffStrEquals(val.dataType, "sp87") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 128.0; - } - else if (ffStrEquals(val.dataType, "sp96") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 64.0; - } - else if (ffStrEquals(val.dataType, "spb4") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 16.0; - } - else if (ffStrEquals(val.dataType, "spf0") && val.dataSize == 2) - { - *value = ntohs(*(uint16_t *)(val.bytes)) / 1.0; - } - else if (ffStrEquals(val.dataType, "si8 ") && val.dataSize == 1) - { - signed char *bytes = (signed char *)val.bytes; - int16_t temp = 0; - temp += (int8_t)(bytes[0]); - *value = temp; - } - else if (ffStrEquals(val.dataType, "si16") && val.dataSize == 2) - { - *value = ntohs(*(int16_t *)(val.bytes)); - } - else if (ffStrEquals(val.dataType, "{pwm") && val.dataSize == 2) - { - *value = (double)ntohs(*(uint16_t *)(val.bytes)) * 100 / 65536.0; - } - else - return "Unknown SMC data type"; return NULL; } From b21f35e9140e8b01f1974a234955a81bdba1c78c Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 5 Jan 2026 10:45:19 +0800 Subject: [PATCH 25/67] CMake (Hurd): defines `O_PATH=0` --- CMakeLists.txt | 3 +-- src/detection/cpu/cpu_linux.c | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 860cdd387..18ae01633 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1410,9 +1410,8 @@ elseif(NetBSD) elseif(Haiku) target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) elseif(GNU) - target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) # On Hurd PATH_MAX is not defined. Set an arbitrary limit as workaround. - target_compile_definitions(libfastfetch PUBLIC PATH_MAX=4096) + target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE PATH_MAX=4096 O_PATH=0) endif() if(WIN32) diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index db9e4ce7e..9edcac48f 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -14,10 +14,6 @@ #define FF_CPUINFO_PATH "/proc/cpuinfo" -#ifndef O_PATH -#define O_PATH 0 -#endif - static double readTempFile(int dfd, const char* filename, FFstrbuf* buffer) { if (filename ? !ffReadFileBufferRelative(dfd, filename, buffer) : !ffReadFDBuffer(dfd, buffer)) From 18c3cd2e663cf9c4b3fc652b213c89f63442b1a4 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 5 Jan 2026 10:50:55 +0800 Subject: [PATCH 26/67] CPU (Linux): fixes speed detection on s390x Fixes #2129 --- src/detection/cpu/cpu_linux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index 9edcac48f..bdb567700 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -469,9 +469,9 @@ static const char* parseCpuInfo( (cpuIsa->length == 0 && ffParsePropLine(line, "isa :", cpuIsa)) || (cpuUarch->length == 0 && ffParsePropLine(line, "uarch :", cpuUarch)) || #elif __s390x__ - (cpu->name.length == 0 && ffParsePropLine(line, "processor 0:", &cpu->name)) || + (cpu->name.length == 0 && ffParsePropLine(line, "machine :", &cpu->name)) || (cpu->vendor.length == 0 && ffParsePropLine(line, "vendor_id :", &cpu->vendor)) || - (cpuMHz->length == 0 && ffParsePropLine(line, "cpu MHz static :", cpuMHz)) || // This one cannot be detected because of early return + (cpuMHz->length == 0 && ffParsePropLine(line, "cpu MHz static :", cpuMHz)) || #elif __ia64__ (cpu->name.length == 0 && ffParsePropLine(line, "model name :", &cpu->name)) || (cpu->vendor.length == 0 && ffParsePropLine(line, "vendor :", &cpu->vendor)) || @@ -931,8 +931,7 @@ FF_MAYBE_UNUSED static const char* detectCPUOthers(const FFCPUOptions* options, cpu->coresPhysical = getLoongarchPropCount(&cpuinfo, "\ncore\t\t\t:"); if (cpu->packages > 1) cpu->coresPhysical *= cpu->packages; #elif __s390x__ - if (ffStrbufSubstrAfterFirstS(&cpu->name, "machine = ")) - ffStrbufPrependS(&cpu->name, "Machine "); + if (cpu->name.length) ffStrbufPrependS(&cpu->name, "Machine "); #endif } From 8c86003220d1a31e697070797f07386fd255fc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 5 Jan 2026 14:51:27 +0800 Subject: [PATCH 27/67] Common: introduces `FF_LIBRARY_LOAD_MESSAGE` to simplify library-loading --- src/common/library.h | 11 +++++++++++ src/common/networking/networking_common.c | 2 +- src/detection/bluetooth/bluetooth_windows.c | 2 +- src/detection/bluetoothradio/bluetoothradio_windows.c | 2 +- src/detection/brightness/brightness_linux.c | 2 +- src/detection/brightness/brightness_windows.cpp | 2 +- src/detection/camera/camera_windows.cpp | 4 ++-- src/detection/de/de_linux.c | 2 +- src/detection/displayserver/linux/drm.c | 2 +- src/detection/displayserver/linux/wayland/wayland.c | 2 +- src/detection/displayserver/linux/xcb.c | 2 +- src/detection/displayserver/linux/xlib.c | 2 +- src/detection/gpu/gpu_bsd.c | 2 +- src/detection/gpu/gpu_drm.c | 2 +- src/detection/gpu/gpu_general.c | 2 +- src/detection/gpu/gpu_nvidia.c | 2 +- src/detection/gpu/gpu_wsl.cpp | 2 +- src/detection/lm/lm_linux.c | 2 +- src/detection/media/media_windows.c | 2 +- src/detection/opencl/opencl.c | 10 +++++----- src/detection/opengl/opengl_linux.c | 2 +- src/detection/opengl/opengl_shared.c | 2 +- src/detection/opengl/opengl_windows.c | 2 +- src/detection/os/os_windows.cpp | 2 +- src/detection/sound/sound_linux.c | 2 +- src/detection/terminalfont/terminalfont_android.c | 2 +- src/detection/tpm/tpm_windows.c | 2 +- src/detection/vulkan/vulkan.c | 2 +- src/detection/wifi/wifi_windows.c | 2 +- src/detection/zpool/zpool.c | 2 +- src/util/binary_linux.c | 2 +- 31 files changed, 46 insertions(+), 35 deletions(-) diff --git a/src/common/library.h b/src/common/library.h index b208e127e..2a3b30008 100644 --- a/src/common/library.h +++ b/src/common/library.h @@ -38,6 +38,14 @@ static inline void ffLibraryUnload(void** handle) if(libraryObjectName == NULL) \ return returnValue; +#if _WIN32 +#define FF_LIBRARY_LOAD_MESSAGE(libraryObjectName, libraryFileName, maxVersion, ...) \ + FF_LIBRARY_LOAD(libraryObjectName, "LoadLibraryA(" libraryFileName ") failed", libraryFileName, maxVersion, ##__VA_ARGS__) +#else +#define FF_LIBRARY_LOAD_MESSAGE(libraryObjectName, libraryFileName, maxVersion, ...) \ + FF_LIBRARY_LOAD(libraryObjectName, "dlopen(" libraryFileName ") failed", libraryFileName, maxVersion, ##__VA_ARGS__) +#endif + #define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \ symbolMapping = (__typeof__(&symbolName)) dlsym(library, #symbolName); \ if(symbolMapping == NULL) \ @@ -73,6 +81,9 @@ void* ffLibraryLoad(const char* path, int maxVersion, ...); #define FF_LIBRARY_LOAD(libraryObjectName, returnValue, ...) \ FF_MAYBE_UNUSED void* libraryObjectName = NULL; // Placeholder +#define FF_LIBRARY_LOAD_MESSAGE(libraryObjectName, libraryFileName, maxVersion, ...) \ + FF_LIBRARY_LOAD(libraryObjectName, , libraryFileName, maxVersion, ##__VA_ARGS__) + #define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \ symbolMapping = (__typeof__(&symbolName)) &symbolName; diff --git a/src/common/networking/networking_common.c b/src/common/networking/networking_common.c index df04eb3f0..a330dd5f7 100644 --- a/src/common/networking/networking_common.c +++ b/src/common/networking/networking_common.c @@ -22,7 +22,7 @@ const char* ffNetworkingLoadZlibLibrary(void) if (!zlibData.inited) { zlibData.inited = true; - FF_LIBRARY_LOAD(zlib, "dlopen libz failed", + FF_LIBRARY_LOAD_MESSAGE(zlib, #ifdef _WIN32 "zlib1" #else diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c index 5da75fc83..8f1a685d3 100644 --- a/src/detection/bluetooth/bluetooth_windows.c +++ b/src/detection/bluetooth/bluetooth_windows.c @@ -10,7 +10,7 @@ const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FFBluetoothResult */) { // Actually bluetoothapis.dll, but it's missing on Windows 7 - FF_LIBRARY_LOAD(bluetoothapis, "dlopen bthprops.cpl failed", "bthprops.cpl", 1) + FF_LIBRARY_LOAD_MESSAGE(bluetoothapis, "bthprops.cpl", 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindFirstDevice) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindNextDevice) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindDeviceClose) diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c index 6519115a0..2fc94d6b3 100644 --- a/src/detection/bluetoothradio/bluetoothradio_windows.c +++ b/src/detection/bluetoothradio/bluetoothradio_windows.c @@ -54,7 +54,7 @@ static_assert(sizeof(BTH_LOCAL_RADIO_INFO) == 292, "BTH_LOCAL_RADIO_INFO should const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */) { // Actually bluetoothapis.dll, but it's missing on Windows 7 - FF_LIBRARY_LOAD(bluetoothapis, "dlopen bthprops.cpl failed", "bthprops.cpl", 1) + FF_LIBRARY_LOAD_MESSAGE(bluetoothapis, "bthprops.cpl", 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindFirstRadio) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindNextRadio) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindRadioClose) diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c index da6825111..bff5f173c 100644 --- a/src/detection/brightness/brightness_linux.c +++ b/src/detection/brightness/brightness_linux.c @@ -102,7 +102,7 @@ DDCA_Status ddca_init(const char *libopts, int syslog_level, int opts); static const char* detectWithDdcci(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result) { - FF_LIBRARY_LOAD(libddcutil, "dlopen ddcutil failed", "libddcutil" FF_LIBRARY_EXTENSION, 5); + FF_LIBRARY_LOAD_MESSAGE(libddcutil, "libddcutil" FF_LIBRARY_EXTENSION, 5); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_get_display_info_list2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_open_display2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_get_any_vcp_value_using_explicit_type) diff --git a/src/detection/brightness/brightness_windows.cpp b/src/detection/brightness/brightness_windows.cpp index 401a16686..493347670 100644 --- a/src/detection/brightness/brightness_windows.cpp +++ b/src/detection/brightness/brightness_windows.cpp @@ -40,7 +40,7 @@ static const char* detectWithWmi(FFlist* result) static const char* detectWithDdcci(const FFDisplayServerResult* displayServer, FFlist* result) { - FF_LIBRARY_LOAD(dxva2, "dlopen dxva2" FF_LIBRARY_EXTENSION " failed", "dxva2" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(dxva2, "dxva2" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dxva2, GetPhysicalMonitorsFromHMONITOR) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dxva2, GetMonitorBrightness) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dxva2, DestroyPhysicalMonitor) diff --git a/src/detection/camera/camera_windows.cpp b/src/detection/camera/camera_windows.cpp index 3da687494..356945158 100644 --- a/src/detection/camera/camera_windows.cpp +++ b/src/detection/camera/camera_windows.cpp @@ -21,9 +21,9 @@ private: extern "C" const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result) { - FF_LIBRARY_LOAD(mfplat, "dlopen mfplat" FF_LIBRARY_EXTENSION " failed", "mfplat" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(mfplat, "mfplat" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(mfplat, MFCreateAttributes) - FF_LIBRARY_LOAD(mf, "dlopen mf" FF_LIBRARY_EXTENSION " failed", "mf" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(mf, "mf" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(mf, MFEnumDeviceSources) const char* error = ffInitCom(); diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index dc333c53f..10a0a7cac 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -133,7 +133,7 @@ static const char* getXfce4ByLib(FFstrbuf* result) { #ifndef FF_DISABLE_DLOPEN const char* xfce_version_string(void); // from `xfce4/libxfce4util/xfce-misutils.h - FF_LIBRARY_LOAD(xfce4util, "dlopen libxfce4util" FF_LIBRARY_EXTENSION "failed", "libxfce4util" FF_LIBRARY_EXTENSION, 7); + FF_LIBRARY_LOAD_MESSAGE(xfce4util, "libxfce4util" FF_LIBRARY_EXTENSION, 7); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xfce4util, xfce_version_string); ffStrbufSetS(result, ffxfce_version_string()); return NULL; diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c index 141b49466..1552785b6 100644 --- a/src/detection/displayserver/linux/drm.c +++ b/src/detection/displayserver/linux/drm.c @@ -214,7 +214,7 @@ FF_MAYBE_UNUSED static const char* drmGetEdidByConnId(uint32_t connId, uint8_t* static const char* drmConnectLibdrm(FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(libdrm, "dlopen libdrm" FF_LIBRARY_EXTENSION " failed", "libdrm" FF_LIBRARY_EXTENSION, 2) + FF_LIBRARY_LOAD_MESSAGE(libdrm, "libdrm" FF_LIBRARY_EXTENSION, 2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmGetDevices) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetResources) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetConnectorCurrent) diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index 843bab93a..7f351edbf 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -215,7 +215,7 @@ const char* ffdsConnectWayland(FFDisplayServerResult* result) if (getenv("XDG_RUNTIME_DIR") == NULL) return "Wayland requires $XDG_RUNTIME_DIR being set"; - FF_LIBRARY_LOAD(wayland, false, "libwayland-client" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(wayland, "libwayland-client" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wayland, wl_display_connect) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wayland, wl_display_get_fd) diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c index d00020c10..d7022e343 100644 --- a/src/detection/displayserver/linux/xcb.c +++ b/src/detection/displayserver/linux/xcb.c @@ -357,7 +357,7 @@ static void xcbRandrHandleScreen(XcbRandrData* data, xcb_screen_t* screen) const char* ffdsConnectXcbRandr(FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(xcbRandr, "dlopen libxcb-randr failed", "libxcb-randr" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(xcbRandr, "libxcb-randr" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcbRandr, xcb_connect) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcbRandr, xcb_connection_has_error) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xcbRandr, xcb_get_setup) diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c index 0d7aeea29..44884e940 100644 --- a/src/detection/displayserver/linux/xlib.c +++ b/src/detection/displayserver/linux/xlib.c @@ -298,7 +298,7 @@ static void xrandrHandleScreen(XrandrData* data, Screen* screen) const char* ffdsConnectXrandr(FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(xrandr, "dlopen libXrandr failed", "libXrandr" FF_LIBRARY_EXTENSION, 3) + FF_LIBRARY_LOAD_MESSAGE(xrandr, "libXrandr" FF_LIBRARY_EXTENSION, 3) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xrandr, XOpenDisplay) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xrandr, XCloseDisplay) diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c index 6684a2ae0..1a5ac8b44 100644 --- a/src/detection/gpu/gpu_bsd.c +++ b/src/detection/gpu/gpu_bsd.c @@ -43,7 +43,7 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu) static const char* detectByDrm(const FFGPUOptions* options, FFlist* gpus) { - FF_LIBRARY_LOAD(libdrm, "dlopen libdrm" FF_LIBRARY_EXTENSION " failed", "libdrm" FF_LIBRARY_EXTENSION, 2) + FF_LIBRARY_LOAD_MESSAGE(libdrm, "libdrm" FF_LIBRARY_EXTENSION, 2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmGetDevices) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmFreeDevices) diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c index 9304e6f16..78372a55a 100644 --- a/src/detection/gpu/gpu_drm.c +++ b/src/detection/gpu/gpu_drm.c @@ -79,7 +79,7 @@ const char* ffDrmDetectRadeon(const FFGPUOptions* options, FFGPUResult* gpu, con const char* ffDrmDetectAmdgpu(const FFGPUOptions* options, FFGPUResult* gpu, const char* renderPath) { #if FF_HAVE_DRM_AMDGPU - FF_LIBRARY_LOAD(libdrm, "dlopen libdrm_amdgpu" FF_LIBRARY_EXTENSION " failed", "libdrm_amdgpu" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(libdrm, "libdrm_amdgpu" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_device_initialize) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_get_marketing_name) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_query_gpu_info) diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c index 504509fa2..5b1c8e77e 100644 --- a/src/detection/gpu/gpu_general.c +++ b/src/detection/gpu/gpu_general.c @@ -9,7 +9,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpus) { - FF_LIBRARY_LOAD(pciaccess, "Failed to load libpciaccess" FF_LIBRARY_EXTENSION, "libpciaccess" FF_LIBRARY_EXTENSION, 0) + FF_LIBRARY_LOAD_MESSAGE(pciaccess, "libpciaccess" FF_LIBRARY_EXTENSION, 0) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(pciaccess, pci_system_init) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(pciaccess, pci_slot_match_iterator_create) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(pciaccess, pci_device_next) diff --git a/src/detection/gpu/gpu_nvidia.c b/src/detection/gpu/gpu_nvidia.c index 9e9eb1e12..983fb326c 100644 --- a/src/detection/gpu/gpu_nvidia.c +++ b/src/detection/gpu/gpu_nvidia.c @@ -40,7 +40,7 @@ static const char* detectMoreByNvapi(FFGpuDriverResult* result) { nvapiData.inited = true; - FF_LIBRARY_LOAD(libnvapi, "dlopen nvapi failed", + FF_LIBRARY_LOAD_MESSAGE(libnvapi, #ifdef _WIN64 "nvapi64.dll" #else diff --git a/src/detection/gpu/gpu_wsl.cpp b/src/detection/gpu/gpu_wsl.cpp index 55cd34fae..f2351a9e0 100644 --- a/src/detection/gpu/gpu_wsl.cpp +++ b/src/detection/gpu/gpu_wsl.cpp @@ -28,7 +28,7 @@ private: extern "C" const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpus) { - FF_LIBRARY_LOAD(libdxcore, "dlopen libdxcore.so failed", "/usr/lib/wsl/lib/libdxcore" FF_LIBRARY_EXTENSION, 4) + FF_LIBRARY_LOAD_MESSAGE(libdxcore, "/usr/lib/wsl/lib/libdxcore" FF_LIBRARY_EXTENSION, 4) // DXCoreCreateAdapterFactory is a reloaded function, so we can't use FF_LIBRARY_LOAD_SYMBOL_MESSAGE here typedef HRESULT (*DXCoreCreateAdapterFactory_t)(REFIID riid, void** ppvFactory); diff --git a/src/detection/lm/lm_linux.c b/src/detection/lm/lm_linux.c index cfb64b9a4..c336e5796 100644 --- a/src/detection/lm/lm_linux.c +++ b/src/detection/lm/lm_linux.c @@ -54,7 +54,7 @@ static const char* getSshdVersion(FFstrbuf* version) static const char* getSddmVersion(FFstrbuf* version) { - FF_LIBRARY_LOAD(zlib, "dlopen libz failed", "libz" FF_LIBRARY_EXTENSION, 2) + FF_LIBRARY_LOAD_MESSAGE(zlib, "libz" FF_LIBRARY_EXTENSION, 2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(zlib, gzopen) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(zlib, gzread) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(zlib, gzerror) diff --git a/src/detection/media/media_windows.c b/src/detection/media/media_windows.c index 899b6551a..fa55b09be 100644 --- a/src/detection/media/media_windows.c +++ b/src/detection/media/media_windows.c @@ -5,7 +5,7 @@ static const char* getMedia(FFMediaResult* media, bool saveCover) { - FF_LIBRARY_LOAD(libffwinrt, "dlopen libffwinrt" FF_LIBRARY_EXTENSION " failed", "libffwinrt" FF_LIBRARY_EXTENSION, 0) + FF_LIBRARY_LOAD_MESSAGE(libffwinrt, "libffwinrt" FF_LIBRARY_EXTENSION, 0) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libffwinrt, ffWinrtDetectMedia) libffwinrt = NULL; // Don't close libffwinrt or it may crash diff --git a/src/detection/opencl/opencl.c b/src/detection/opencl/opencl.c index 393202ebe..6d55d8ac7 100644 --- a/src/detection/opencl/opencl.c +++ b/src/detection/opencl/opencl.c @@ -167,11 +167,11 @@ static const char* detectOpenCL(FFOpenCLResult* result) #ifndef __APPLE__ - FF_LIBRARY_LOAD(opencl, "dlopen libOpenCL" FF_LIBRARY_EXTENSION" failed", - #ifdef _WIN32 - "OpenCL"FF_LIBRARY_EXTENSION, -1, - #endif - "libOpenCL"FF_LIBRARY_EXTENSION, 1 + FF_LIBRARY_LOAD_MESSAGE(opencl, + #ifdef _WIN32 + "OpenCL" FF_LIBRARY_EXTENSION, -1, + #endif + "libOpenCL" FF_LIBRARY_EXTENSION, 1 ); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetPlatformIDs); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetPlatformInfo); diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c index 424cbfe25..b227ebb99 100644 --- a/src/detection/opengl/opengl_linux.c +++ b/src/detection/opengl/opengl_linux.c @@ -127,7 +127,7 @@ static const char* detectByGlx(FFOpenGLResult* result) { GLXData data; - FF_LIBRARY_LOAD(glx, "dlopen glx failed", + FF_LIBRARY_LOAD_MESSAGE(glx, #if !__OpenBSD__ && !__NetBSD__ "libGLX" #else diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c index 30612602d..d1a263a86 100644 --- a/src/detection/opengl/opengl_shared.c +++ b/src/detection/opengl/opengl_shared.c @@ -140,7 +140,7 @@ const char* ffOpenGLDetectByEGL(FFOpenGLResult* result) { EGLData eglData; - FF_LIBRARY_LOAD(egl, "dlopen libEGL" FF_LIBRARY_EXTENSION " failed", "libEGL" FF_LIBRARY_EXTENSION, 1); + FF_LIBRARY_LOAD_MESSAGE(egl, "libEGL" FF_LIBRARY_EXTENSION, 1); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(egl, eglData, eglGetProcAddress); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(egl, eglData, eglGetDisplay); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(egl, eglData, eglQueryString); diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c index 8faa27dc4..50e0e88da 100644 --- a/src/detection/opengl/opengl_windows.c +++ b/src/detection/opengl/opengl_windows.c @@ -72,7 +72,7 @@ static const char* wglHandlePixelFormat(WGLData* wglData, FFOpenGLResult* result static const char* wglDetectOpenGL(FFOpenGLResult* result) { - FF_LIBRARY_LOAD(opengl32, "dlopen opengl32" FF_LIBRARY_EXTENSION " failed", "opengl32" FF_LIBRARY_EXTENSION, 1); + FF_LIBRARY_LOAD_MESSAGE(opengl32, "opengl32" FF_LIBRARY_EXTENSION, 1); WGLData data = {}; diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp index 39ce406e4..522756c29 100644 --- a/src/detection/os/os_windows.cpp +++ b/src/detection/os/os_windows.cpp @@ -48,7 +48,7 @@ static bool getCodeName(FFOSResult* os) static const char* getOsNameByWinbrand(FFstrbuf* osName) { //https://dennisbabkin.com/blog/?t=how-to-tell-the-real-version-of-windows-your-app-is-running-on#ver_string - FF_LIBRARY_LOAD(winbrand, "dlopen winbrand" FF_LIBRARY_EXTENSION " failed", "winbrand" FF_LIBRARY_EXTENSION, 1); + FF_LIBRARY_LOAD_MESSAGE(winbrand, "winbrand" FF_LIBRARY_EXTENSION, 1); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(winbrand, BrandingFormatString); const wchar_t* rawName = ffBrandingFormatString(L"%WINDOWS_LONG%"); diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c index f97379331..675859768 100644 --- a/src/detection/sound/sound_linux.c +++ b/src/detection/sound/sound_linux.c @@ -46,7 +46,7 @@ static void paServerInfoCallback(FF_MAYBE_UNUSED pa_context *c, const pa_server_ static const char* detectSound(FFlist* devices) { - FF_LIBRARY_LOAD(pulse, "Failed to load libpulse" FF_LIBRARY_EXTENSION, "libpulse" FF_LIBRARY_EXTENSION, 0) + FF_LIBRARY_LOAD_MESSAGE(pulse, "libpulse" FF_LIBRARY_EXTENSION, 0) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(pulse, pa_mainloop_new) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(pulse, pa_mainloop_get_api) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(pulse, pa_mainloop_iterate) diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c index 9727fb6b6..dc9c59f46 100644 --- a/src/detection/terminalfont/terminalfont_android.c +++ b/src/detection/terminalfont/terminalfont_android.c @@ -21,7 +21,7 @@ const char* detectTermux(FFTerminalFontResult* terminalFont) #ifdef FF_HAVE_FREETYPE - FF_LIBRARY_LOAD(freetype, "dlopen libfreetype"FF_LIBRARY_EXTENSION " failed", "libfreetype"FF_LIBRARY_EXTENSION, 2) + FF_LIBRARY_LOAD_MESSAGE(freetype, "libfreetype" FF_LIBRARY_EXTENSION, 2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(freetype, FT_Init_FreeType); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(freetype, FT_New_Face); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(freetype, FT_Done_Face); diff --git a/src/detection/tpm/tpm_windows.c b/src/detection/tpm/tpm_windows.c index 4f381889c..32ec92da9 100644 --- a/src/detection/tpm/tpm_windows.c +++ b/src/detection/tpm/tpm_windows.c @@ -6,7 +6,7 @@ const char* ffDetectTPM(FFTPMResult* result) { - FF_LIBRARY_LOAD(tbs, "dlopen TBS" FF_LIBRARY_EXTENSION " failed", "TBS" FF_LIBRARY_EXTENSION, -1) + FF_LIBRARY_LOAD_MESSAGE(tbs, "TBS" FF_LIBRARY_EXTENSION, -1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(tbs, Tbsi_GetDeviceInfo) TPM_DEVICE_INFO deviceInfo = {}; diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 43747d241..3ff3b38c0 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -39,7 +39,7 @@ static void applyDriverName(VkPhysicalDeviceDriverPropertiesKHR* properties, FFs static const char* detectVulkan(FFVulkanResult* result) { - FF_LIBRARY_LOAD(vulkan, "dlopen libvulkan" FF_LIBRARY_EXTENSION " failed", + FF_LIBRARY_LOAD_MESSAGE(vulkan, #if __APPLE__ "libMoltenVK" FF_LIBRARY_EXTENSION, -1 #elif _WIN32 diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c index e93b56d79..c0b539231 100644 --- a/src/detection/wifi/wifi_windows.c +++ b/src/detection/wifi/wifi_windows.c @@ -43,7 +43,7 @@ static void convertIfStateToString(WLAN_INTERFACE_STATE state, FFstrbuf* result) const char* ffDetectWifi(FFlist* result) { - FF_LIBRARY_LOAD(wlanapi, "dlopen wlanapi" FF_LIBRARY_EXTENSION " failed", "wlanapi" FF_LIBRARY_EXTENSION, 1) + FF_LIBRARY_LOAD_MESSAGE(wlanapi, "wlanapi" FF_LIBRARY_EXTENSION, 1) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanOpenHandle) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanEnumInterfaces) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanQueryInterface) diff --git a/src/detection/zpool/zpool.c b/src/detection/zpool/zpool.c index 67e121b85..fcf37b0f2 100644 --- a/src/detection/zpool/zpool.c +++ b/src/detection/zpool/zpool.c @@ -72,7 +72,7 @@ static int enumZpoolCallback(zpool_handle_t* zpool, void* param) const char* ffDetectZpool(FFlist* result /* list of FFZpoolResult */) { - FF_LIBRARY_LOAD(libzfs, "dlopen libzfs" FF_LIBRARY_EXTENSION " failed", "libzfs" FF_LIBRARY_EXTENSION, 6); + FF_LIBRARY_LOAD_MESSAGE(libzfs, "libzfs" FF_LIBRARY_EXTENSION, 6); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libzfs, libzfs_init); libzfs_handle_t* handle = fflibzfs_init(); diff --git a/src/util/binary_linux.c b/src/util/binary_linux.c index a723243cd..ce3a0b8ae 100644 --- a/src/util/binary_linux.c +++ b/src/util/binary_linux.c @@ -42,7 +42,7 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s if (!elfData.inited) { elfData.inited = true; - FF_LIBRARY_LOAD(libelf, "dlopen libelf" FF_LIBRARY_EXTENSION " failed", "libelf" FF_LIBRARY_EXTENSION, 1); + FF_LIBRARY_LOAD_MESSAGE(libelf, "libelf" FF_LIBRARY_EXTENSION, 1); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libelf, elfData, elf_version) if (elfData.ffelf_version(EV_CURRENT) == EV_NONE) return "elf_version() failed"; From 1e43e35857510a0c5b8d338844d61cc133bd102b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 5 Jan 2026 16:19:47 +0800 Subject: [PATCH 28/67] Chore: merges `common/*` into `util/*` --- CMakeLists.txt | 144 +++++++++--------- src/detection/battery/battery_android.c | 4 +- src/detection/battery/battery_bsd.c | 4 +- src/detection/battery/battery_haiku.c | 2 +- src/detection/battery/battery_linux.c | 2 +- src/detection/battery/battery_nbsd.c | 2 +- src/detection/battery/battery_obsd.c | 2 +- src/detection/battery/battery_windows.c | 2 +- src/detection/bios/bios_android.c | 2 +- src/detection/bios/bios_bsd.c | 6 +- src/detection/bios/bios_linux.c | 2 +- src/detection/bios/bios_nbsd.c | 2 +- src/detection/bios/bios_windows.c | 2 +- src/detection/bluetooth/bluetooth_haiku.cpp | 2 +- src/detection/bluetooth/bluetooth_linux.c | 4 +- src/detection/bluetooth/bluetooth_windows.c | 2 +- .../bluetoothradio/bluetoothradio_apple.m | 2 +- .../bluetoothradio/bluetoothradio_linux.c | 4 +- .../bluetoothradio/bluetoothradio_windows.c | 4 +- src/detection/board/board_android.c | 2 +- src/detection/board/board_bsd.c | 2 +- src/detection/board/board_linux.c | 2 +- src/detection/board/board_nbsd.c | 2 +- src/detection/bootmgr/bootmgr_apple.c | 2 +- src/detection/bootmgr/bootmgr_bsd.c | 2 +- src/detection/bootmgr/bootmgr_linux.c | 2 +- src/detection/bootmgr/bootmgr_windows.c | 2 +- src/detection/brightness/brightness_bsd.c | 2 +- src/detection/brightness/brightness_linux.c | 4 +- src/detection/brightness/brightness_nbsd.c | 2 +- src/detection/brightness/brightness_obsd.c | 2 +- .../brightness/brightness_windows.cpp | 2 +- src/detection/btrfs/btrfs_linux.c | 2 +- src/detection/camera/camera_android.c | 4 +- src/detection/camera/camera_apple.m | 2 +- src/detection/camera/camera_linux.c | 2 +- src/detection/camera/camera_windows.cpp | 2 +- src/detection/chassis/chassis_bsd.c | 2 +- src/detection/chassis/chassis_linux.c | 2 +- src/detection/chassis/chassis_nbsd.c | 2 +- src/detection/command/command.c | 4 +- src/detection/cpu/cpu.c | 2 +- src/detection/cpu/cpu_apple.c | 2 +- src/detection/cpu/cpu_bsd.c | 2 +- src/detection/cpu/cpu_linux.c | 8 +- src/detection/cpu/cpu_nbsd.c | 4 +- src/detection/cpu/cpu_obsd.c | 2 +- src/detection/cpu/cpu_sunos.c | 2 +- src/detection/cpucache/cpucache_apple.c | 2 +- src/detection/cpucache/cpucache_linux.c | 2 +- src/detection/cpuusage/cpuusage.c | 2 +- src/detection/cpuusage/cpuusage_linux.c | 2 +- src/detection/cursor/cursor_linux.c | 6 +- src/detection/de/de_linux.c | 12 +- src/detection/disk/disk_linux.c | 2 +- src/detection/disk/disk_sunos.c | 2 +- src/detection/disk/disk_windows.c | 4 +- src/detection/diskio/diskio.c | 2 +- src/detection/diskio/diskio_linux.c | 4 +- src/detection/diskio/diskio_windows.c | 2 +- .../displayserver/displayserver_android.c | 4 +- .../displayserver/linux/displayserver_linux.c | 4 +- src/detection/displayserver/linux/drm.c | 4 +- .../displayserver/linux/wayland/wayland.c | 4 +- .../displayserver/linux/wayland/wayland.h | 2 +- src/detection/displayserver/linux/wmde.c | 4 +- src/detection/displayserver/linux/xcb.c | 4 +- src/detection/displayserver/linux/xlib.c | 4 +- src/detection/dns/dns_apple.c | 2 +- src/detection/dns/dns_linux.c | 2 +- src/detection/dns/dns_windows.c | 2 +- src/detection/editor/editor.c | 4 +- src/detection/font/font_apple.m | 4 +- src/detection/font/font_linux.c | 4 +- src/detection/gamepad/gamepad_bsd.c | 2 +- src/detection/gamepad/gamepad_linux.c | 2 +- src/detection/gamepad/gamepad_windows.c | 2 +- src/detection/gpu/gpu_amd.c | 2 +- src/detection/gpu/gpu_android.c | 2 +- src/detection/gpu/gpu_bsd.c | 4 +- src/detection/gpu/gpu_drm.c | 4 +- src/detection/gpu/gpu_general.c | 4 +- src/detection/gpu/gpu_haiku.c | 2 +- src/detection/gpu/gpu_intel.c | 2 +- src/detection/gpu/gpu_linux.c | 6 +- src/detection/gpu/gpu_mthreads.c | 2 +- src/detection/gpu/gpu_nbsd.c | 2 +- src/detection/gpu/gpu_nvidia.c | 2 +- src/detection/gpu/gpu_obsd.c | 2 +- src/detection/gpu/gpu_pci.c | 4 +- src/detection/gpu/gpu_windows.c | 2 +- src/detection/gpu/gpu_wsl.cpp | 2 +- src/detection/gtk_qt/gtk.c | 6 +- src/detection/gtk_qt/qt.c | 6 +- src/detection/host/host_android.c | 3 +- src/detection/host/host_apple.c | 2 +- src/detection/host/host_bsd.c | 2 +- src/detection/host/host_linux.c | 4 +- src/detection/host/host_nbsd.c | 2 +- src/detection/host/host_obsd.c | 2 +- src/detection/icons/icons_linux.c | 2 +- src/detection/initsystem/initsystem_haiku.c | 2 +- src/detection/initsystem/initsystem_linux.c | 2 +- src/detection/keyboard/keyboard_bsd.c | 2 +- src/detection/keyboard/keyboard_linux.c | 2 +- src/detection/keyboard/keyboard_windows.c | 2 +- src/detection/lm/lm_linux.c | 8 +- src/detection/loadavg/loadavg_linux.c | 2 +- src/detection/localip/localip_linux.c | 4 +- src/detection/localip/localip_windows.c | 2 +- src/detection/media/media.c | 2 +- src/detection/media/media_apple.m | 4 +- src/detection/media/media_linux.c | 7 +- src/detection/media/media_windows.c | 2 +- src/detection/memory/memory_bsd.c | 2 +- src/detection/memory/memory_linux.c | 2 +- src/detection/memory/memory_nbsd.c | 2 +- src/detection/memory/memory_obsd.c | 2 +- src/detection/mouse/mouse_bsd.c | 2 +- src/detection/mouse/mouse_linux.c | 2 +- src/detection/mouse/mouse_windows.c | 2 +- src/detection/netio/netio.c | 2 +- src/detection/netio/netio_apple.c | 2 +- src/detection/netio/netio_bsd.c | 2 +- src/detection/netio/netio_haiku.cpp | 2 +- src/detection/netio/netio_linux.c | 4 +- src/detection/netio/netio_sunos.c | 3 +- src/detection/netio/netio_windows.c | 2 +- src/detection/opencl/opencl.c | 4 +- src/detection/opengl/opengl_haiku.cpp | 2 +- src/detection/opengl/opengl_linux.c | 4 +- src/detection/opengl/opengl_shared.c | 4 +- src/detection/opengl/opengl_windows.c | 4 +- src/detection/os/os_android.c | 2 +- src/detection/os/os_apple.m | 4 +- src/detection/os/os_linux.c | 8 +- src/detection/os/os_sunos.c | 2 +- src/detection/os/os_windows.cpp | 2 +- src/detection/packages/packages.c | 2 +- src/detection/packages/packages_apple.c | 6 +- src/detection/packages/packages_bsd.c | 2 +- src/detection/packages/packages_haiku.c | 2 +- src/detection/packages/packages_linux.c | 12 +- src/detection/packages/packages_nbsd.c | 2 +- src/detection/packages/packages_nix.c | 4 +- src/detection/packages/packages_obsd.c | 2 +- src/detection/packages/packages_windows.c | 4 +- .../physicaldisk/physicaldisk_haiku.c | 2 +- .../physicaldisk/physicaldisk_linux.c | 4 +- .../physicaldisk/physicaldisk_windows.c | 2 +- .../physicalmemory/physicalmemory_apple.m | 2 +- .../poweradapter/poweradapter_linux.c | 2 +- src/detection/processes/processes_linux.c | 2 +- src/detection/publicip/publicip.c | 2 +- src/detection/sound/sound_bsd.c | 4 +- src/detection/sound/sound_linux.c | 2 +- src/detection/sound/sound_nbsd.c | 2 +- src/detection/sound/sound_sunos.c | 2 +- src/detection/swap/swap_bsd.c | 2 +- src/detection/swap/swap_linux.c | 2 +- src/detection/terminalfont/terminalfont.c | 8 +- src/detection/terminalfont/terminalfont.h | 2 +- .../terminalfont/terminalfont_android.c | 4 +- .../terminalfont/terminalfont_apple.m | 2 +- .../terminalfont/terminalfont_linux.c | 16 +- .../terminalfont/terminalfont_windows.c | 10 +- src/detection/terminalshell/terminalshell.c | 6 +- .../terminalshell/terminalshell_linux.c | 8 +- .../terminalshell/terminalshell_windows.c | 6 +- .../terminalsize/terminalsize_linux.c | 2 +- .../terminalsize/terminalsize_windows.c | 2 +- src/detection/terminaltheme/terminaltheme.c | 2 +- src/detection/theme/theme_linux.c | 2 +- src/detection/tpm/tpm_bsd.c | 2 +- src/detection/tpm/tpm_linux.c | 2 +- src/detection/tpm/tpm_windows.c | 2 +- src/detection/uptime/uptime_bsd.c | 2 +- src/detection/uptime/uptime_haiku.c | 2 +- src/detection/uptime/uptime_linux.c | 4 +- src/detection/uptime/uptime_sunos.c | 3 +- src/detection/uptime/uptime_windows.c | 2 +- src/detection/users/users_linux.c | 4 +- src/detection/users/users_obsd.c | 4 +- src/detection/vulkan/vulkan.c | 6 +- src/detection/wallpaper/wallpaper_apple.m | 2 +- src/detection/wallpaper/wallpaper_linux.c | 2 +- src/detection/weather/weather.c | 2 +- src/detection/wifi/wifi_android.c | 4 +- src/detection/wifi/wifi_apple.m | 2 +- src/detection/wifi/wifi_bsd.c | 2 +- src/detection/wifi/wifi_linux.c | 8 +- src/detection/wifi/wifi_nbsd.c | 2 +- src/detection/wifi/wifi_obsd.c | 2 +- src/detection/wifi/wifi_windows.c | 2 +- src/detection/wm/wm_apple.m | 2 +- src/detection/wm/wm_linux.c | 6 +- src/detection/wm/wm_windows.cpp | 4 +- src/detection/wmtheme/wmtheme_linux.c | 12 +- src/detection/zpool/zpool.c | 2 +- src/fastfetch.c | 10 +- src/flashfetch.c | 2 +- src/logo/builtin.c | 2 +- src/logo/image/im6.c | 2 +- src/logo/image/im7.c | 2 +- src/logo/image/image.c | 8 +- src/logo/logo.c | 10 +- src/modules/battery/battery.c | 12 +- src/modules/battery/option.h | 4 +- src/modules/bios/bios.c | 6 +- src/modules/bios/option.h | 2 +- src/modules/bluetooth/bluetooth.c | 8 +- src/modules/bluetooth/option.h | 4 +- src/modules/bluetoothradio/bluetoothradio.c | 8 +- src/modules/bluetoothradio/option.h | 4 +- src/modules/board/board.c | 6 +- src/modules/board/option.h | 2 +- src/modules/bootmgr/bootmgr.c | 6 +- src/modules/bootmgr/option.h | 2 +- src/modules/break/break.c | 2 +- src/modules/break/option.h | 2 +- src/modules/brightness/brightness.c | 8 +- src/modules/brightness/option.h | 4 +- src/modules/btrfs/btrfs.c | 10 +- src/modules/btrfs/option.h | 4 +- src/modules/camera/camera.c | 6 +- src/modules/camera/option.h | 2 +- src/modules/chassis/chassis.c | 6 +- src/modules/chassis/option.h | 2 +- src/modules/colors/colors.c | 8 +- src/modules/colors/option.h | 2 +- src/modules/command/command.c | 4 +- src/modules/command/option.h | 2 +- src/modules/cpu/cpu.c | 10 +- src/modules/cpu/option.h | 2 +- src/modules/cpucache/cpucache.c | 8 +- src/modules/cpucache/option.h | 2 +- src/modules/cpuusage/cpuusage.c | 8 +- src/modules/cpuusage/option.h | 4 +- src/modules/cursor/cursor.c | 6 +- src/modules/cursor/option.h | 2 +- src/modules/custom/custom.c | 6 +- src/modules/custom/option.h | 2 +- src/modules/datetime/datetime.c | 8 +- src/modules/datetime/option.h | 2 +- src/modules/de/de.c | 6 +- src/modules/de/option.h | 2 +- src/modules/disk/disk.c | 10 +- src/modules/disk/option.h | 4 +- src/modules/diskio/diskio.c | 8 +- src/modules/diskio/option.h | 2 +- src/modules/display/display.c | 8 +- src/modules/display/option.h | 2 +- src/modules/dns/dns.c | 6 +- src/modules/dns/option.h | 2 +- src/modules/editor/editor.c | 6 +- src/modules/editor/option.h | 2 +- src/modules/font/font.c | 6 +- src/modules/font/option.h | 2 +- src/modules/gamepad/gamepad.c | 8 +- src/modules/gamepad/option.h | 2 +- src/modules/gpu/gpu.c | 14 +- src/modules/gpu/option.h | 4 +- src/modules/host/host.c | 6 +- src/modules/host/option.h | 2 +- src/modules/icons/icons.c | 6 +- src/modules/icons/option.h | 2 +- src/modules/initsystem/initsystem.c | 6 +- src/modules/initsystem/option.h | 2 +- src/modules/kernel/kernel.c | 8 +- src/modules/kernel/option.h | 2 +- src/modules/keyboard/keyboard.c | 8 +- src/modules/keyboard/option.h | 2 +- src/modules/lm/lm.c | 6 +- src/modules/lm/option.h | 2 +- src/modules/loadavg/loadavg.c | 8 +- src/modules/loadavg/option.h | 2 +- src/modules/locale/locale.c | 6 +- src/modules/locale/option.h | 2 +- src/modules/localip/localip.c | 6 +- src/modules/localip/option.h | 2 +- src/modules/media/media.c | 6 +- src/modules/media/option.h | 2 +- src/modules/memory/memory.c | 10 +- src/modules/memory/option.h | 4 +- src/modules/monitor/monitor.c | 6 +- src/modules/monitor/option.h | 2 +- src/modules/mouse/mouse.c | 8 +- src/modules/mouse/option.h | 2 +- src/modules/netio/netio.c | 8 +- src/modules/netio/option.h | 2 +- src/modules/opencl/opencl.c | 6 +- src/modules/opencl/option.h | 2 +- src/modules/opengl/opengl.c | 6 +- src/modules/opengl/option.h | 2 +- src/modules/os/option.h | 2 +- src/modules/os/os.c | 8 +- src/modules/packages/option.h | 2 +- src/modules/packages/packages.c | 6 +- src/modules/physicaldisk/option.h | 2 +- src/modules/physicaldisk/physicaldisk.c | 10 +- src/modules/physicalmemory/option.h | 4 +- src/modules/physicalmemory/physicalmemory.c | 10 +- src/modules/player/option.h | 2 +- src/modules/player/player.c | 6 +- src/modules/poweradapter/option.h | 2 +- src/modules/poweradapter/poweradapter.c | 6 +- src/modules/processes/option.h | 2 +- src/modules/processes/processes.c | 6 +- src/modules/publicip/option.h | 2 +- src/modules/publicip/publicip.c | 6 +- src/modules/separator/option.h | 2 +- src/modules/separator/separator.c | 8 +- src/modules/shell/option.h | 2 +- src/modules/shell/shell.c | 6 +- src/modules/sound/option.h | 4 +- src/modules/sound/sound.c | 8 +- src/modules/swap/option.h | 4 +- src/modules/swap/swap.c | 10 +- src/modules/terminal/option.h | 2 +- src/modules/terminal/terminal.c | 6 +- src/modules/terminalfont/option.h | 2 +- src/modules/terminalfont/terminalfont.c | 6 +- src/modules/terminalsize/option.h | 2 +- src/modules/terminalsize/terminalsize.c | 6 +- src/modules/terminaltheme/option.h | 2 +- src/modules/terminaltheme/terminaltheme.c | 6 +- src/modules/theme/option.h | 2 +- src/modules/theme/theme.c | 6 +- src/modules/title/option.h | 2 +- src/modules/title/title.c | 6 +- src/modules/tpm/option.h | 2 +- src/modules/tpm/tpm.c | 6 +- src/modules/uptime/option.h | 2 +- src/modules/uptime/uptime.c | 10 +- src/modules/users/option.h | 2 +- src/modules/users/users.c | 8 +- src/modules/version/option.h | 2 +- src/modules/version/version.c | 6 +- src/modules/vulkan/option.h | 2 +- src/modules/vulkan/vulkan.c | 6 +- src/modules/wallpaper/option.h | 2 +- src/modules/wallpaper/wallpaper.c | 6 +- src/modules/weather/option.h | 2 +- src/modules/weather/weather.c | 6 +- src/modules/wifi/option.h | 2 +- src/modules/wifi/wifi.c | 6 +- src/modules/wm/option.h | 2 +- src/modules/wm/wm.c | 6 +- src/modules/wmtheme/option.h | 2 +- src/modules/wmtheme/wmtheme.c | 6 +- src/modules/zpool/option.h | 4 +- src/modules/zpool/zpool.c | 12 +- src/options/display.c | 6 +- src/options/display.h | 2 +- src/options/general.c | 6 +- src/options/logo.c | 2 +- src/util/binary_apple.c | 2 +- src/util/binary_linux.c | 4 +- src/util/binary_windows.c | 2 +- src/{common => util}/color.h | 0 src/{common => util}/commandoption.c | 10 +- src/{common => util}/commandoption.h | 0 src/{common => util}/dbus.c | 2 +- src/{common => util}/dbus.h | 2 +- src/util/debug.h | 2 +- src/{common => util}/duration.c | 0 src/{common => util}/duration.h | 2 + src/{common => util}/font.c | 2 +- src/{common => util}/font.h | 0 src/{common => util}/format.c | 4 +- src/{common => util}/format.h | 0 src/{common => util}/frequency.c | 0 src/{common => util}/frequency.h | 2 + src/{common => util}/init.c | 8 +- src/{common => util}/init.h | 0 src/{common => util}/io/io.h | 0 src/{common => util}/io/io_unix.c | 2 +- src/{common => util}/io/io_windows.c | 0 src/{common => util}/jsonconfig.c | 12 +- src/{common => util}/jsonconfig.h | 0 src/util/kmod.c | 2 +- src/{common => util}/library.c | 2 +- src/{common => util}/library.h | 0 src/{common => util}/modules.c | 0 src/{common => util}/netif/netif.c | 0 src/{common => util}/netif/netif.h | 0 src/{common => util}/netif/netif_apple.c | 2 +- src/{common => util}/netif/netif_bsd.c | 2 +- src/{common => util}/netif/netif_gnu.c | 2 +- src/{common => util}/netif/netif_haiku.c | 2 +- src/{common => util}/netif/netif_linux.c | 2 +- src/{common => util}/netif/netif_windows.c | 0 src/{common => util}/networking/networking.h | 2 +- .../networking/networking_common.c | 4 +- .../networking/networking_linux.c | 6 +- .../networking/networking_windows.c | 2 +- src/{common => util}/option.c | 4 +- src/{common => util}/option.h | 0 src/{common => util}/parsing.c | 2 +- src/{common => util}/parsing.h | 0 src/util/path.c | 2 +- src/{common => util}/percent.c | 8 +- src/{common => util}/percent.h | 4 +- src/util/platform/FFPlatform.c | 2 +- src/util/platform/FFPlatform_unix.c | 2 +- src/util/platform/FFPlatform_windows.c | 4 +- src/{common => util}/printing.c | 4 +- src/{common => util}/printing.h | 2 +- src/{common => util}/processing.h | 0 src/{common => util}/processing_linux.c | 4 +- src/{common => util}/processing_windows.c | 4 +- src/{common => util}/properties.c | 4 +- src/{common => util}/properties.h | 0 src/{common => util}/settings.c | 10 +- src/{common => util}/settings.h | 0 src/{common => util}/size.c | 0 src/{common => util}/size.h | 2 + src/util/smbiosHelper.c | 8 +- src/{common => util}/sysctl.c | 0 src/{common => util}/sysctl.h | 0 src/{common => util}/temps.c | 2 +- src/{common => util}/temps.h | 4 +- src/{common => util}/thread.h | 0 src/{common => util}/time.c | 0 src/{common => util}/time.h | 0 tests/color.c | 2 +- tests/duration.c | 2 +- tests/format.c | 2 +- 428 files changed, 840 insertions(+), 832 deletions(-) rename src/{common => util}/color.h (100%) rename src/{common => util}/commandoption.c (98%) rename src/{common => util}/commandoption.h (100%) rename src/{common => util}/dbus.c (99%) rename src/{common => util}/dbus.h (98%) rename src/{common => util}/duration.c (100%) rename src/{common => util}/duration.h (86%) rename src/{common => util}/font.c (99%) rename src/{common => util}/font.h (100%) rename src/{common => util}/format.c (99%) rename src/{common => util}/format.h (100%) rename src/{common => util}/frequency.c (100%) rename src/{common => util}/frequency.h (84%) rename src/{common => util}/init.c (98%) rename src/{common => util}/init.h (100%) rename src/{common => util}/io/io.h (100%) rename src/{common => util}/io/io_unix.c (99%) rename src/{common => util}/io/io_windows.c (100%) rename src/{common => util}/jsonconfig.c (98%) rename src/{common => util}/jsonconfig.h (100%) rename src/{common => util}/library.c (98%) rename src/{common => util}/library.h (100%) rename src/{common => util}/modules.c (100%) rename src/{common => util}/netif/netif.c (100%) rename src/{common => util}/netif/netif.h (100%) rename src/{common => util}/netif/netif_apple.c (99%) rename src/{common => util}/netif/netif_bsd.c (99%) rename src/{common => util}/netif/netif_gnu.c (97%) rename src/{common => util}/netif/netif_haiku.c (99%) rename src/{common => util}/netif/netif_linux.c (99%) rename src/{common => util}/netif/netif_windows.c (100%) rename src/{common => util}/networking/networking.h (97%) rename src/{common => util}/networking/networking_common.c (99%) rename src/{common => util}/networking/networking_linux.c (99%) rename src/{common => util}/networking/networking_windows.c (99%) rename src/{common => util}/option.c (99%) rename src/{common => util}/option.h (100%) rename src/{common => util}/parsing.c (99%) rename src/{common => util}/parsing.h (100%) rename src/{common => util}/percent.c (99%) rename src/{common => util}/percent.h (96%) rename src/{common => util}/printing.c (99%) rename src/{common => util}/printing.h (97%) rename src/{common => util}/processing.h (100%) rename src/{common => util}/processing_linux.c (99%) rename src/{common => util}/processing_windows.c (99%) rename src/{common => util}/properties.c (98%) rename src/{common => util}/properties.h (100%) rename src/{common => util}/settings.c (99%) rename src/{common => util}/settings.h (100%) rename src/{common => util}/size.c (100%) rename src/{common => util}/size.h (85%) rename src/{common => util}/sysctl.c (100%) rename src/{common => util}/sysctl.h (100%) rename src/{common => util}/temps.c (99%) rename src/{common => util}/temps.h (89%) rename src/{common => util}/thread.h (100%) rename src/{common => util}/time.c (100%) rename src/{common => util}/time.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18ae01633..efe91f626 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -364,26 +364,6 @@ file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}") ####################### set(LIBFASTFETCH_SRC - src/common/commandoption.c - src/common/duration.c - src/common/font.c - src/common/format.c - src/common/frequency.c - src/common/init.c - src/common/jsonconfig.c - src/common/library.c - src/common/modules.c - src/common/netif/netif.c - src/common/networking/networking_common.c - src/common/option.c - src/common/parsing.c - src/common/percent.c - src/common/printing.c - src/common/properties.c - src/common/settings.c - src/common/size.c - src/common/temps.c - src/common/time.c src/detection/bluetoothradio/bluetoothradio.c src/detection/bootmgr/bootmgr.c src/detection/chassis/chassis.c @@ -492,6 +472,26 @@ set(LIBFASTFETCH_SRC src/options/display.c src/options/logo.c src/options/general.c + src/util/commandoption.c + src/util/duration.c + src/util/font.c + src/util/format.c + src/util/frequency.c + src/util/init.c + src/util/jsonconfig.c + src/util/library.c + src/util/modules.c + src/util/netif/netif.c + src/util/networking/networking_common.c + src/util/option.c + src/util/parsing.c + src/util/percent.c + src/util/printing.c + src/util/properties.c + src/util/settings.c + src/util/size.c + src/util/temps.c + src/util/time.c src/util/edidHelper.c src/util/base64.c src/util/FFlist.c @@ -504,11 +504,6 @@ set(LIBFASTFETCH_SRC if(LINUX) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_linux.c - src/common/networking/networking_linux.c - src/common/processing_linux.c src/detection/battery/battery_linux.c src/detection/bios/bios_linux.c src/detection/board/board_linux.c @@ -583,16 +578,16 @@ if(LINUX) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_linux.c + src/util/networking/networking_linux.c + src/util/processing_linux.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c ) elseif(ANDROID) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_linux.c - src/common/networking/networking_linux.c - src/common/processing_linux.c src/detection/battery/battery_android.c src/detection/bios/bios_android.c src/detection/bluetooth/bluetooth_nosupport.c @@ -656,17 +651,16 @@ elseif(ANDROID) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_android.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_linux.c + src/util/networking/networking_linux.c + src/util/processing_linux.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c ) elseif(FreeBSD) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_bsd.c - src/common/networking/networking_linux.c - src/common/processing_linux.c - src/common/sysctl.c src/detection/battery/battery_bsd.c src/detection/bios/bios_bsd.c src/detection/bluetoothradio/bluetoothradio_nosupport.c @@ -738,6 +732,12 @@ elseif(FreeBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_bsd.c + src/util/networking/networking_linux.c + src/util/processing_linux.c + src/util/sysctl.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c ) @@ -754,12 +754,6 @@ elseif(FreeBSD) endif() elseif(NetBSD) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_bsd.c - src/common/networking/networking_linux.c - src/common/processing_linux.c - src/common/sysctl.c src/detection/battery/battery_nbsd.c src/detection/bios/bios_nbsd.c src/detection/bluetooth/bluetooth_bsd.c @@ -831,17 +825,17 @@ elseif(NetBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_bsd.c + src/util/networking/networking_linux.c + src/util/processing_linux.c + src/util/sysctl.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c ) elseif(OpenBSD) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_bsd.c - src/common/networking/networking_linux.c - src/common/processing_linux.c - src/common/sysctl.c src/detection/battery/battery_obsd.c src/detection/bios/bios_windows.c src/detection/bluetooth/bluetooth_nosupport.c @@ -913,17 +907,18 @@ elseif(OpenBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_bsd.c + src/util/networking/networking_linux.c + src/util/processing_linux.c + src/util/sysctl.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c src/util/smbiosHelper.c ) elseif(APPLE) list(APPEND LIBFASTFETCH_SRC - src/common/io/io_unix.c - src/common/netif/netif_apple.c - src/common/networking/networking_linux.c - src/common/processing_linux.c - src/common/sysctl.c src/detection/battery/battery_apple.c src/detection/bios/bios_apple.c src/detection/bluetooth/bluetooth_apple.m @@ -982,6 +977,11 @@ elseif(APPLE) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_apple.m src/detection/camera/camera_apple.m + src/util/io/io_unix.c + src/util/netif/netif_apple.c + src/util/networking/networking_linux.c + src/util/processing_linux.c + src/util/sysctl.c src/util/apple/cf_helpers.c src/util/apple/osascript.m src/util/apple/smc_temps.c @@ -990,10 +990,6 @@ elseif(APPLE) ) elseif(WIN32) list(APPEND LIBFASTFETCH_SRC - src/common/io/io_windows.c - src/common/netif/netif_windows.c - src/common/networking/networking_windows.c - src/common/processing_windows.c src/detection/battery/battery_windows.c src/detection/bios/bios_windows.c src/detection/bluetooth/bluetooth_windows.c @@ -1051,6 +1047,10 @@ elseif(WIN32) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_windows.c src/detection/camera/camera_windows.cpp + src/util/io/io_windows.c + src/util/netif/netif_windows.c + src/util/networking/networking_windows.c + src/util/processing_windows.c src/util/windows/getline.c src/util/windows/com.cpp src/util/windows/registry.c @@ -1063,11 +1063,6 @@ elseif(WIN32) ) elseif(SunOS) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_apple.c - src/common/networking/networking_linux.c - src/common/processing_linux.c src/detection/battery/battery_nosupport.c src/detection/bios/bios_windows.c src/detection/board/board_windows.c @@ -1139,16 +1134,16 @@ elseif(SunOS) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_apple.c + src/util/networking/networking_linux.c + src/util/processing_linux.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c ) elseif(Haiku) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_haiku.c - src/common/networking/networking_linux.c - src/common/processing_linux.c src/detection/battery/battery_haiku.c src/detection/bios/bios_windows.c src/detection/board/board_windows.c @@ -1207,17 +1202,17 @@ elseif(Haiku) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_nosupport.c src/detection/camera/camera_nosupport.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_haiku.c + src/util/networking/networking_linux.c + src/util/processing_linux.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c src/util/haiku/version.cpp ) elseif(GNU) list(APPEND LIBFASTFETCH_SRC - src/common/dbus.c - src/common/io/io_unix.c - src/common/netif/netif_gnu.c - src/common/networking/networking_linux.c - src/common/processing_linux.c src/detection/battery/battery_nosupport.c src/detection/bios/bios_nosupport.c src/detection/board/board_nosupport.c @@ -1286,6 +1281,11 @@ elseif(GNU) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c + src/util/dbus.c + src/util/io/io_unix.c + src/util/netif/netif_gnu.c + src/util/networking/networking_linux.c + src/util/processing_linux.c src/util/platform/FFPlatform_unix.c src/util/binary_linux.c ) diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index c7f0090b3..fc7f3fcdb 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -1,8 +1,8 @@ #include "fastfetch.h" #include "battery.h" #include "util/stringUtils.h" -#include "common/processing.h" -#include "common/properties.h" +#include "util/processing.h" +#include "util/properties.h" #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" #define FF_TERMUX_API_PARAM "BatteryStatus" diff --git a/src/detection/battery/battery_bsd.c b/src/detection/battery/battery_bsd.c index 2997070cd..c938cb365 100644 --- a/src/detection/battery/battery_bsd.c +++ b/src/detection/battery/battery_bsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/sysctl.h" -#include "common/io/io.h" +#include "util/sysctl.h" +#include "util/io/io.h" #include "battery.h" #include diff --git a/src/detection/battery/battery_haiku.c b/src/detection/battery/battery_haiku.c index 181049e2d..205d584e6 100644 --- a/src/detection/battery/battery_haiku.c +++ b/src/detection/battery/battery_haiku.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "battery.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index d6987bc35..773af2a1c 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c index 671fae360..df4225683 100644 --- a/src/detection/battery/battery_nbsd.c +++ b/src/detection/battery/battery_nbsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c index c9ef03c87..ad8369db1 100644 --- a/src/detection/battery/battery_obsd.c +++ b/src/detection/battery/battery_obsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c index 9730664a0..e0f9425ef 100644 --- a/src/detection/battery/battery_windows.c +++ b/src/detection/battery/battery_windows.c @@ -1,6 +1,6 @@ #include "battery.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/windows/nt.h" #include "util/windows/unicode.h" #include "util/mallocHelper.h" diff --git a/src/detection/bios/bios_android.c b/src/detection/bios/bios_android.c index b2b20aaf9..256d6d830 100644 --- a/src/detection/bios/bios_android.c +++ b/src/detection/bios/bios_android.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "common/settings.h" +#include "util/settings.h" const char* ffDetectBios(FFBiosResult* bios) { diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c index 00b1bd394..cdf1767f0 100644 --- a/src/detection/bios/bios_bsd.c +++ b/src/detection/bios/bios_bsd.c @@ -1,8 +1,8 @@ #include "bios.h" -#include "common/settings.h" -#include "common/sysctl.h" -#include "common/io/io.h" +#include "util/settings.h" +#include "util/sysctl.h" +#include "util/io/io.h" #include "util/smbiosHelper.h" const char* ffDetectBios(FFBiosResult* result) diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c index fc86b3a2e..446371a25 100644 --- a/src/detection/bios/bios_linux.c +++ b/src/detection/bios/bios_linux.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/bios/bios_nbsd.c b/src/detection/bios/bios_nbsd.c index 3330a74f4..a1e920b77 100644 --- a/src/detection/bios/bios_nbsd.c +++ b/src/detection/bios/bios_nbsd.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/smbiosHelper.h" const char* ffDetectBios(FFBiosResult* bios) diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c index ea1977b1a..184a462dc 100644 --- a/src/detection/bios/bios_windows.c +++ b/src/detection/bios/bios_windows.c @@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION }; } SYSTEM_BOOT_ENVIRONMENT_INFORMATION; #elif __OpenBSD__ -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/bluetooth/bluetooth_haiku.cpp b/src/detection/bluetooth/bluetooth_haiku.cpp index 89ae13624..4785a8f2c 100644 --- a/src/detection/bluetooth/bluetooth_haiku.cpp +++ b/src/detection/bluetooth/bluetooth_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "bluetooth.h" -#include "common/io/io.h" +#include "util/io/io.h" } #include diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c index c56b38558..3479d1428 100644 --- a/src/detection/bluetooth/bluetooth_linux.c +++ b/src/detection/bluetooth/bluetooth_linux.c @@ -2,8 +2,8 @@ #include "util/stringUtils.h" #ifdef FF_HAVE_DBUS -#include "common/dbus.h" -#include "common/io/io.h" +#include "util/dbus.h" +#include "util/io/io.h" /* Example dbus reply, striped to only the relevant parts: array [ //root diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c index 8f1a685d3..841695668 100644 --- a/src/detection/bluetooth/bluetooth_windows.c +++ b/src/detection/bluetooth/bluetooth_windows.c @@ -1,5 +1,5 @@ #include "bluetooth.h" -#include "common/library.h" +#include "util/library.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/bluetoothradio/bluetoothradio_apple.m b/src/detection/bluetoothradio/bluetoothradio_apple.m index 63af39d9c..0e9ceb0e9 100644 --- a/src/detection/bluetoothradio/bluetoothradio_apple.m +++ b/src/detection/bluetoothradio/bluetoothradio_apple.m @@ -1,5 +1,5 @@ #include "bluetoothradio.h" -#include "common/processing.h" +#include "util/processing.h" #import diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c index 1eb0e4e09..9bfc6c20b 100644 --- a/src/detection/bluetoothradio/bluetoothradio_linux.c +++ b/src/detection/bluetoothradio/bluetoothradio_linux.c @@ -2,8 +2,8 @@ #include "util/stringUtils.h" #ifdef FF_HAVE_DBUS -#include "common/dbus.h" -#include "common/io/io.h" +#include "util/dbus.h" +#include "util/io/io.h" /* Example dbus reply: array [ diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c index 2fc94d6b3..288d6255b 100644 --- a/src/detection/bluetoothradio/bluetoothradio_windows.c +++ b/src/detection/bluetoothradio/bluetoothradio_windows.c @@ -1,6 +1,6 @@ #include "bluetoothradio.h" -#include "common/library.h" -#include "common/io/io.h" +#include "util/library.h" +#include "util/io/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/board/board_android.c b/src/detection/board/board_android.c index 64e917e6a..c1d504062 100644 --- a/src/detection/board/board_android.c +++ b/src/detection/board/board_android.c @@ -1,5 +1,5 @@ #include "board.h" -#include "common/settings.h" +#include "util/settings.h" const char* ffDetectBoard(FFBoardResult* board) { diff --git a/src/detection/board/board_bsd.c b/src/detection/board/board_bsd.c index 3fc5f9637..4f138286e 100644 --- a/src/detection/board/board_bsd.c +++ b/src/detection/board/board_bsd.c @@ -1,5 +1,5 @@ #include "board.h" -#include "common/settings.h" +#include "util/settings.h" #include "util/smbiosHelper.h" const char* ffDetectBoard(FFBoardResult* result) diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c index 70cd54034..bd3a4a522 100644 --- a/src/detection/board/board_linux.c +++ b/src/detection/board/board_linux.c @@ -1,5 +1,5 @@ #include "board.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/board/board_nbsd.c b/src/detection/board/board_nbsd.c index cc89149aa..bcb713f5d 100644 --- a/src/detection/board/board_nbsd.c +++ b/src/detection/board/board_nbsd.c @@ -1,5 +1,5 @@ #include "board.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/smbiosHelper.h" const char* ffDetectBoard(FFBoardResult* board) diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c index 764489974..e9d1e90ec 100644 --- a/src/detection/bootmgr/bootmgr_apple.c +++ b/src/detection/bootmgr/bootmgr_apple.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/apple/cf_helpers.h" #include diff --git a/src/detection/bootmgr/bootmgr_bsd.c b/src/detection/bootmgr/bootmgr_bsd.c index 989ac348e..19d6db1b6 100644 --- a/src/detection/bootmgr/bootmgr_bsd.c +++ b/src/detection/bootmgr/bootmgr_bsd.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "common/io/io.h" +#include "util/io/io.h" #ifdef __OpenBSD__ #include diff --git a/src/detection/bootmgr/bootmgr_linux.c b/src/detection/bootmgr/bootmgr_linux.c index 7a47dc5f3..74e6cd242 100644 --- a/src/detection/bootmgr/bootmgr_linux.c +++ b/src/detection/bootmgr/bootmgr_linux.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "efi_helper.h" #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/" diff --git a/src/detection/bootmgr/bootmgr_windows.c b/src/detection/bootmgr/bootmgr_windows.c index dea46b2ea..6f46f497f 100644 --- a/src/detection/bootmgr/bootmgr_windows.c +++ b/src/detection/bootmgr/bootmgr_windows.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "common/io/io.h" +#include "util/io/io.h" #include diff --git a/src/detection/brightness/brightness_bsd.c b/src/detection/brightness/brightness_bsd.c index 6b7a0a8b3..07d7239db 100644 --- a/src/detection/brightness/brightness_bsd.c +++ b/src/detection/brightness/brightness_bsd.c @@ -2,7 +2,7 @@ #if __has_include() -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c index bff5f173c..b24f0aef6 100644 --- a/src/detection/brightness/brightness_linux.c +++ b/src/detection/brightness/brightness_linux.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" @@ -87,7 +87,7 @@ static const char* detectWithBacklight(FFlist* result) #ifdef FF_HAVE_DDCUTIL #include "detection/displayserver/displayserver.h" -#include "common/library.h" +#include "util/library.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/brightness/brightness_nbsd.c b/src/detection/brightness/brightness_nbsd.c index 67464772e..3e5b629b2 100644 --- a/src/detection/brightness/brightness_nbsd.c +++ b/src/detection/brightness/brightness_nbsd.c @@ -1,6 +1,6 @@ #include "brightness.h" -#include "common/sysctl.h" +#include "util/sysctl.h" const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result) { diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c index e5b944a42..ddae77163 100644 --- a/src/detection/brightness/brightness_obsd.c +++ b/src/detection/brightness/brightness_obsd.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/brightness/brightness_windows.cpp b/src/detection/brightness/brightness_windows.cpp index 493347670..8cddd3b76 100644 --- a/src/detection/brightness/brightness_windows.cpp +++ b/src/detection/brightness/brightness_windows.cpp @@ -2,7 +2,7 @@ extern "C" { #include "brightness.h" #include "detection/displayserver/displayserver.h" -#include "common/library.h" +#include "util/library.h" } #include "util/windows/wmi.hpp" #include "util/windows/unicode.hpp" diff --git a/src/detection/btrfs/btrfs_linux.c b/src/detection/btrfs/btrfs_linux.c index e48496fff..5dc190741 100644 --- a/src/detection/btrfs/btrfs_linux.c +++ b/src/detection/btrfs/btrfs_linux.c @@ -1,6 +1,6 @@ #include "btrfs.h" -#include "common/io/io.h" +#include "util/io/io.h" #include enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") }; diff --git a/src/detection/camera/camera_android.c b/src/detection/camera/camera_android.c index 7f5f24447..804e2ead8 100644 --- a/src/detection/camera/camera_android.c +++ b/src/detection/camera/camera_android.c @@ -1,7 +1,7 @@ #include "camera.h" -#include "common/processing.h" -#include "common/properties.h" +#include "util/processing.h" +#include "util/properties.h" #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" #define FF_TERMUX_API_PARAM "CameraInfo" diff --git a/src/detection/camera/camera_apple.m b/src/detection/camera/camera_apple.m index 49a296fbb..7549f9123 100644 --- a/src/detection/camera/camera_apple.m +++ b/src/detection/camera/camera_apple.m @@ -1,5 +1,5 @@ #include "camera.h" -#include "common/io/io.h" +#include "util/io/io.h" #import diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c index 09a6fb06d..988c41293 100644 --- a/src/detection/camera/camera_linux.c +++ b/src/detection/camera/camera_linux.c @@ -1,5 +1,5 @@ #include "camera.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/camera/camera_windows.cpp b/src/detection/camera/camera_windows.cpp index 356945158..f185cc131 100644 --- a/src/detection/camera/camera_windows.cpp +++ b/src/detection/camera/camera_windows.cpp @@ -1,6 +1,6 @@ extern "C" { #include "camera.h" -#include "common/library.h" +#include "util/library.h" } #include "util/windows/com.hpp" #include "util/windows/unicode.hpp" diff --git a/src/detection/chassis/chassis_bsd.c b/src/detection/chassis/chassis_bsd.c index 816a5dcad..d660d668e 100644 --- a/src/detection/chassis/chassis_bsd.c +++ b/src/detection/chassis/chassis_bsd.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "common/settings.h" +#include "util/settings.h" #include "util/smbiosHelper.h" const char* ffDetectChassis(FFChassisResult* result) diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c index 8968a2093..93aa79e06 100644 --- a/src/detection/chassis/chassis_linux.c +++ b/src/detection/chassis/chassis_linux.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/chassis/chassis_nbsd.c b/src/detection/chassis/chassis_nbsd.c index c2593bf85..b9786cee4 100644 --- a/src/detection/chassis/chassis_nbsd.c +++ b/src/detection/chassis/chassis_nbsd.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/smbiosHelper.h" const char* ffDetectChassis(FFChassisResult* chassis) diff --git a/src/detection/command/command.c b/src/detection/command/command.c index f99c4fda5..d6263eed7 100644 --- a/src/detection/command/command.c +++ b/src/detection/command/command.c @@ -1,6 +1,6 @@ -#include "common/processing.h" -#include "util/FFstrbuf.h" #include "detection/command/command.h" +#include "util/processing.h" +#include "util/FFstrbuf.h" typedef struct FFCommandResultBundle { diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c index 37bd27a63..c10f04541 100644 --- a/src/detection/cpu/cpu.c +++ b/src/detection/cpu/cpu.c @@ -130,7 +130,7 @@ void ffCPUDetectByCpuid(FFCPUResult* cpu) // Worth noting: Apple M1 is marked as ARMv8.5-A on Wikipedia, but it lacks BTI (mandatory in v8.5) #ifdef __linux__ -#include "common/io/io.h" +#include "util/io/io.h" #include // #include diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c index efa7bb04a..f046a2e45 100644 --- a/src/detection/cpu/cpu_apple.c +++ b/src/detection/cpu/cpu_apple.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/apple/smc_temps.h" #include "util/stringUtils.h" diff --git a/src/detection/cpu/cpu_bsd.c b/src/detection/cpu/cpu_bsd.c index aff68c2a2..9bc0605a1 100644 --- a/src/detection/cpu/cpu_bsd.c +++ b/src/detection/cpu/cpu_bsd.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/stringUtils.h" #include diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index bdb567700..9fc2287ec 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -1,7 +1,7 @@ #include "cpu.h" -#include "common/io/io.h" -#include "common/processing.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/processing.h" +#include "util/properties.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/path.h" @@ -200,7 +200,7 @@ static void detectNumaNodes(FFCPUResult* cpu) } #ifdef __ANDROID__ -#include "common/settings.h" +#include "util/settings.h" static void detectQualcomm(FFCPUResult* cpu) { diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c index 38ee1b3fd..6f115a930 100644 --- a/src/detection/cpu/cpu_nbsd.c +++ b/src/detection/cpu/cpu_nbsd.c @@ -1,6 +1,6 @@ #include "cpu.h" -#include "common/sysctl.h" -#include "common/io/io.h" +#include "util/sysctl.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/cpu/cpu_obsd.c b/src/detection/cpu/cpu_obsd.c index 3ac5893f6..cc1638002 100644 --- a/src/detection/cpu/cpu_obsd.c +++ b/src/detection/cpu/cpu_obsd.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/stringUtils.h" #include diff --git a/src/detection/cpu/cpu_sunos.c b/src/detection/cpu/cpu_sunos.c index 1ae1f77c6..0f9bb994f 100644 --- a/src/detection/cpu/cpu_sunos.c +++ b/src/detection/cpu/cpu_sunos.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "common/processing.h" +#include "util/processing.h" #include "util/stringUtils.h" #include diff --git a/src/detection/cpucache/cpucache_apple.c b/src/detection/cpucache/cpucache_apple.c index cacb85df6..9496d4261 100644 --- a/src/detection/cpucache/cpucache_apple.c +++ b/src/detection/cpucache/cpucache_apple.c @@ -1,5 +1,5 @@ #include "cpucache.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/stringUtils.h" const char* ffDetectCPUCache(FFCPUCacheResult* result) diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c index 11ec5cbd1..07f650f61 100644 --- a/src/detection/cpucache/cpucache_linux.c +++ b/src/detection/cpucache/cpucache_linux.c @@ -1,5 +1,5 @@ #include "cpucache.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added) diff --git a/src/detection/cpuusage/cpuusage.c b/src/detection/cpuusage/cpuusage.c index 40e569528..a90c00225 100644 --- a/src/detection/cpuusage/cpuusage.c +++ b/src/detection/cpuusage/cpuusage.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "common/time.h" +#include "util/time.h" #include diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c index 02544630c..27c9f4b1f 100644 --- a/src/detection/cpuusage/cpuusage_linux.c +++ b/src/detection/cpuusage/cpuusage_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/cursor/cursor_linux.c b/src/detection/cursor/cursor_linux.c index bd8c9b1cd..5258afbd9 100644 --- a/src/detection/cursor/cursor_linux.c +++ b/src/detection/cursor/cursor_linux.c @@ -1,10 +1,10 @@ #include "cursor.h" -#include "common/properties.h" -#include "common/parsing.h" -#include "common/settings.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" +#include "util/properties.h" +#include "util/parsing.h" +#include "util/settings.h" #include "util/stringUtils.h" #include diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index 10a0a7cac..51293b6f6 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -1,11 +1,11 @@ #include "de.h" -#include "common/dbus.h" -#include "common/io/io.h" -#include "common/library.h" -#include "common/parsing.h" -#include "common/properties.h" -#include "common/processing.h" +#include "util/dbus.h" +#include "util/io/io.h" +#include "util/library.h" +#include "util/parsing.h" +#include "util/properties.h" +#include "util/processing.h" #include "util/binary.h" #include "util/path.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c index 518d356ac..b54cd86c1 100644 --- a/src/detection/disk/disk_linux.c +++ b/src/detection/disk/disk_linux.c @@ -1,6 +1,6 @@ #include "disk.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c index e7b0c2f53..42066fb2e 100644 --- a/src/detection/disk/disk_sunos.c +++ b/src/detection/disk/disk_sunos.c @@ -1,5 +1,5 @@ #include "disk.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c index 524f0cd91..b88289fa5 100644 --- a/src/detection/disk/disk_windows.c +++ b/src/detection/disk/disk_windows.c @@ -1,6 +1,6 @@ #include "disk.h" -#include "common/io/io.h" -#include "common/thread.h" +#include "util/io/io.h" +#include "util/thread.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/diskio/diskio.c b/src/detection/diskio/diskio.c index 9413a7125..decd7d4d3 100644 --- a/src/detection/diskio/diskio.c +++ b/src/detection/diskio/diskio.c @@ -1,6 +1,6 @@ #include "diskio.h" -#include "common/time.h" +#include "util/time.h" const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options); diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c index f07b063c5..5b24620b8 100644 --- a/src/detection/diskio/diskio_linux.c +++ b/src/detection/diskio/diskio_linux.c @@ -1,6 +1,6 @@ #include "diskio.h" -#include "common/io/io.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/properties.h" #include "util/stringUtils.h" #include diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c index cf92d32ea..4cb17a351 100644 --- a/src/detection/diskio/diskio_windows.c +++ b/src/detection/diskio/diskio_windows.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/displayserver/displayserver_android.c b/src/detection/displayserver/displayserver_android.c index 76e152de4..137b290e5 100644 --- a/src/detection/displayserver/displayserver_android.c +++ b/src/detection/displayserver/displayserver_android.c @@ -1,6 +1,6 @@ #include "displayserver.h" -#include "common/settings.h" -#include "common/processing.h" +#include "util/settings.h" +#include "util/processing.h" #include "linux/displayserver_linux.h" #include diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c index f86105c0b..d4da9c604 100644 --- a/src/detection/displayserver/linux/displayserver_linux.c +++ b/src/detection/displayserver/linux/displayserver_linux.c @@ -1,9 +1,9 @@ #include "displayserver_linux.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #ifdef __FreeBSD__ - #include "common/settings.h" + #include "util/settings.h" #endif static void getWMProtocolNameFromEnv(FFDisplayServerResult* result) diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c index 1552785b6..7fbc427b0 100644 --- a/src/detection/displayserver/linux/drm.c +++ b/src/detection/displayserver/linux/drm.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" @@ -110,7 +110,7 @@ static const char* drmParseSysfs(FFDisplayServerResult* result) #ifdef FF_HAVE_DRM -#include "common/library.h" +#include "util/library.h" #include #include diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index 7f351edbf..ba2e95c77 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -1,5 +1,5 @@ #include "../displayserver_linux.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" @@ -10,7 +10,7 @@ #include -#include "common/properties.h" +#include "util/properties.h" #include "wayland.h" #include "wlr-output-management-unstable-v1-client-protocol.h" diff --git a/src/detection/displayserver/linux/wayland/wayland.h b/src/detection/displayserver/linux/wayland/wayland.h index bf29d70c0..79ed73a53 100644 --- a/src/detection/displayserver/linux/wayland/wayland.h +++ b/src/detection/displayserver/linux/wayland/wayland.h @@ -2,7 +2,7 @@ #ifdef FF_HAVE_WAYLAND -#include "common/library.h" +#include "util/library.h" #include "util/stringUtils.h" #include diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 164cf5aae..8115ff57d 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -1,6 +1,6 @@ #include "displayserver_linux.h" -#include "common/io/io.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/properties.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c index d7022e343..81f0e76d8 100644 --- a/src/detection/displayserver/linux/xcb.c +++ b/src/detection/displayserver/linux/xcb.c @@ -2,8 +2,8 @@ #ifdef FF_HAVE_XCB_RANDR -#include "common/library.h" -#include "common/properties.h" +#include "util/library.h" +#include "util/properties.h" #include "util/edidHelper.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c index 44884e940..25fab64d9 100644 --- a/src/detection/displayserver/linux/xlib.c +++ b/src/detection/displayserver/linux/xlib.c @@ -2,8 +2,8 @@ #ifdef FF_HAVE_XRANDR -#include "common/library.h" -#include "common/properties.h" +#include "util/library.h" +#include "util/properties.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c index 9568f28b0..2061f77ff 100644 --- a/src/detection/dns/dns_apple.c +++ b/src/detection/dns/dns_apple.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/apple/cf_helpers.h" diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c index 51c2fd643..6b76479ec 100644 --- a/src/detection/dns/dns_linux.c +++ b/src/detection/dns/dns_linux.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/dns/dns_windows.c b/src/detection/dns/dns_windows.c index 48615117f..b6eb792a7 100644 --- a/src/detection/dns/dns_windows.c +++ b/src/detection/dns/dns_windows.c @@ -1,5 +1,5 @@ #include "detection/dns/dns.h" -#include "common/netif/netif.h" +#include "util/netif/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/editor/editor.c b/src/detection/editor/editor.c index b94cadc30..bdae1d1e3 100644 --- a/src/detection/editor/editor.c +++ b/src/detection/editor/editor.c @@ -1,6 +1,6 @@ #include "editor.h" -#include "common/processing.h" -#include "common/library.h" +#include "util/processing.h" +#include "util/library.h" #include "util/stringUtils.h" #include "util/path.h" #include "util/binary.h" diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m index 683acad03..2bd4de6ac 100644 --- a/src/detection/font/font_apple.m +++ b/src/detection/font/font_apple.m @@ -1,5 +1,5 @@ -#include "common/font.h" -#include "common/io/io.h" +#include "util/font.h" +#include "util/io/io.h" #include "font.h" #import diff --git a/src/detection/font/font_linux.c b/src/detection/font/font_linux.c index e3253379c..f823b226d 100644 --- a/src/detection/font/font_linux.c +++ b/src/detection/font/font_linux.c @@ -1,5 +1,5 @@ -#include "common/font.h" -#include "common/parsing.h" +#include "util/font.h" +#include "util/parsing.h" #include "detection/displayserver/displayserver.h" #include "detection/gtk_qt/gtk_qt.h" #include "font.h" diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c index 1cc5993ba..1ad91b9fe 100644 --- a/src/detection/gamepad/gamepad_bsd.c +++ b/src/detection/gamepad/gamepad_bsd.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/gamepad/gamepad_linux.c b/src/detection/gamepad/gamepad_linux.c index d8dacb40e..a6f685461 100644 --- a/src/detection/gamepad/gamepad_linux.c +++ b/src/detection/gamepad/gamepad_linux.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path) diff --git a/src/detection/gamepad/gamepad_windows.c b/src/detection/gamepad/gamepad_windows.c index d441b01ef..e0dae742d 100644 --- a/src/detection/gamepad/gamepad_windows.c +++ b/src/detection/gamepad/gamepad_windows.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/gpu/gpu_amd.c b/src/detection/gpu/gpu_amd.c index 11edf9fa2..8ad5eb94d 100644 --- a/src/detection/gpu/gpu_amd.c +++ b/src/detection/gpu/gpu_amd.c @@ -1,7 +1,7 @@ #include "gpu_driver_specific.h" #include "adl.h" -#include "common/library.h" +#include "util/library.h" #include "util/mallocHelper.h" #include "util/debug.h" diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c index a0406790f..ba7d7dba2 100644 --- a/src/detection/gpu/gpu_android.c +++ b/src/detection/gpu/gpu_android.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c index 1a5ac8b44..570de2700 100644 --- a/src/detection/gpu/gpu_bsd.c +++ b/src/detection/gpu/gpu_bsd.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include @@ -36,7 +36,7 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu) } #if FF_HAVE_DRM -#include "common/library.h" +#include "util/library.h" #include "util/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c index 78372a55a..3fdda54ed 100644 --- a/src/detection/gpu/gpu_drm.c +++ b/src/detection/gpu/gpu_drm.c @@ -5,8 +5,8 @@ #include #include -#include "common/io/io.h" -#include "common/library.h" +#include "util/io/io.h" +#include "util/library.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c index 5b1c8e77e..dce396e9c 100644 --- a/src/detection/gpu/gpu_general.c +++ b/src/detection/gpu/gpu_general.c @@ -2,8 +2,8 @@ #ifdef FF_HAVE_PCIACCESS -#include "common/io/io.h" -#include "common/library.h" +#include "util/io/io.h" +#include "util/library.h" #include diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c index 3368f7064..91a2f7e52 100644 --- a/src/detection/gpu/gpu_haiku.c +++ b/src/detection/gpu/gpu_haiku.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "common/io/io.h" +#include "util/io/io.h" #include diff --git a/src/detection/gpu/gpu_intel.c b/src/detection/gpu/gpu_intel.c index f5fe08cd5..334ad58ea 100644 --- a/src/detection/gpu/gpu_intel.c +++ b/src/detection/gpu/gpu_intel.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "common/library.h" +#include "util/library.h" #include "util/mallocHelper.h" #include "igcl.h" diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c index 0fb3051d9..6bd51a59c 100644 --- a/src/detection/gpu/gpu_linux.c +++ b/src/detection/gpu/gpu_linux.c @@ -2,12 +2,12 @@ #include "detection/vulkan/vulkan.h" #include "detection/cpu/cpu.h" #include "detection/gpu/gpu_driver_specific.h" -#include "common/io/io.h" -#include "common/library.h" -#include "modules/gpu/option.h" +#include "util/io/io.h" +#include "util/library.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" +#include "modules/gpu/option.h" #include #include diff --git a/src/detection/gpu/gpu_mthreads.c b/src/detection/gpu/gpu_mthreads.c index ff1347851..7ae7a622d 100644 --- a/src/detection/gpu/gpu_mthreads.c +++ b/src/detection/gpu/gpu_mthreads.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "common/library.h" +#include "util/library.h" #include "mtml.h" struct FFMtmlData diff --git a/src/detection/gpu/gpu_nbsd.c b/src/detection/gpu/gpu_nbsd.c index 888c86af6..c5857086d 100644 --- a/src/detection/gpu/gpu_nbsd.c +++ b/src/detection/gpu/gpu_nbsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/gpu/gpu_nvidia.c b/src/detection/gpu/gpu_nvidia.c index 983fb326c..3e8e85fed 100644 --- a/src/detection/gpu/gpu_nvidia.c +++ b/src/detection/gpu/gpu_nvidia.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "common/library.h" +#include "util/library.h" #include "nvml.h" struct FFNvmlData { diff --git a/src/detection/gpu/gpu_obsd.c b/src/detection/gpu/gpu_obsd.c index 2055c47bd..e3600237c 100644 --- a/src/detection/gpu/gpu_obsd.c +++ b/src/detection/gpu/gpu_obsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c index cce1deb45..1a186b3f3 100644 --- a/src/detection/gpu/gpu_pci.c +++ b/src/detection/gpu/gpu_pci.c @@ -1,6 +1,6 @@ #include "gpu.h" -#include "common/io/io.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/properties.h" #include #ifdef __FreeBSD__ diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index 1cde2376d..1f562031c 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -1,6 +1,6 @@ #include "gpu.h" -#include "common/library.h" #include "detection/gpu/gpu_driver_specific.h" +#include "util/library.h" #include "util/windows/unicode.h" #include "util/windows/registry.h" #include "util/mallocHelper.h" diff --git a/src/detection/gpu/gpu_wsl.cpp b/src/detection/gpu/gpu_wsl.cpp index f2351a9e0..6ed6dec7c 100644 --- a/src/detection/gpu/gpu_wsl.cpp +++ b/src/detection/gpu/gpu_wsl.cpp @@ -2,7 +2,7 @@ #define INITGUID extern "C" { -#include "common/library.h" +#include "util/library.h" #include "detection/gpu/gpu.h" #include "detection/gpu/gpu_driver_specific.h" } diff --git a/src/detection/gtk_qt/gtk.c b/src/detection/gtk_qt/gtk.c index 575568ada..c0e49d14a 100644 --- a/src/detection/gtk_qt/gtk.c +++ b/src/detection/gtk_qt/gtk.c @@ -1,8 +1,8 @@ #include "fastfetch.h" +#include "util/properties.h" +#include "util/thread.h" +#include "util/settings.h" #include "detection/gtk_qt/gtk_qt.h" -#include "common/properties.h" -#include "common/thread.h" -#include "common/settings.h" #include "detection/displayserver/displayserver.h" static inline bool allPropertiesSet(FFGTKResult* result) diff --git a/src/detection/gtk_qt/qt.c b/src/detection/gtk_qt/qt.c index b27ad748f..29854f62b 100644 --- a/src/detection/gtk_qt/qt.c +++ b/src/detection/gtk_qt/qt.c @@ -1,9 +1,9 @@ #include "fastfetch.h" -#include "common/properties.h" -#include "common/thread.h" +#include "util/properties.h" +#include "util/thread.h" +#include "util/stringUtils.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" -#include "util/stringUtils.h" #include #include diff --git a/src/detection/host/host_android.c b/src/detection/host/host_android.c index 940b46c6a..f0f476a04 100644 --- a/src/detection/host/host_android.c +++ b/src/detection/host/host_android.c @@ -1,5 +1,6 @@ #include "host.h" -#include "common/settings.h" +#include "util/settings.h" + #include const char* ffDetectHost(FFHostResult* host) diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c index 990f6c671..32db81c85 100644 --- a/src/detection/host/host_apple.c +++ b/src/detection/host/host_apple.c @@ -1,5 +1,5 @@ #include "host.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/apple/cf_helpers.h" #include diff --git a/src/detection/host/host_bsd.c b/src/detection/host/host_bsd.c index 5de12117e..6c0b72f4b 100644 --- a/src/detection/host/host_bsd.c +++ b/src/detection/host/host_bsd.c @@ -1,5 +1,5 @@ #include "host.h" -#include "common/settings.h" +#include "util/settings.h" #include "util/smbiosHelper.h" const char* ffDetectHost(FFHostResult* host) diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c index 7f8108cc8..f2a850549 100644 --- a/src/detection/host/host_linux.c +++ b/src/detection/host/host_linux.c @@ -1,6 +1,6 @@ #include "host.h" -#include "common/io/io.h" -#include "common/processing.h" +#include "util/io/io.h" +#include "util/processing.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/host/host_nbsd.c b/src/detection/host/host_nbsd.c index 8fd61abf2..b9bea191f 100644 --- a/src/detection/host/host_nbsd.c +++ b/src/detection/host/host_nbsd.c @@ -1,5 +1,5 @@ #include "host.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/smbiosHelper.h" const char* ffDetectHost(FFHostResult* host) diff --git a/src/detection/host/host_obsd.c b/src/detection/host/host_obsd.c index 960248ab3..f5eb28d65 100644 --- a/src/detection/host/host_obsd.c +++ b/src/detection/host/host_obsd.c @@ -1,5 +1,5 @@ #include "host.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/smbiosHelper.h" const char* ffDetectHost(FFHostResult* host) diff --git a/src/detection/icons/icons_linux.c b/src/detection/icons/icons_linux.c index e5727b195..05968465b 100644 --- a/src/detection/icons/icons_linux.c +++ b/src/detection/icons/icons_linux.c @@ -1,5 +1,5 @@ #include "icons.h" -#include "common/parsing.h" +#include "util/parsing.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c index 032de91f6..9e00b574a 100644 --- a/src/detection/initsystem/initsystem_haiku.c +++ b/src/detection/initsystem/initsystem_haiku.c @@ -1,7 +1,7 @@ #include "initsystem.h" #include "util/stringUtils.h" #include "util/haiku/version.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c index b730062a0..6ec5d942a 100644 --- a/src/detection/initsystem/initsystem_linux.c +++ b/src/detection/initsystem/initsystem_linux.c @@ -1,5 +1,5 @@ #include "initsystem.h" -#include "common/processing.h" +#include "util/processing.h" #include "util/binary.h" #include "util/stringUtils.h" diff --git a/src/detection/keyboard/keyboard_bsd.c b/src/detection/keyboard/keyboard_bsd.c index 727e91b02..092eb42de 100644 --- a/src/detection/keyboard/keyboard_bsd.c +++ b/src/detection/keyboard/keyboard_bsd.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c index e2d482150..657e5dfff 100644 --- a/src/detection/keyboard/keyboard_linux.c +++ b/src/detection/keyboard/keyboard_linux.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */) diff --git a/src/detection/keyboard/keyboard_windows.c b/src/detection/keyboard/keyboard_windows.c index 24cd8a452..fecf747e6 100644 --- a/src/detection/keyboard/keyboard_windows.c +++ b/src/detection/keyboard/keyboard_windows.c @@ -1,7 +1,7 @@ #define INITGUID #include "keyboard.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/lm/lm_linux.c b/src/detection/lm/lm_linux.c index c336e5796..0e270ad17 100644 --- a/src/detection/lm/lm_linux.c +++ b/src/detection/lm/lm_linux.c @@ -1,7 +1,7 @@ #include "lm.h" -#include "common/properties.h" -#include "common/dbus.h" -#include "common/processing.h" +#include "util/properties.h" +#include "util/dbus.h" +#include "util/processing.h" #include "detection/displayserver/displayserver.h" #include @@ -48,7 +48,7 @@ static const char* getSshdVersion(FFstrbuf* version) } #ifdef FF_HAVE_ZLIB -#include "common/library.h" +#include "util/library.h" #include #include diff --git a/src/detection/loadavg/loadavg_linux.c b/src/detection/loadavg/loadavg_linux.c index c75afb962..ec123c977 100644 --- a/src/detection/loadavg/loadavg_linux.c +++ b/src/detection/loadavg/loadavg_linux.c @@ -1,5 +1,5 @@ #include "detection/loadavg/loadavg.h" -#include "common/io/io.h" +#include "util/io/io.h" #include diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index 1b5537ff6..50f045706 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -1,6 +1,6 @@ #include "localip.h" -#include "common/io/io.h" -#include "common/netif/netif.h" +#include "util/io/io.h" +#include "util/netif/netif.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c index 7c4e32a45..9ca2aa5f9 100644 --- a/src/detection/localip/localip_windows.c +++ b/src/detection/localip/localip_windows.c @@ -1,7 +1,7 @@ #include #include -#include "common/netif/netif.h" +#include "util/netif/netif.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" #include "util/debug.h" diff --git a/src/detection/media/media.c b/src/detection/media/media.c index 3c1288fe1..dc5ce58e4 100644 --- a/src/detection/media/media.c +++ b/src/detection/media/media.c @@ -1,5 +1,5 @@ #include "media.h" -#include "common/io/io.h" +#include "util/io/io.h" void ffDetectMediaImpl(FFMediaResult* media, bool saveCover); diff --git a/src/detection/media/media_apple.m b/src/detection/media/media_apple.m index d822b9435..b69e4f92d 100644 --- a/src/detection/media/media_apple.m +++ b/src/detection/media/media_apple.m @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "detection/media/media.h" -#include "common/processing.h" +#include "util/processing.h" #include "util/apple/cf_helpers.h" +#include "detection/media/media.h" #import #import diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c index 37b19048e..35cf931c6 100644 --- a/src/detection/media/media_linux.c +++ b/src/detection/media/media_linux.c @@ -1,15 +1,14 @@ -#include "common/io/io.h" #include "fastfetch.h" -#include "detection/media/media.h" +#include "util/io/io.h" #include "util/stringUtils.h" -#include "util/unused.h" +#include "detection/media/media.h" #include #define FF_DBUS_MPRIS_PREFIX "org.mpris.MediaPlayer2." #ifdef FF_HAVE_DBUS -#include "common/dbus.h" +#include "util/dbus.h" #define FF_DBUS_ITER_CONTINUE(dbus, iterator) \ { \ diff --git a/src/detection/media/media_windows.c b/src/detection/media/media_windows.c index fa55b09be..52846607c 100644 --- a/src/detection/media/media_windows.c +++ b/src/detection/media/media_windows.c @@ -1,4 +1,4 @@ -#include "common/library.h" +#include "util/library.h" #include "util/windows/unicode.h" #include "media.h" #include "media_windows.dll.h" diff --git a/src/detection/memory/memory_bsd.c b/src/detection/memory/memory_bsd.c index 0db20527a..699d22416 100644 --- a/src/detection/memory/memory_bsd.c +++ b/src/detection/memory/memory_bsd.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "common/sysctl.h" +#include "util/sysctl.h" const char* ffDetectMemory(FFMemoryResult* ram) { diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c index 42051279a..90bb34935 100644 --- a/src/detection/memory/memory_linux.c +++ b/src/detection/memory/memory_linux.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/memory/memory_nbsd.c b/src/detection/memory/memory_nbsd.c index 651058686..112d9c16b 100644 --- a/src/detection/memory/memory_nbsd.c +++ b/src/detection/memory/memory_nbsd.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include #include diff --git a/src/detection/memory/memory_obsd.c b/src/detection/memory/memory_obsd.c index e58bf0d37..2ca8b1ca4 100644 --- a/src/detection/memory/memory_obsd.c +++ b/src/detection/memory/memory_obsd.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include #include diff --git a/src/detection/mouse/mouse_bsd.c b/src/detection/mouse/mouse_bsd.c index 3a1f2eb69..0f6507b52 100644 --- a/src/detection/mouse/mouse_bsd.c +++ b/src/detection/mouse/mouse_bsd.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/mouse/mouse_linux.c b/src/detection/mouse/mouse_linux.c index d03a3e7e5..8d81384a3 100644 --- a/src/detection/mouse/mouse_linux.c +++ b/src/detection/mouse/mouse_linux.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */) diff --git a/src/detection/mouse/mouse_windows.c b/src/detection/mouse/mouse_windows.c index 08002e550..3ab2ff3e2 100644 --- a/src/detection/mouse/mouse_windows.c +++ b/src/detection/mouse/mouse_windows.c @@ -1,7 +1,7 @@ #define INITGUID #include "mouse.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/netio/netio.c b/src/detection/netio/netio.c index 666321c99..7ffa73783 100644 --- a/src/detection/netio/netio.c +++ b/src/detection/netio/netio.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "common/time.h" +#include "util/time.h" static FFlist ioCounters1; static uint64_t time1; diff --git a/src/detection/netio/netio_apple.c b/src/detection/netio/netio_apple.c index 69f2667c9..da1e850c5 100644 --- a/src/detection/netio/netio_apple.c +++ b/src/detection/netio/netio_apple.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "common/netif/netif.h" +#include "util/netif/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c index dcf9b709d..2284dd22a 100644 --- a/src/detection/netio/netio_bsd.c +++ b/src/detection/netio/netio_bsd.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "common/netif/netif.h" +#include "util/netif/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp index 812d926f4..d2389d091 100644 --- a/src/detection/netio/netio_haiku.cpp +++ b/src/detection/netio/netio_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "netio.h" -#include "common/netif/netif.h" +#include "util/netif/netif.h" } #include diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c index 651a612fa..ac552c912 100644 --- a/src/detection/netio/netio_linux.c +++ b/src/detection/netio/netio_linux.c @@ -1,7 +1,7 @@ #include "netio.h" -#include "common/io/io.h" -#include "common/netif/netif.h" +#include "util/io/io.h" +#include "util/netif/netif.h" #include "util/stringUtils.h" #include diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c index e946d6d7e..3d06c8421 100644 --- a/src/detection/netio/netio_sunos.c +++ b/src/detection/netio/netio_sunos.c @@ -1,6 +1,7 @@ #include "netio.h" -#include "common/netif/netif.h" +#include "util/netif/netif.h" #include "util/stringUtils.h" + #include static inline void kstatFreeWrap(kstat_ctl_t** pkc) diff --git a/src/detection/netio/netio_windows.c b/src/detection/netio/netio_windows.c index 56e5fc06d..b97e761c2 100644 --- a/src/detection/netio/netio_windows.c +++ b/src/detection/netio/netio_windows.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "common/netif/netif.h" +#include "util/netif/netif.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/opencl/opencl.c b/src/detection/opencl/opencl.c index 6d55d8ac7..5ebc92190 100644 --- a/src/detection/opencl/opencl.c +++ b/src/detection/opencl/opencl.c @@ -7,8 +7,8 @@ #ifdef FF_HAVE_OPENCL -#include "common/library.h" -#include "common/parsing.h" +#include "util/library.h" +#include "util/parsing.h" #include "util/stringUtils.h" #include diff --git a/src/detection/opengl/opengl_haiku.cpp b/src/detection/opengl/opengl_haiku.cpp index ce0103360..ca0873822 100644 --- a/src/detection/opengl/opengl_haiku.cpp +++ b/src/detection/opengl/opengl_haiku.cpp @@ -2,7 +2,7 @@ extern "C" { #include "opengl.h" -#include "common/io/io.h" +#include "util/io/io.h" #if FF_HAVE_EGL const char* ffOpenGLDetectByEGL(FFOpenGLResult* result); #endif diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c index b227ebb99..ba1c4386b 100644 --- a/src/detection/opengl/opengl_linux.c +++ b/src/detection/opengl/opengl_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "opengl.h" -#include "common/io/io.h" +#include "util/io/io.h" #include @@ -14,7 +14,7 @@ #if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX) #define FF_HAVE_GL 1 -#include "common/library.h" +#include "util/library.h" #include diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c index d1a263a86..4dcfdebbb 100644 --- a/src/detection/opengl/opengl_shared.c +++ b/src/detection/opengl/opengl_shared.c @@ -1,5 +1,5 @@ #include "opengl.h" -#include "common/library.h" +#include "util/library.h" #if __has_include() #include @@ -25,7 +25,7 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG } #if defined(FF_HAVE_EGL) || __has_include() -#include "common/io/io.h" +#include "util/io/io.h" #define EGL_EGL_PROTOTYPES 1 #define EGL_EGLEXT_PROTOTYPES 1 diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c index 50e0e88da..b75acc4d0 100644 --- a/src/detection/opengl/opengl_windows.c +++ b/src/detection/opengl/opengl_windows.c @@ -1,6 +1,6 @@ #include "opengl.h" -#include "common/library.h" -#include "common/printing.h" +#include "util/library.h" +#include "util/printing.h" #include #include diff --git a/src/detection/os/os_android.c b/src/detection/os/os_android.c index 7d39954d6..986ce6da2 100644 --- a/src/detection/os/os_android.c +++ b/src/detection/os/os_android.c @@ -1,5 +1,5 @@ #include "os.h" -#include "common/settings.h" +#include "util/settings.h" void ffDetectOSImpl(FFOSResult* os) { diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m index 82732ac79..61e6c59e7 100644 --- a/src/detection/os/os_apple.m +++ b/src/detection/os/os_apple.m @@ -1,6 +1,6 @@ #include "os.h" -#include "common/io/io.h" -#include "common/sysctl.h" +#include "util/io/io.h" +#include "util/sysctl.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c index 23b956832..f1ff2b2d2 100644 --- a/src/detection/os/os_linux.c +++ b/src/detection/os/os_linux.c @@ -1,8 +1,8 @@ #include "os.h" -#include "common/properties.h" -#include "common/parsing.h" -#include "common/io/io.h" -#include "common/processing.h" +#include "util/properties.h" +#include "util/parsing.h" +#include "util/io/io.h" +#include "util/processing.h" #include "util/stringUtils.h" #include diff --git a/src/detection/os/os_sunos.c b/src/detection/os/os_sunos.c index 46bf05b65..c5964163b 100644 --- a/src/detection/os/os_sunos.c +++ b/src/detection/os/os_sunos.c @@ -1,5 +1,5 @@ #include "os.h" -#include "common/io/io.h" +#include "util/io/io.h" void ffDetectOSImpl(FFOSResult* os) { diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp index 522756c29..14025ec8e 100644 --- a/src/detection/os/os_windows.cpp +++ b/src/detection/os/os_windows.cpp @@ -1,6 +1,6 @@ extern "C" { #include "os.h" -#include "common/library.h" +#include "util/library.h" #include "util/stringUtils.h" #include "util/windows/registry.h" } diff --git a/src/detection/packages/packages.c b/src/detection/packages/packages.c index 71ca2e609..fea48f6e2 100644 --- a/src/detection/packages/packages.c +++ b/src/detection/packages/packages.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c index 5a176c834..300a8a35c 100644 --- a/src/detection/packages/packages_apple.c +++ b/src/detection/packages/packages_apple.c @@ -1,7 +1,7 @@ #include "packages.h" -#include "common/io/io.h" -#include "common/parsing.h" -#include "common/processing.h" +#include "util/io/io.h" +#include "util/parsing.h" +#include "util/processing.h" #include "util/stringUtils.h" static void countBrewPackages(FFstrbuf* baseDir, FFPackagesResult* result) diff --git a/src/detection/packages/packages_bsd.c b/src/detection/packages/packages_bsd.c index 4ad2d8b49..23096e638 100644 --- a/src/detection/packages/packages_bsd.c +++ b/src/detection/packages/packages_bsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "common/settings.h" +#include "util/settings.h" static uint32_t getSQLite3Int(const char* dbPath, const char* query, const char* packageId) { diff --git a/src/detection/packages/packages_haiku.c b/src/detection/packages/packages_haiku.c index b48062a87..3f4d4eede 100644 --- a/src/detection/packages/packages_haiku.c +++ b/src/detection/packages/packages_haiku.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "common/io/io.h" +#include "util/io/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index fc5a0cf21..d75e65ede 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -1,10 +1,10 @@ #include "packages.h" -#include "common/io/io.h" -#include "common/parsing.h" -#include "common/properties.h" -#include "common/settings.h" -#include "detection/os/os.h" +#include "util/io/io.h" +#include "util/parsing.h" +#include "util/properties.h" +#include "util/settings.h" #include "util/stringUtils.h" +#include "detection/os/os.h" static uint32_t getNumElements(FFstrbuf* baseDir, const char* dirname, bool isdir) { @@ -168,7 +168,7 @@ static uint32_t getSnap(FFstrbuf* baseDir) } #ifdef FF_HAVE_RPM -#include "common/library.h" +#include "util/library.h" #include #include #include diff --git a/src/detection/packages/packages_nbsd.c b/src/detection/packages/packages_nbsd.c index e4004bde6..440eaaf04 100644 --- a/src/detection/packages/packages_nbsd.c +++ b/src/detection/packages/packages_nbsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "common/io/io.h" +#include "util/io/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c index 08a5479a6..60609bd82 100644 --- a/src/detection/packages/packages_nix.c +++ b/src/detection/packages/packages_nix.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "common/io/io.h" -#include "common/processing.h" +#include "util/io/io.h" +#include "util/processing.h" #include "util/stringUtils.h" static bool isValidNixPkg(FFstrbuf* pkg) diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c index 422b402a1..41b29c8ac 100644 --- a/src/detection/packages/packages_obsd.c +++ b/src/detection/packages/packages_obsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "common/io/io.h" +#include "util/io/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c index 1ff16842d..f78a8e952 100644 --- a/src/detection/packages/packages_windows.c +++ b/src/detection/packages/packages_windows.c @@ -1,10 +1,10 @@ #include "packages.h" -#include "common/processing.h" +#include "util/processing.h" #include "util/stringUtils.h" #include "util/path.h" #include "util/windows/unicode.h" #include "util/mallocHelper.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include "util/windows/nt.h" diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c index 2b75cde4e..1b4dc5d23 100644 --- a/src/detection/physicaldisk/physicaldisk_haiku.c +++ b/src/detection/physicaldisk/physicaldisk_haiku.c @@ -1,6 +1,6 @@ #include "physicaldisk.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c index f4f46a0fe..3f4846cfb 100644 --- a/src/detection/physicaldisk/physicaldisk_linux.c +++ b/src/detection/physicaldisk/physicaldisk_linux.c @@ -1,6 +1,6 @@ #include "physicaldisk.h" -#include "common/io/io.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/properties.h" #include "util/stringUtils.h" #include diff --git a/src/detection/physicaldisk/physicaldisk_windows.c b/src/detection/physicaldisk/physicaldisk_windows.c index 0a6e76d58..12d9b38ed 100644 --- a/src/detection/physicaldisk/physicaldisk_windows.c +++ b/src/detection/physicaldisk/physicaldisk_windows.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m index b7b25d528..550d94c74 100644 --- a/src/detection/physicalmemory/physicalmemory_apple.m +++ b/src/detection/physicalmemory/physicalmemory_apple.m @@ -1,5 +1,5 @@ #include "physicalmemory.h" -#include "common/processing.h" +#include "util/processing.h" #include "util/smbiosHelper.h" #include "util/stringUtils.h" #include "util/apple/cf_helpers.h" diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c index 0aba7e4dd..d1c496094 100644 --- a/src/detection/poweradapter/poweradapter_linux.c +++ b/src/detection/poweradapter/poweradapter_linux.c @@ -1,5 +1,5 @@ #include "poweradapter.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c index 1c4641178..c85c4b3bb 100644 --- a/src/detection/processes/processes_linux.c +++ b/src/detection/processes/processes_linux.c @@ -1,6 +1,6 @@ #include "processes.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" const char* ffDetectProcesses(uint32_t* result) diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c index 2f8fdcbe0..a1ec6a20e 100644 --- a/src/detection/publicip/publicip.c +++ b/src/detection/publicip/publicip.c @@ -1,5 +1,5 @@ #include "publicip.h" -#include "common/networking/networking.h" +#include "util/networking/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState states[2]; diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c index dae28a4ed..73a5ae42b 100644 --- a/src/detection/sound/sound_bsd.c +++ b/src/detection/sound/sound_bsd.c @@ -1,6 +1,6 @@ #include "sound.h" -#include "common/io/io.h" -#include "common/sysctl.h" +#include "util/io/io.h" +#include "util/sysctl.h" #include #include diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c index 675859768..ecd074367 100644 --- a/src/detection/sound/sound_linux.c +++ b/src/detection/sound/sound_linux.c @@ -1,7 +1,7 @@ #include "sound.h" #ifdef FF_HAVE_PULSE -#include +#include "util/library.h" #include static void paSinkInfoCallback(pa_context *c, const pa_sink_info *i, int eol, void *userdata) diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c index 88fd5f505..792304c35 100644 --- a/src/detection/sound/sound_nbsd.c +++ b/src/detection/sound/sound_nbsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c index d6e43eede..0bfda3f02 100644 --- a/src/detection/sound/sound_sunos.c +++ b/src/detection/sound/sound_sunos.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/swap/swap_bsd.c b/src/detection/swap/swap_bsd.c index c3e40b3df..9fb40d1a6 100644 --- a/src/detection/swap/swap_bsd.c +++ b/src/detection/swap/swap_bsd.c @@ -1,5 +1,5 @@ #include "swap.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include #include diff --git a/src/detection/swap/swap_linux.c b/src/detection/swap/swap_linux.c index 5c4971d8f..2c70d3064 100644 --- a/src/detection/swap/swap_linux.c +++ b/src/detection/swap/swap_linux.c @@ -1,6 +1,6 @@ #include "swap.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c index 5e0d6204f..3a6c5368e 100644 --- a/src/detection/terminalfont/terminalfont.c +++ b/src/detection/terminalfont/terminalfont.c @@ -1,10 +1,10 @@ #include "terminalfont.h" -#include "common/io/io.h" -#include "common/properties.h" -#include "common/processing.h" -#include "detection/terminalshell/terminalshell.h" +#include "util/io/io.h" +#include "util/properties.h" +#include "util/processing.h" #include "util/debug.h" #include "util/stringUtils.h" +#include "detection/terminalshell/terminalshell.h" static void detectAlacritty(FFTerminalFontResult* terminalFont) { diff --git a/src/detection/terminalfont/terminalfont.h b/src/detection/terminalfont/terminalfont.h index 03ddad99e..b0b468f2d 100644 --- a/src/detection/terminalfont/terminalfont.h +++ b/src/detection/terminalfont/terminalfont.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "common/font.h" +#include "util/font.h" #include "modules/font/option.h" typedef struct FFTerminalFontResult diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c index dc9c59f46..8514d6579 100644 --- a/src/detection/terminalfont/terminalfont_android.c +++ b/src/detection/terminalfont/terminalfont_android.c @@ -1,10 +1,10 @@ #include "fastfetch.h" #include "terminalfont.h" #include "detection/terminalshell/terminalshell.h" -#include "common/io/io.h" +#include "util/io/io.h" #ifdef FF_HAVE_FREETYPE - #include "common/library.h" + #include "util/library.h" #include #include FT_FREETYPE_H #endif diff --git a/src/detection/terminalfont/terminalfont_apple.m b/src/detection/terminalfont/terminalfont_apple.m index 2ee70007b..f9da1fbef 100644 --- a/src/detection/terminalfont/terminalfont_apple.m +++ b/src/detection/terminalfont/terminalfont_apple.m @@ -1,5 +1,5 @@ #include "terminalfont.h" -#include "common/font.h" +#include "util/font.h" #include "detection/terminalshell/terminalshell.h" #include "util/apple/osascript.h" diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 7b4cbf92f..39b509bfe 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -1,15 +1,15 @@ -#include "common/font.h" +#include "util/font.h" #include "terminalfont.h" -#include "common/settings.h" -#include "common/properties.h" -#include "common/parsing.h" -#include "common/io/io.h" -#include "common/processing.h" -#include "detection/terminalshell/terminalshell.h" -#include "detection/displayserver/displayserver.h" +#include "util/settings.h" +#include "util/properties.h" +#include "util/parsing.h" +#include "util/io/io.h" +#include "util/processing.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/binary.h" +#include "detection/terminalshell/terminalshell.h" +#include "detection/displayserver/displayserver.h" static const char* getSystemMonospaceFont(void) { diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c index 059e1ac51..8065ceb29 100644 --- a/src/detection/terminalfont/terminalfont_windows.c +++ b/src/detection/terminalfont/terminalfont_windows.c @@ -1,11 +1,11 @@ -#include "common/library.h" -#include "common/io/io.h" -#include "common/processing.h" -#include "common/properties.h" -#include "detection/terminalshell/terminalshell.h" +#include "util/library.h" +#include "util/io/io.h" +#include "util/processing.h" +#include "util/properties.h" #include "util/windows/unicode.h" #include "util/windows/registry.h" #include "util/stringUtils.h" +#include "detection/terminalshell/terminalshell.h" #include "terminalfont.h" #include diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index 015bbfcac..8e54995a7 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "common/io/io.h" -#include "common/processing.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/processing.h" +#include "util/properties.h" #include "util/path.h" #include "util/stringUtils.h" #include "util/binary.h" diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 165b9c19b..3376ecbfe 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -1,8 +1,8 @@ #include "terminalshell.h" -#include "common/io/io.h" -#include "common/parsing.h" -#include "common/processing.h" -#include "common/thread.h" +#include "util/io/io.h" +#include "util/parsing.h" +#include "util/processing.h" +#include "util/thread.h" #include "util/stringUtils.h" #include diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index 1fc1ad760..177f4d273 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -1,7 +1,7 @@ #include "terminalshell.h" -#include "common/io/io.h" -#include "common/processing.h" -#include "common/thread.h" +#include "util/io/io.h" +#include "util/processing.h" +#include "util/thread.h" #include "util/mallocHelper.h" #include "util/windows/registry.h" #include "util/windows/unicode.h" diff --git a/src/detection/terminalsize/terminalsize_linux.c b/src/detection/terminalsize/terminalsize_linux.c index cb6880f8d..d74a4d933 100644 --- a/src/detection/terminalsize/terminalsize_linux.c +++ b/src/detection/terminalsize/terminalsize_linux.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/detection/terminalsize/terminalsize_windows.c b/src/detection/terminalsize/terminalsize_windows.c index ae9970eb9..8c05f05c2 100644 --- a/src/detection/terminalsize/terminalsize_windows.c +++ b/src/detection/terminalsize/terminalsize_windows.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "common/io/io.h" +#include "util/io/io.h" #include diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c index b42b61a07..f40a53675 100644 --- a/src/detection/terminaltheme/terminaltheme.c +++ b/src/detection/terminaltheme/terminaltheme.c @@ -1,5 +1,5 @@ #include "terminaltheme.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/theme/theme_linux.c b/src/detection/theme/theme_linux.c index 650130775..1e9496823 100644 --- a/src/detection/theme/theme_linux.c +++ b/src/detection/theme/theme_linux.c @@ -1,5 +1,5 @@ #include "theme.h" -#include "common/parsing.h" +#include "util/parsing.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/tpm/tpm_bsd.c b/src/detection/tpm/tpm_bsd.c index 2e32d512b..251f13b31 100644 --- a/src/detection/tpm/tpm_bsd.c +++ b/src/detection/tpm/tpm_bsd.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/kmod.h" const char* ffDetectTPM(FFTPMResult* result) diff --git a/src/detection/tpm/tpm_linux.c b/src/detection/tpm/tpm_linux.c index 90c7cf7c1..593f76555 100644 --- a/src/detection/tpm/tpm_linux.c +++ b/src/detection/tpm/tpm_linux.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "common/io/io.h" +#include "util/io/io.h" const char* ffDetectTPM(FFTPMResult* result) { diff --git a/src/detection/tpm/tpm_windows.c b/src/detection/tpm/tpm_windows.c index 32ec92da9..1d663238c 100644 --- a/src/detection/tpm/tpm_windows.c +++ b/src/detection/tpm/tpm_windows.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "common/library.h" +#include "util/library.h" #include #include diff --git a/src/detection/uptime/uptime_bsd.c b/src/detection/uptime/uptime_bsd.c index 57a17b0d7..3cd4dc56e 100644 --- a/src/detection/uptime/uptime_bsd.c +++ b/src/detection/uptime/uptime_bsd.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "common/time.h" +#include "util/time.h" #include #include diff --git a/src/detection/uptime/uptime_haiku.c b/src/detection/uptime/uptime_haiku.c index a2c48a5ec..7b2395406 100644 --- a/src/detection/uptime/uptime_haiku.c +++ b/src/detection/uptime/uptime_haiku.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "common/time.h" +#include "util/time.h" const char* ffDetectUptime(FFUptimeResult* result) { diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c index 1007374ce..6cfa770be 100644 --- a/src/detection/uptime/uptime_linux.c +++ b/src/detection/uptime/uptime_linux.c @@ -1,6 +1,6 @@ #include "uptime.h" -#include "common/time.h" -#include "common/io/io.h" +#include "util/time.h" +#include "util/io/io.h" #include diff --git a/src/detection/uptime/uptime_sunos.c b/src/detection/uptime/uptime_sunos.c index fe45b61c8..b0a34f2ef 100644 --- a/src/detection/uptime/uptime_sunos.c +++ b/src/detection/uptime/uptime_sunos.c @@ -1,5 +1,6 @@ #include "uptime.h" -#include "common/time.h" +#include "util/time.h" + #include const char* ffDetectUptime(FFUptimeResult* result) diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c index 6978a1163..b75187c1d 100644 --- a/src/detection/uptime/uptime_windows.c +++ b/src/detection/uptime/uptime_windows.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "common/time.h" +#include "util/time.h" #include diff --git a/src/detection/users/users_linux.c b/src/detection/users/users_linux.c index 6875a423b..29b18f09f 100644 --- a/src/detection/users/users_linux.c +++ b/src/detection/users/users_linux.c @@ -1,5 +1,5 @@ -#include "common/io/io.h" -#include "common/properties.h" +#include "util/io/io.h" +#include "util/properties.h" #include "fastfetch.h" #include "users.h" diff --git a/src/detection/users/users_obsd.c b/src/detection/users/users_obsd.c index db7a89467..17390f4d3 100644 --- a/src/detection/users/users_obsd.c +++ b/src/detection/users/users_obsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "users.h" -#include "common/io/io.h" +#include "util/io/io.h" #include @@ -31,6 +31,6 @@ next: ffStrbufInit(&user->clientIp); user->loginTime = (uint64_t) n.ut_time * 1000; } - + return NULL; } diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 3ff3b38c0..969353e99 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -3,9 +3,9 @@ #include "detection/vulkan/vulkan.h" #ifdef FF_HAVE_VULKAN -#include "common/library.h" -#include "common/io/io.h" -#include "common/parsing.h" +#include "util/library.h" +#include "util/io/io.h" +#include "util/parsing.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wallpaper/wallpaper_apple.m b/src/detection/wallpaper/wallpaper_apple.m index 6780828d3..33fe54488 100644 --- a/src/detection/wallpaper/wallpaper_apple.m +++ b/src/detection/wallpaper/wallpaper_apple.m @@ -1,5 +1,5 @@ #include "wallpaper.h" -#include "common/settings.h" +#include "util/settings.h" #include "util/apple/osascript.h" #import diff --git a/src/detection/wallpaper/wallpaper_linux.c b/src/detection/wallpaper/wallpaper_linux.c index d2aa65b6c..76b4274f3 100644 --- a/src/detection/wallpaper/wallpaper_linux.c +++ b/src/detection/wallpaper/wallpaper_linux.c @@ -1,5 +1,5 @@ #include "wallpaper.h" -#include "common/settings.h" +#include "util/settings.h" #include "detection/gtk_qt/gtk_qt.h" const char* ffDetectWallpaper(FFstrbuf* result) diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c index e244d6319..9fb62cb77 100644 --- a/src/detection/weather/weather.c +++ b/src/detection/weather/weather.c @@ -1,5 +1,5 @@ #include "weather.h" -#include "common/networking/networking.h" +#include "util/networking/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState state; diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index e74a96b37..6503285e7 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -1,7 +1,7 @@ #include "wifi.h" -#include "common/processing.h" -#include "common/properties.h" +#include "util/processing.h" +#include "util/properties.h" #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" #define FF_TERMUX_API_PARAM "WifiConnectionInfo" diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m index 77b661cc4..2c208e17d 100644 --- a/src/detection/wifi/wifi_apple.m +++ b/src/detection/wifi/wifi_apple.m @@ -1,5 +1,5 @@ #include "wifi.h" -#include "common/processing.h" +#include "util/processing.h" #include "util/stringUtils.h" #import diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c index 860b66bc2..461e61186 100644 --- a/src/detection/wifi/wifi_bsd.c +++ b/src/detection/wifi/wifi_bsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c index 1826c656c..53781e64e 100644 --- a/src/detection/wifi/wifi_linux.c +++ b/src/detection/wifi/wifi_linux.c @@ -1,8 +1,8 @@ #include "wifi.h" -#include "common/dbus.h" -#include "common/io/io.h" -#include "common/processing.h" -#include "common/properties.h" +#include "util/dbus.h" +#include "util/io/io.h" +#include "util/processing.h" +#include "util/properties.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c index 2f0db6523..3339cf395 100644 --- a/src/detection/wifi/wifi_nbsd.c +++ b/src/detection/wifi/wifi_nbsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #define COMPAT_FREEBSD_NET80211 1 diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c index f811b585c..830e984e5 100644 --- a/src/detection/wifi/wifi_obsd.c +++ b/src/detection/wifi/wifi_obsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c index c0b539231..98c40b683 100644 --- a/src/detection/wifi/wifi_windows.c +++ b/src/detection/wifi/wifi_windows.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "common/library.h" +#include "util/library.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/wm/wm_apple.m b/src/detection/wm/wm_apple.m index 889d7ccb4..1289cb58c 100644 --- a/src/detection/wm/wm_apple.m +++ b/src/detection/wm/wm_apple.m @@ -1,6 +1,6 @@ #include "wm.h" -#include "common/sysctl.h" +#include "util/sysctl.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c index 25abcc4da..7ebc43338 100644 --- a/src/detection/wm/wm_linux.c +++ b/src/detection/wm/wm_linux.c @@ -1,12 +1,12 @@ #include "wm.h" -#include "common/processing.h" -#include "common/io/io.h" -#include "detection/displayserver/displayserver.h" +#include "util/processing.h" +#include "util/io/io.h" #include "util/binary.h" #include "util/path.h" #include "util/stringUtils.h" #include "util/debug.h" +#include "detection/displayserver/displayserver.h" const char* ffDetectWMPlugin(FF_MAYBE_UNUSED FFstrbuf* pluginName) { diff --git a/src/detection/wm/wm_windows.cpp b/src/detection/wm/wm_windows.cpp index 5eff2d15b..01acf5830 100644 --- a/src/detection/wm/wm_windows.cpp +++ b/src/detection/wm/wm_windows.cpp @@ -1,9 +1,9 @@ extern "C" { #include "wm.h" -#include "common/io/io.h" -#include "detection/terminalshell/terminalshell.h" +#include "util/io/io.h" #include "util/windows/version.h" +#include "detection/terminalshell/terminalshell.h" } #include "util/windows/com.hpp" diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c index 2c4d1694a..adf3a66e0 100644 --- a/src/detection/wmtheme/wmtheme_linux.c +++ b/src/detection/wmtheme/wmtheme_linux.c @@ -1,12 +1,12 @@ #include "wmtheme.h" -#include "common/io/io.h" -#include "common/properties.h" -#include "common/parsing.h" -#include "common/settings.h" -#include "detection/gtk_qt/gtk_qt.h" -#include "detection/displayserver/displayserver.h" +#include "util/io/io.h" +#include "util/properties.h" +#include "util/parsing.h" +#include "util/settings.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" +#include "detection/gtk_qt/gtk_qt.h" +#include "detection/displayserver/displayserver.h" static bool detectWMThemeFromConfigFile(const char* configFile, const char* themeRegex, const char* defaultValue, FFstrbuf* themeOrError) { diff --git a/src/detection/zpool/zpool.c b/src/detection/zpool/zpool.c index fcf37b0f2..83c5609fa 100644 --- a/src/detection/zpool/zpool.c +++ b/src/detection/zpool/zpool.c @@ -10,7 +10,7 @@ #include "libzfs_simplified.h" #endif -#include "common/library.h" +#include "util/library.h" typedef struct FFZfsData { diff --git a/src/fastfetch.c b/src/fastfetch.c index b68bd1a6e..d7cfe540e 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -1,11 +1,11 @@ #include "fastfetch.h" -#include "common/commandoption.h" -#include "common/init.h" -#include "common/io/io.h" -#include "common/jsonconfig.h" -#include "common/time.h" #include "detection/version/version.h" #include "logo/logo.h" +#include "util/commandoption.h" +#include "util/init.h" +#include "util/io/io.h" +#include "util/jsonconfig.h" +#include "util/time.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" #include "fastfetch_datatext.h" diff --git a/src/flashfetch.c b/src/flashfetch.c index e4815686c..100d30b48 100644 --- a/src/flashfetch.c +++ b/src/flashfetch.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/init.h" +#include "util/init.h" #include "logo/logo.h" #include "modules/modules.h" diff --git a/src/logo/builtin.c b/src/logo/builtin.c index b646e3d46..53f526b6a 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -1,6 +1,6 @@ #include "logo.h" #include "logo_builtin.h" -#include "common/color.h" +#include "util/color.h" const FFlogo ffLogoUnknown = { .names = {"unknown"}, diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c index 4893eeaad..3243f847b 100644 --- a/src/logo/image/im6.c +++ b/src/logo/image/im6.c @@ -1,7 +1,7 @@ #ifdef FF_HAVE_IMAGEMAGICK6 #include "image.h" -#include "common/library.h" +#include "util/library.h" #include diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c index b33c0ccf9..8ed0e0c65 100644 --- a/src/logo/image/im7.c +++ b/src/logo/image/im7.c @@ -1,7 +1,7 @@ #ifdef FF_HAVE_IMAGEMAGICK7 #include "image.h" -#include "common/library.h" +#include "util/library.h" #include diff --git a/src/logo/image/image.c b/src/logo/image/image.c index 5462a2113..eb070a0d4 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -1,7 +1,7 @@ #include "image.h" -#include "common/io/io.h" -#include "common/printing.h" -#include "common/processing.h" +#include "util/io/io.h" +#include "util/printing.h" +#include "util/processing.h" #include "util/stringUtils.h" #include "util/base64.h" #include "detection/terminalsize/terminalsize.h" @@ -421,7 +421,7 @@ static inline char* realpath(const char* restrict file_name, char* restrict reso #endif #ifdef FF_HAVE_ZLIB -#include "common/library.h" +#include "util/library.h" #include #include diff --git a/src/logo/logo.c b/src/logo/logo.c index a5d906840..5b5390431 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -1,12 +1,12 @@ #include "logo/logo.h" -#include "common/io/io.h" -#include "common/printing.h" -#include "common/processing.h" +#include "util/io/io.h" +#include "util/printing.h" +#include "util/processing.h" +#include "util/textModifier.h" +#include "util/stringUtils.h" #include "detection/media/media.h" #include "detection/os/os.h" #include "detection/terminalshell/terminalshell.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" #include #include diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index dc87a3269..fb22003cb 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -1,11 +1,11 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/duration.h" -#include "common/temps.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/duration.h" +#include "util/temps.h" +#include "util/stringUtils.h" #include "detection/battery/battery.h" #include "modules/battery/battery.h" -#include "util/stringUtils.h" static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index) { diff --git a/src/modules/battery/option.h b/src/modules/battery/option.h index 1ac5b97be..93ef0d50f 100644 --- a/src/modules/battery/option.h +++ b/src/modules/battery/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFBatteryOptions { diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index 4eee62730..15234f3cd 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/bios/bios.h" #include "modules/bios/bios.h" -#include "util/stringUtils.h" bool ffPrintBios(FFBiosOptions* options) { diff --git a/src/modules/bios/option.h b/src/modules/bios/option.h index 000803569..350afdcc6 100644 --- a/src/modules/bios/option.h +++ b/src/modules/bios/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFBiosOptions { diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index ad6bcd064..d26dbe5c7 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/bluetooth/bluetooth.h" #include "modules/bluetooth/bluetooth.h" -#include "util/stringUtils.h" static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* device, uint8_t index) { diff --git a/src/modules/bluetooth/option.h b/src/modules/bluetooth/option.h index 516c0d8b4..7453a1ebd 100644 --- a/src/modules/bluetooth/option.h +++ b/src/modules/bluetooth/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFBluetoothOptions { diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index b127f9349..8adf8e069 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/bluetoothradio/bluetoothradio.h" #include "modules/bluetoothradio/bluetoothradio.h" -#include "util/stringUtils.h" #define FF_BLUETOOTHRADIO_DISPLAY_NAME "Bluetooth Radio" diff --git a/src/modules/bluetoothradio/option.h b/src/modules/bluetoothradio/option.h index 1b718b834..55c3090e3 100644 --- a/src/modules/bluetoothradio/option.h +++ b/src/modules/bluetoothradio/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFBluetoothRadioOptions { diff --git a/src/modules/board/board.c b/src/modules/board/board.c index 9f572e69f..ef4174b2c 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/board/board.h" #include "modules/board/board.h" -#include "util/stringUtils.h" bool ffPrintBoard(FFBoardOptions* options) { diff --git a/src/modules/board/option.h b/src/modules/board/option.h index bcc69adf3..79bcd9c52 100644 --- a/src/modules/board/option.h +++ b/src/modules/board/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFBoardOptions { diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index d953a1503..4c0d80305 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/bootmgr/bootmgr.h" #include "modules/bootmgr/bootmgr.h" -#include "util/stringUtils.h" bool ffPrintBootmgr(FFBootmgrOptions* options) { diff --git a/src/modules/bootmgr/option.h b/src/modules/bootmgr/option.h index e27e71efd..b5a62dbbe 100644 --- a/src/modules/bootmgr/option.h +++ b/src/modules/bootmgr/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFBootmgrOptions { diff --git a/src/modules/break/break.c b/src/modules/break/break.c index e3b958782..8f68af87d 100644 --- a/src/modules/break/break.c +++ b/src/modules/break/break.c @@ -1,4 +1,4 @@ -#include "common/printing.h" +#include "util/printing.h" #include "logo/logo.h" #include "modules/break/break.h" diff --git a/src/modules/break/option.h b/src/modules/break/option.h index e5acbf20d..b768196ee 100644 --- a/src/modules/break/option.h +++ b/src/modules/break/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFBreakOptions { diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index cc758e285..52bd00d80 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/brightness/brightness.h" #include "modules/brightness/brightness.h" -#include "util/stringUtils.h" bool ffPrintBrightness(FFBrightnessOptions* options) { diff --git a/src/modules/brightness/option.h b/src/modules/brightness/option.h index 4ff3843e7..41bb5e202 100644 --- a/src/modules/brightness/option.h +++ b/src/modules/brightness/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFBrightnessOptions { diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index b3f968d88..fed42af5c 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -1,10 +1,10 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/btrfs/btrfs.h" #include "modules/btrfs/btrfs.h" -#include "util/stringUtils.h" static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t index) { diff --git a/src/modules/btrfs/option.h b/src/modules/btrfs/option.h index 019eacb19..052b5a783 100644 --- a/src/modules/btrfs/option.h +++ b/src/modules/btrfs/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFBtrfsOptions { diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index 19c28e95a..b40fc71ac 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/libc/libc.h" #include "detection/camera/camera.h" #include "modules/camera/camera.h" -#include "util/stringUtils.h" static void printDevice(FFCameraOptions* options, const FFCameraResult* device, uint8_t index) { diff --git a/src/modules/camera/option.h b/src/modules/camera/option.h index 6a2481fe8..7b99bfc42 100644 --- a/src/modules/camera/option.h +++ b/src/modules/camera/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFCameraOptions { diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index 068e51cc0..a9111cf9e 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/chassis/chassis.h" #include "modules/chassis/chassis.h" -#include "util/stringUtils.h" bool ffPrintChassis(FFChassisOptions* options) { diff --git a/src/modules/chassis/option.h b/src/modules/chassis/option.h index b3100653f..fae05cbed 100644 --- a/src/modules/chassis/option.h +++ b/src/modules/chassis/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFChassisOptions { diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index e3e9e04a7..9527bbb42 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "logo/logo.h" -#include "modules/colors/colors.h" +#include "util/printing.h" +#include "util/jsonconfig.h" #include "util/textModifier.h" #include "util/stringUtils.h" +#include "logo/logo.h" +#include "modules/colors/colors.h" static inline uint8_t min(uint8_t a, uint8_t b) { diff --git a/src/modules/colors/option.h b/src/modules/colors/option.h index 6a0bbb0d4..12d77a7e4 100644 --- a/src/modules/colors/option.h +++ b/src/modules/colors/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFColorsSymbol { diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 84ecba557..0f8b7e430 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -1,5 +1,5 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" #include "modules/command/command.h" #include "detection/command/command.h" diff --git a/src/modules/command/option.h b/src/modules/command/option.h index 06f3b05b3..2b3a13545 100644 --- a/src/modules/command/option.h +++ b/src/modules/command/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFCommandOptions { diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 1e2e75378..65252a899 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/parsing.h" -#include "common/temps.h" -#include "common/frequency.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/parsing.h" +#include "util/temps.h" +#include "util/frequency.h" #include "detection/cpu/cpu.h" #include "modules/cpu/cpu.h" diff --git a/src/modules/cpu/option.h b/src/modules/cpu/option.h index 428b40a6b..9dae8e4f8 100644 --- a/src/modules/cpu/option.h +++ b/src/modules/cpu/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFCPUOptions { diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index e3664909a..e9d4df261 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/cpucache/cpucache.h" #include "modules/cpucache/cpucache.h" -#include "util/stringUtils.h" #define FF_CPUCACHE_DISPLAY_NAME "CPU Cache" diff --git a/src/modules/cpucache/option.h b/src/modules/cpucache/option.h index f53acf691..3ac2c5e04 100644 --- a/src/modules/cpucache/option.h +++ b/src/modules/cpucache/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFCPUCacheOptions { diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index d9a3ecc8c..eb04341f1 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/stringUtils.h" #include "detection/cpuusage/cpuusage.h" #include "modules/cpuusage/cpuusage.h" -#include "util/stringUtils.h" #define FF_CPUUSAGE_DISPLAY_NAME "CPU Usage" diff --git a/src/modules/cpuusage/option.h b/src/modules/cpuusage/option.h index dc19fbe76..32ed6d0bc 100644 --- a/src/modules/cpuusage/option.h +++ b/src/modules/cpuusage/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFCPUUsageOptions { diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 93e14dcbb..e2cd83cef 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/cursor/cursor.h" #include "modules/cursor/cursor.h" -#include "util/stringUtils.h" bool ffPrintCursor(FFCursorOptions* options) { diff --git a/src/modules/cursor/option.h b/src/modules/cursor/option.h index 3f02c567c..5df94b8e0 100644 --- a/src/modules/cursor/option.h +++ b/src/modules/cursor/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFCursorOptions { diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index bee9ed21f..cee7f9874 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "modules/custom/custom.h" +#include "util/printing.h" +#include "util/jsonconfig.h" #include "util/textModifier.h" #include "util/stringUtils.h" +#include "modules/custom/custom.h" bool ffPrintCustom(FFCustomOptions* options) { diff --git a/src/modules/custom/option.h b/src/modules/custom/option.h index c66ccee7d..89a6044d0 100644 --- a/src/modules/custom/option.h +++ b/src/modules/custom/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFCustomOptions { diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index 233f11cf7..d65458837 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -1,8 +1,8 @@ -#include "common/time.h" -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "modules/datetime/datetime.h" +#include "util/time.h" +#include "util/printing.h" +#include "util/jsonconfig.h" #include "util/stringUtils.h" +#include "modules/datetime/datetime.h" #include diff --git a/src/modules/datetime/option.h b/src/modules/datetime/option.h index fffd5dc51..ef6da988d 100644 --- a/src/modules/datetime/option.h +++ b/src/modules/datetime/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFDateTimeOptions { diff --git a/src/modules/de/de.c b/src/modules/de/de.c index 60870e3c9..eac9cc524 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "detection/de/de.h" #include "modules/de/de.h" -#include "util/stringUtils.h" bool ffPrintDE(FFDEOptions* options) { diff --git a/src/modules/de/option.h b/src/modules/de/option.h index c587a0c96..b442cb2cb 100644 --- a/src/modules/de/option.h +++ b/src/modules/de/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFDEOptions { diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 947f7482f..f3656483c 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/size.h" -#include "common/time.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/size.h" +#include "util/time.h" #include "detection/disk/disk.h" #include "modules/disk/disk.h" diff --git a/src/modules/disk/option.h b/src/modules/disk/option.h index f4ec16f93..76445ecff 100644 --- a/src/modules/disk/option.h +++ b/src/modules/disk/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef enum __attribute__((__packed__)) FFDiskVolumeType { diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index e353d95f5..de15f18fa 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/diskio/diskio.h" #include "modules/diskio/diskio.h" -#include "util/stringUtils.h" #define FF_DISKIO_DISPLAY_NAME "Disk IO" diff --git a/src/modules/diskio/option.h b/src/modules/diskio/option.h index 5de458fa3..c32db7e75 100644 --- a/src/modules/diskio/option.h +++ b/src/modules/diskio/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFDiskIOOptions { diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 0a9a4563c..75dd7b424 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "modules/display/display.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/display/option.h b/src/modules/display/option.h index 12ad3c5ec..6735ec319 100644 --- a/src/modules/display/option.h +++ b/src/modules/display/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFDisplayCompactType { diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index a92784df6..69596473f 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/dns/dns.h" #include "modules/dns/dns.h" -#include "util/stringUtils.h" bool ffPrintDNS(FFDNSOptions* options) { diff --git a/src/modules/dns/option.h b/src/modules/dns/option.h index bc3bd5690..b287d0349 100644 --- a/src/modules/dns/option.h +++ b/src/modules/dns/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFDNSShowType { FF_DNS_TYPE_IPV4_BIT = 1, diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index 6e1551402..2f0d501af 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/libc/libc.h" #include "detection/editor/editor.h" #include "modules/editor/editor.h" -#include "util/stringUtils.h" bool ffPrintEditor(FFEditorOptions* options) { diff --git a/src/modules/editor/option.h b/src/modules/editor/option.h index f7c545f84..93597d908 100644 --- a/src/modules/editor/option.h +++ b/src/modules/editor/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFEditorOptions { diff --git a/src/modules/font/font.c b/src/modules/font/font.c index b85a9e94d..da568a87f 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/font/font.h" #include "modules/font/font.h" -#include "util/stringUtils.h" bool ffPrintFont(FFFontOptions* options) { diff --git a/src/modules/font/option.h b/src/modules/font/option.h index 6c942e7dd..83c6e338f 100644 --- a/src/modules/font/option.h +++ b/src/modules/font/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFFontOptions { diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 327d73b15..dd213abd0 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/gamepad/gamepad.h" #include "modules/gamepad/gamepad.h" -#include "util/stringUtils.h" static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device, uint8_t index) { diff --git a/src/modules/gamepad/option.h b/src/modules/gamepad/option.h index b52b1dea3..a977cd8b5 100644 --- a/src/modules/gamepad/option.h +++ b/src/modules/gamepad/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" #include "util/FFlist.h" typedef struct FFGamepadOptions diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 723a2cebe..d84750cbd 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -1,13 +1,13 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/temps.h" -#include "common/size.h" -#include "common/frequency.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/temps.h" +#include "util/size.h" +#include "util/frequency.h" +#include "util/stringUtils.h" #include "detection/host/host.h" #include "detection/gpu/gpu.h" #include "modules/gpu/gpu.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/gpu/option.h b/src/modules/gpu/option.h index 0d1d0fac8..e732877d8 100644 --- a/src/modules/gpu/option.h +++ b/src/modules/gpu/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef enum __attribute__((__packed__)) FFGPUType { diff --git a/src/modules/host/host.c b/src/modules/host/host.c index b86e37d54..d681db453 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/host/host.h" #include "modules/host/host.h" -#include "util/stringUtils.h" bool ffPrintHost(FFHostOptions* options) { diff --git a/src/modules/host/option.h b/src/modules/host/option.h index 2516f864c..1fc37b2f5 100644 --- a/src/modules/host/option.h +++ b/src/modules/host/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFHostOptions { diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index b50b85363..e1716edcc 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/icons/icons.h" #include "modules/icons/icons.h" -#include "util/stringUtils.h" bool ffPrintIcons(FFIconsOptions* options) { diff --git a/src/modules/icons/option.h b/src/modules/icons/option.h index 966bba5f5..7cc423fad 100644 --- a/src/modules/icons/option.h +++ b/src/modules/icons/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFIconsOptions { diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index d32f7a6dd..e667c7f59 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/initsystem/initsystem.h" #include "modules/initsystem/initsystem.h" -#include "util/stringUtils.h" #define FF_INITSYSTEM_DISPLAY_NAME "Init System" diff --git a/src/modules/initsystem/option.h b/src/modules/initsystem/option.h index 54c10158e..922d8fbfe 100644 --- a/src/modules/initsystem/option.h +++ b/src/modules/initsystem/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFInitSystemOptions { diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 665361704..5ef2a3369 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/size.h" -#include "modules/kernel/kernel.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/size.h" #include "util/stringUtils.h" +#include "modules/kernel/kernel.h" bool ffPrintKernel(FFKernelOptions* options) { diff --git a/src/modules/kernel/option.h b/src/modules/kernel/option.h index 2b2b27d7e..3f632ba18 100644 --- a/src/modules/kernel/option.h +++ b/src/modules/kernel/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFKernelOptions { diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c index b33c4ff4a..f7749034d 100644 --- a/src/modules/keyboard/keyboard.c +++ b/src/modules/keyboard/keyboard.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/keyboard/keyboard.h" #include "modules/keyboard/keyboard.h" -#include "util/stringUtils.h" static void printDevice(FFKeyboardOptions* options, const FFKeyboardDevice* device, uint8_t index) { diff --git a/src/modules/keyboard/option.h b/src/modules/keyboard/option.h index 6f5244a6a..36784a7f0 100644 --- a/src/modules/keyboard/option.h +++ b/src/modules/keyboard/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" #include "util/FFlist.h" typedef struct FFKeyboardOptions diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index 0b17f3744..ea5ea1781 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/lm/lm.h" #include "modules/lm/lm.h" -#include "util/stringUtils.h" bool ffPrintLM(FFLMOptions* options) { diff --git a/src/modules/lm/option.h b/src/modules/lm/option.h index 21a4ad8b7..c0ccd9147 100644 --- a/src/modules/lm/option.h +++ b/src/modules/lm/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFLMOptions { diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 793786e04..cb7874e24 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -1,10 +1,10 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/stringUtils.h" #include "detection/loadavg/loadavg.h" #include "detection/cpu/cpu.h" #include "modules/loadavg/loadavg.h" -#include "util/stringUtils.h" bool ffPrintLoadavg(FFLoadavgOptions* options) { diff --git a/src/modules/loadavg/option.h b/src/modules/loadavg/option.h index 947b310db..d5b57094f 100644 --- a/src/modules/loadavg/option.h +++ b/src/modules/loadavg/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFLoadavgOptions { diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index a5bc15a43..d2151ed15 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/locale/locale.h" #include "modules/locale/locale.h" -#include "util/stringUtils.h" bool ffPrintLocale(FFLocaleOptions* options) { diff --git a/src/modules/locale/option.h b/src/modules/locale/option.h index 236d61ee3..2f1efd722 100644 --- a/src/modules/locale/option.h +++ b/src/modules/locale/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFLocaleOptions { diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index bb479099d..344e0a25b 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/localip/localip.h" #include "modules/localip/localip.h" -#include "util/stringUtils.h" #define FF_LOCALIP_DISPLAY_NAME "Local IP" #pragma GCC diagnostic ignored "-Wsign-conversion" diff --git a/src/modules/localip/option.h b/src/modules/localip/option.h index 18205263c..140d7c1f4 100644 --- a/src/modules/localip/option.h +++ b/src/modules/localip/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFLocalIpType { diff --git a/src/modules/media/media.c b/src/modules/media/media.c index ab1aafc3a..e667a2ef8 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/media/media.h" #include "modules/media/media.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/media/option.h b/src/modules/media/option.h index e90ee854f..6565c94f1 100644 --- a/src/modules/media/option.h +++ b/src/modules/media/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFMediaOptions { diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 182d55567..10a21bc3b 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -1,10 +1,10 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/memory/memory.h" #include "modules/memory/memory.h" -#include "util/stringUtils.h" bool ffPrintMemory(FFMemoryOptions* options) { diff --git a/src/modules/memory/option.h b/src/modules/memory/option.h index 243847f5f..a73399281 100644 --- a/src/modules/memory/option.h +++ b/src/modules/memory/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFMemoryOptions { diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 46a4ad78e..f6b98d8dc 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "modules/monitor/monitor.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/monitor/option.h b/src/modules/monitor/option.h index 07905ecba..2aff6e649 100644 --- a/src/modules/monitor/option.h +++ b/src/modules/monitor/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFMonitorOptions { diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c index a0e3ef69a..83d04b115 100644 --- a/src/modules/mouse/mouse.c +++ b/src/modules/mouse/mouse.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/mouse/mouse.h" #include "modules/mouse/mouse.h" -#include "util/stringUtils.h" static void printDevice(FFMouseOptions* options, const FFMouseDevice* device, uint8_t index) { diff --git a/src/modules/mouse/option.h b/src/modules/mouse/option.h index dcb5331f7..329e3644a 100644 --- a/src/modules/mouse/option.h +++ b/src/modules/mouse/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" #include "util/FFlist.h" typedef struct FFMouseOptions diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index fd5c90349..668248ba1 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/netio/netio.h" #include "modules/netio/netio.h" -#include "util/stringUtils.h" #define FF_NETIO_DISPLAY_NAME "Network IO" diff --git a/src/modules/netio/option.h b/src/modules/netio/option.h index 61ffa37d5..ba30d8b08 100644 --- a/src/modules/netio/option.h +++ b/src/modules/netio/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFNetIOOptions { diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index fd35e5bf5..829c98875 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/opencl/opencl.h" #include "detection/gpu/gpu.h" #include "modules/opencl/opencl.h" -#include "util/stringUtils.h" bool ffPrintOpenCL(FFOpenCLOptions* options) { diff --git a/src/modules/opencl/option.h b/src/modules/opencl/option.h index 2fd7dff26..0c020e140 100644 --- a/src/modules/opencl/option.h +++ b/src/modules/opencl/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFOpenCLOptions { diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 5dcc55540..421ff5ef0 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/opengl/opengl.h" #include "modules/opengl/opengl.h" -#include "util/stringUtils.h" bool ffPrintOpenGL(FFOpenGLOptions* options) { diff --git a/src/modules/opengl/option.h b/src/modules/opengl/option.h index cc4b6ef46..aabd35262 100644 --- a/src/modules/opengl/option.h +++ b/src/modules/opengl/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFOpenGLLibrary { diff --git a/src/modules/os/option.h b/src/modules/os/option.h index c7142b237..2fff435ca 100644 --- a/src/modules/os/option.h +++ b/src/modules/os/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFOSOptions { diff --git a/src/modules/os/os.c b/src/modules/os/os.c index 4745225ec..5e6981194 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/option.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/option.h" +#include "util/stringUtils.h" #include "detection/os/os.h" #include "modules/os/os.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h index f39541388..d7a83b2fa 100644 --- a/src/modules/packages/option.h +++ b/src/modules/packages/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFPackagesFlags { diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 5f78a0524..59670ec95 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/packages/packages.h" #include "modules/packages/packages.h" -#include "util/stringUtils.h" bool ffPrintPackages(FFPackagesOptions* options) { diff --git a/src/modules/physicaldisk/option.h b/src/modules/physicaldisk/option.h index 3951f0610..8e65494e1 100644 --- a/src/modules/physicaldisk/option.h +++ b/src/modules/physicaldisk/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFPhysicalDiskOptions { diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index e6dca99d1..8f66cebee 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -1,10 +1,10 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/temps.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/temps.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/physicaldisk/physicaldisk.h" #include "modules/physicaldisk/physicaldisk.h" -#include "util/stringUtils.h" #define FF_PHYSICALDISK_DISPLAY_NAME "Physical Disk" diff --git a/src/modules/physicalmemory/option.h b/src/modules/physicalmemory/option.h index 154354b4a..df41b4d5f 100644 --- a/src/modules/physicalmemory/option.h +++ b/src/modules/physicalmemory/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFPhysicalMemoryOptions { diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index 81e593f3f..4798541ae 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -1,10 +1,10 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/physicalmemory/physicalmemory.h" #include "modules/physicalmemory/physicalmemory.h" -#include "util/stringUtils.h" #define FF_PHYSICALMEMORY_DISPLAY_NAME "Physical Memory" diff --git a/src/modules/player/option.h b/src/modules/player/option.h index 9d55821fd..152253394 100644 --- a/src/modules/player/option.h +++ b/src/modules/player/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFPlayerOptions { diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 62592dced..37eca4d96 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/media/media.h" #include "modules/player/player.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/poweradapter/option.h b/src/modules/poweradapter/option.h index 303bbba73..96d37ded1 100644 --- a/src/modules/poweradapter/option.h +++ b/src/modules/poweradapter/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFPowerAdapterOptions { diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 1361bc60d..93117b863 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/poweradapter/poweradapter.h" #include "modules/poweradapter/poweradapter.h" -#include "util/stringUtils.h" #define FF_POWERADAPTER_DISPLAY_NAME "Power Adapter" diff --git a/src/modules/processes/option.h b/src/modules/processes/option.h index 0b59f9df3..4f11f77f6 100644 --- a/src/modules/processes/option.h +++ b/src/modules/processes/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFProcessesOptions { diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index fcec4c041..130bed411 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/processes/processes.h" #include "modules/processes/processes.h" -#include "util/stringUtils.h" bool ffPrintProcesses(FFProcessesOptions* options) { diff --git a/src/modules/publicip/option.h b/src/modules/publicip/option.h index e3118cb28..c02d4450c 100644 --- a/src/modules/publicip/option.h +++ b/src/modules/publicip/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFPublicIPOptions { diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 493d3d531..3c842c938 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "modules/publicip/publicip.h" #include "detection/publicip/publicip.h" -#include "util/stringUtils.h" #define FF_PUBLICIP_DISPLAY_NAME "Public IP" diff --git a/src/modules/separator/option.h b/src/modules/separator/option.h index a8b31379d..b905f90fe 100644 --- a/src/modules/separator/option.h +++ b/src/modules/separator/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFSeparatorOptions { diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index bf2a5ffb3..1b7a898f6 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -1,11 +1,11 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "logo/logo.h" -#include "modules/separator/separator.h" +#include "util/printing.h" +#include "util/jsonconfig.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" #include "util/wcwidth.h" #include "util/textModifier.h" +#include "logo/logo.h" +#include "modules/separator/separator.h" #include diff --git a/src/modules/shell/option.h b/src/modules/shell/option.h index 49ec83f51..5567ca970 100644 --- a/src/modules/shell/option.h +++ b/src/modules/shell/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFShellOptions { diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index 73feb0119..0e6ef540e 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/terminalshell/terminalshell.h" #include "modules/shell/shell.h" -#include "util/stringUtils.h" bool ffPrintShell(FFShellOptions* options) { diff --git a/src/modules/sound/option.h b/src/modules/sound/option.h index 0c9f0fd4f..c5f25e5ef 100644 --- a/src/modules/sound/option.h +++ b/src/modules/sound/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef enum __attribute__((__packed__)) FFSoundType { diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index e87af35d6..d5d12e55f 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -1,9 +1,9 @@ -#include "common/percent.h" -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/sound/sound.h" #include "modules/sound/sound.h" -#include "util/stringUtils.h" static void printDevice(FFSoundOptions* options, const FFSoundDevice* device, uint8_t index) { diff --git a/src/modules/swap/option.h b/src/modules/swap/option.h index 2d9691100..61f82935e 100644 --- a/src/modules/swap/option.h +++ b/src/modules/swap/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFSwapOptions { diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index d336cf972..d6a5d06c6 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -1,10 +1,10 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/size.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/size.h" +#include "util/stringUtils.h" #include "detection/swap/swap.h" #include "modules/swap/swap.h" -#include "util/stringUtils.h" void printSwap(FFSwapOptions* options, uint8_t index, FFSwapResult* storage) { diff --git a/src/modules/terminal/option.h b/src/modules/terminal/option.h index 49b005e03..744c03a4e 100644 --- a/src/modules/terminal/option.h +++ b/src/modules/terminal/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFTerminalOptions { diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index fdaf93dcc..dd8bbdf00 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/terminalshell/terminalshell.h" #include "modules/terminal/terminal.h" -#include "util/stringUtils.h" bool ffPrintTerminal(FFTerminalOptions* options) { diff --git a/src/modules/terminalfont/option.h b/src/modules/terminalfont/option.h index db652adce..972341123 100644 --- a/src/modules/terminalfont/option.h +++ b/src/modules/terminalfont/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFTerminalFontOptions { diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index b99ed6eda..4cdf30085 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/terminalfont/terminalfont.h" #include "modules/terminalfont/terminalfont.h" -#include "util/stringUtils.h" #define FF_TERMINALFONT_DISPLAY_NAME "Terminal Font" diff --git a/src/modules/terminalsize/option.h b/src/modules/terminalsize/option.h index 518856a8c..ec9f221ff 100644 --- a/src/modules/terminalsize/option.h +++ b/src/modules/terminalsize/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFTerminalSizeOptions { diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index b604c597c..ed380e7b4 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/terminalsize/terminalsize.h" #include "modules/terminalsize/terminalsize.h" -#include "util/stringUtils.h" #define FF_TERMINALSIZE_DISPLAY_NAME "Terminal Size" diff --git a/src/modules/terminaltheme/option.h b/src/modules/terminaltheme/option.h index 3d8cdc252..d2a55bf20 100644 --- a/src/modules/terminaltheme/option.h +++ b/src/modules/terminaltheme/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFTerminalThemeOptions { diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index f77d5e60c..2ffb37ee9 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/terminaltheme/terminaltheme.h" #include "modules/terminaltheme/terminaltheme.h" -#include "util/stringUtils.h" #include diff --git a/src/modules/theme/option.h b/src/modules/theme/option.h index ca232bfb9..614c24626 100644 --- a/src/modules/theme/option.h +++ b/src/modules/theme/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFThemeOptions { diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 89cd332d2..8a31f89b6 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/theme/theme.h" #include "modules/theme/theme.h" -#include "util/stringUtils.h" bool ffPrintTheme(FFThemeOptions* options) { diff --git a/src/modules/title/option.h b/src/modules/title/option.h index 16505d39b..99b29a2f5 100644 --- a/src/modules/title/option.h +++ b/src/modules/title/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFTitleOptions { diff --git a/src/modules/title/title.c b/src/modules/title/title.c index dd8519208..04ad37c37 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -1,7 +1,7 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "modules/title/title.h" +#include "util/printing.h" +#include "util/jsonconfig.h" #include "util/textModifier.h" +#include "modules/title/title.h" static void appendText(FFstrbuf* output, const FFstrbuf* text, const FFstrbuf* color) { diff --git a/src/modules/tpm/option.h b/src/modules/tpm/option.h index 19fb79029..a7c0ca7d2 100644 --- a/src/modules/tpm/option.h +++ b/src/modules/tpm/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFTPMOptions { diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c index b3f4e53cf..5c5d31960 100644 --- a/src/modules/tpm/tpm.c +++ b/src/modules/tpm/tpm.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/tpm/tpm.h" #include "modules/tpm/tpm.h" -#include "util/stringUtils.h" bool ffPrintTPM(FFTPMOptions* options) { diff --git a/src/modules/uptime/option.h b/src/modules/uptime/option.h index 4235995c5..ae92d600a 100644 --- a/src/modules/uptime/option.h +++ b/src/modules/uptime/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFUptimeOptions { diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index e1cbd9a8c..d3184865a 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -1,10 +1,10 @@ -#include "common/duration.h" -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/time.h" +#include "util/duration.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/time.h" +#include "util/stringUtils.h" #include "detection/uptime/uptime.h" #include "modules/uptime/uptime.h" -#include "util/stringUtils.h" bool ffPrintUptime(FFUptimeOptions* options) { diff --git a/src/modules/users/option.h b/src/modules/users/option.h index 16ea5e88f..151395209 100644 --- a/src/modules/users/option.h +++ b/src/modules/users/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFUsersOptions { diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 751816179..a089231ab 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/time.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/time.h" +#include "util/stringUtils.h" #include "detection/users/users.h" #include "modules/users/users.h" -#include "util/stringUtils.h" #pragma GCC diagnostic ignored "-Wformat" // warning: unknown conversion type character 'F' in format diff --git a/src/modules/version/option.h b/src/modules/version/option.h index f3b68b4f2..8f528ea18 100644 --- a/src/modules/version/option.h +++ b/src/modules/version/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFVersionOptions { diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 4350e7170..a12e330ba 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/libc/libc.h" #include "detection/version/version.h" #include "modules/version/version.h" -#include "util/stringUtils.h" bool ffPrintVersion(FFVersionOptions* options) { diff --git a/src/modules/vulkan/option.h b/src/modules/vulkan/option.h index 38ec20c99..faf22440e 100644 --- a/src/modules/vulkan/option.h +++ b/src/modules/vulkan/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFVulkanOptions { diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index d77400725..2f2629a6a 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/gpu/gpu.h" #include "detection/vulkan/vulkan.h" #include "modules/vulkan/vulkan.h" -#include "util/stringUtils.h" bool ffPrintVulkan(FFVulkanOptions* options) { diff --git a/src/modules/wallpaper/option.h b/src/modules/wallpaper/option.h index 621699fa3..b19f06987 100644 --- a/src/modules/wallpaper/option.h +++ b/src/modules/wallpaper/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFWallpaperOptions { diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 61098f278..e8da5ecfe 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/wallpaper/wallpaper.h" #include "modules/wallpaper/wallpaper.h" -#include "util/stringUtils.h" bool ffPrintWallpaper(FFWallpaperOptions* options) { diff --git a/src/modules/weather/option.h b/src/modules/weather/option.h index 76c3df11b..73089f637 100644 --- a/src/modules/weather/option.h +++ b/src/modules/weather/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFWeatherOptions { diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 3fc3d3a48..9f4a9b9ca 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/weather/weather.h" #include "modules/weather/weather.h" -#include "util/stringUtils.h" bool ffPrintWeather(FFWeatherOptions* options) { diff --git a/src/modules/wifi/option.h b/src/modules/wifi/option.h index f74579267..913980c3e 100644 --- a/src/modules/wifi/option.h +++ b/src/modules/wifi/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFWifiOptions { diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 136211418..c37d75adf 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/wifi/wifi.h" #include "modules/wifi/wifi.h" -#include "util/stringUtils.h" bool ffPrintWifi(FFWifiOptions* options) { diff --git a/src/modules/wm/option.h b/src/modules/wm/option.h index d213c9c3a..0165280f1 100644 --- a/src/modules/wm/option.h +++ b/src/modules/wm/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFWMOptions { diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 23c724fb6..49b117fb5 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -1,9 +1,9 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "detection/wm/wm.h" #include "modules/wm/wm.h" -#include "util/stringUtils.h" bool ffPrintWM(FFWMOptions* options) { diff --git a/src/modules/wmtheme/option.h b/src/modules/wmtheme/option.h index b12f9f8b3..c1113c26c 100644 --- a/src/modules/wmtheme/option.h +++ b/src/modules/wmtheme/option.h @@ -1,6 +1,6 @@ #pragma once -#include "common/option.h" +#include "util/option.h" typedef struct FFWMThemeOptions { diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index eee270df2..c82a6f30b 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -1,8 +1,8 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "detection/wmtheme/wmtheme.h" #include "modules/wmtheme/wmtheme.h" -#include "util/stringUtils.h" #define FF_WMTHEME_DISPLAY_NAME "WM Theme" diff --git a/src/modules/zpool/option.h b/src/modules/zpool/option.h index 49522b3be..00f57fae8 100644 --- a/src/modules/zpool/option.h +++ b/src/modules/zpool/option.h @@ -1,7 +1,7 @@ #pragma once -#include "common/option.h" -#include "common/percent.h" +#include "util/option.h" +#include "util/percent.h" typedef struct FFZpoolOptions { diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index b518eae85..f615695bf 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -1,11 +1,11 @@ -#include "common/printing.h" -#include "common/jsonconfig.h" -#include "common/percent.h" -#include "common/size.h" -#include "detection/zpool/zpool.h" -#include "modules/zpool/zpool.h" +#include "util/printing.h" +#include "util/jsonconfig.h" +#include "util/percent.h" +#include "util/size.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" +#include "detection/zpool/zpool.h" +#include "modules/zpool/zpool.h" static void printZpool(FFZpoolOptions* options, FFZpoolResult* result, uint8_t index) { diff --git a/src/options/display.c b/src/options/display.c index 7ba790d46..fb1533319 100644 --- a/src/options/display.c +++ b/src/options/display.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "common/color.h" -#include "common/jsonconfig.h" -#include "common/percent.h" +#include "util/color.h" +#include "util/jsonconfig.h" +#include "util/percent.h" #include "util/stringUtils.h" #include "options/display.h" diff --git a/src/options/display.h b/src/options/display.h index 55a4e6668..5a98309d9 100644 --- a/src/options/display.h +++ b/src/options/display.h @@ -1,6 +1,6 @@ #pragma once -#include "common/percent.h" +#include "util/percent.h" #include "util/FFstrbuf.h" #include "util/FFlist.h" diff --git a/src/options/general.c b/src/options/general.c index 128d91799..c1a22e7e1 100644 --- a/src/options/general.c +++ b/src/options/general.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "common/jsonconfig.h" -#include "common/processing.h" -#include "options/general.h" +#include "util/jsonconfig.h" +#include "util/processing.h" #include "util/stringUtils.h" +#include "options/general.h" #include diff --git a/src/options/logo.c b/src/options/logo.c index 2e93dd518..5b49e061c 100644 --- a/src/options/logo.c +++ b/src/options/logo.c @@ -1,6 +1,6 @@ #include "logo/logo.h" -#include "common/jsonconfig.h" +#include "util/jsonconfig.h" #include "util/stringUtils.h" void ffOptionsInitLogo(FFOptionsLogo* options) diff --git a/src/util/binary_apple.c b/src/util/binary_apple.c index 9ee0ace96..31d975fa9 100644 --- a/src/util/binary_apple.c +++ b/src/util/binary_apple.c @@ -1,5 +1,5 @@ #include "binary.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/binary_linux.c b/src/util/binary_linux.c index ce3a0b8ae..6844ebb00 100644 --- a/src/util/binary_linux.c +++ b/src/util/binary_linux.c @@ -2,8 +2,8 @@ #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__) -#include "common/io/io.h" -#include "common/library.h" +#include "util/io/io.h" +#include "util/library.h" #include "util/stringUtils.h" #include // #1254 diff --git a/src/util/binary_windows.c b/src/util/binary_windows.c index e86cd5e5c..d11ae8c0e 100644 --- a/src/util/binary_windows.c +++ b/src/util/binary_windows.c @@ -1,5 +1,5 @@ #include "binary.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/common/color.h b/src/util/color.h similarity index 100% rename from src/common/color.h rename to src/util/color.h diff --git a/src/common/commandoption.c b/src/util/commandoption.c similarity index 98% rename from src/common/commandoption.c rename to src/util/commandoption.c index 626a1c06f..948edf1c2 100644 --- a/src/common/commandoption.c +++ b/src/util/commandoption.c @@ -1,11 +1,11 @@ #include "commandoption.h" -#include "common/color.h" -#include "common/printing.h" -#include "common/time.h" -#include "common/jsonconfig.h" +#include "util/color.h" +#include "util/printing.h" +#include "util/time.h" +#include "util/jsonconfig.h" +#include "util/stringUtils.h" #include "fastfetch_datatext.h" #include "modules/modules.h" -#include "util/stringUtils.h" #include #include diff --git a/src/common/commandoption.h b/src/util/commandoption.h similarity index 100% rename from src/common/commandoption.h rename to src/util/commandoption.h diff --git a/src/common/dbus.c b/src/util/dbus.c similarity index 99% rename from src/common/dbus.c rename to src/util/dbus.c index a2b46e66f..97b2e08a4 100644 --- a/src/common/dbus.c +++ b/src/util/dbus.c @@ -2,7 +2,7 @@ #ifdef FF_HAVE_DBUS -#include "common/thread.h" +#include "util/thread.h" #include "util/stringUtils.h" static bool loadLibSymbols(FFDBusLibrary* lib) diff --git a/src/common/dbus.h b/src/util/dbus.h similarity index 98% rename from src/common/dbus.h rename to src/util/dbus.h index cb55f7680..50cffdcee 100644 --- a/src/common/dbus.h +++ b/src/util/dbus.h @@ -4,7 +4,7 @@ #include #include "util/FFstrbuf.h" -#include "common/library.h" +#include "util/library.h" typedef struct FFDBusLibrary { diff --git a/src/util/debug.h b/src/util/debug.h index 0f6d8b821..60cd14d68 100644 --- a/src/util/debug.h +++ b/src/util/debug.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "common/time.h" +#include "util/time.h" static inline const char* ffFindFileName(const char* file) { diff --git a/src/common/duration.c b/src/util/duration.c similarity index 100% rename from src/common/duration.c rename to src/util/duration.c diff --git a/src/common/duration.h b/src/util/duration.h similarity index 86% rename from src/common/duration.h rename to src/util/duration.h index 234a2c976..30733c946 100644 --- a/src/common/duration.h +++ b/src/util/duration.h @@ -1,3 +1,5 @@ +#pragma once + #include "fastfetch.h" void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result); diff --git a/src/common/font.c b/src/util/font.c similarity index 99% rename from src/common/font.c rename to src/util/font.c index 599860bb7..e506f6376 100644 --- a/src/common/font.c +++ b/src/util/font.c @@ -2,7 +2,7 @@ #include "util/FFlist.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" -#include "common/font.h" +#include "util/font.h" #include #include diff --git a/src/common/font.h b/src/util/font.h similarity index 100% rename from src/common/font.h rename to src/util/font.h diff --git a/src/common/format.c b/src/util/format.c similarity index 99% rename from src/common/format.c rename to src/util/format.c index 82baaa180..132ad32d9 100644 --- a/src/common/format.c +++ b/src/util/format.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/format.h" -#include "common/parsing.h" +#include "util/format.h" +#include "util/parsing.h" #include "util/textModifier.h" #include "util/stringUtils.h" diff --git a/src/common/format.h b/src/util/format.h similarity index 100% rename from src/common/format.h rename to src/util/format.h diff --git a/src/common/frequency.c b/src/util/frequency.c similarity index 100% rename from src/common/frequency.c rename to src/util/frequency.c diff --git a/src/common/frequency.h b/src/util/frequency.h similarity index 84% rename from src/common/frequency.h rename to src/util/frequency.h index 53dacf803..7a3bdab02 100644 --- a/src/common/frequency.h +++ b/src/util/frequency.h @@ -1,3 +1,5 @@ +#pragma once + #include "fastfetch.h" bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result); diff --git a/src/common/init.c b/src/util/init.c similarity index 98% rename from src/common/init.c rename to src/util/init.c index 0c0927d7d..e0f3f80be 100644 --- a/src/common/init.c +++ b/src/util/init.c @@ -1,10 +1,10 @@ #include "fastfetch.h" -#include "common/init.h" -#include "common/parsing.h" -#include "common/thread.h" +#include "util/init.h" +#include "util/parsing.h" +#include "util/thread.h" +#include "util/textModifier.h" #include "detection/displayserver/displayserver.h" #include "detection/terminaltheme/terminaltheme.h" -#include "util/textModifier.h" #include "logo/logo.h" #include diff --git a/src/common/init.h b/src/util/init.h similarity index 100% rename from src/common/init.h rename to src/util/init.h diff --git a/src/common/io/io.h b/src/util/io/io.h similarity index 100% rename from src/common/io/io.h rename to src/util/io/io.h diff --git a/src/common/io/io_unix.c b/src/util/io/io_unix.c similarity index 99% rename from src/common/io/io_unix.c rename to src/util/io/io_unix.c index a24c1aa65..3b6a9b27e 100644 --- a/src/common/io/io_unix.c +++ b/src/util/io/io_unix.c @@ -1,7 +1,7 @@ #include "io.h" #include "fastfetch.h" #include "util/stringUtils.h" -#include "common/time.h" +#include "util/time.h" #include #include diff --git a/src/common/io/io_windows.c b/src/util/io/io_windows.c similarity index 100% rename from src/common/io/io_windows.c rename to src/util/io/io_windows.c diff --git a/src/common/jsonconfig.c b/src/util/jsonconfig.c similarity index 98% rename from src/common/jsonconfig.c rename to src/util/jsonconfig.c index 208710628..c606fe0a3 100644 --- a/src/common/jsonconfig.c +++ b/src/util/jsonconfig.c @@ -1,12 +1,12 @@ #include "fastfetch.h" -#include "common/color.h" -#include "common/jsonconfig.h" -#include "common/printing.h" -#include "common/io/io.h" -#include "common/time.h" +#include "util/color.h" +#include "util/jsonconfig.h" +#include "util/printing.h" +#include "util/io/io.h" +#include "util/time.h" +#include "util/stringUtils.h" #include "detection/version/version.h" #include "modules/modules.h" -#include "util/stringUtils.h" #include #include diff --git a/src/common/jsonconfig.h b/src/util/jsonconfig.h similarity index 100% rename from src/common/jsonconfig.h rename to src/util/jsonconfig.h diff --git a/src/util/kmod.c b/src/util/kmod.c index f68b970bd..38e819f85 100644 --- a/src/util/kmod.c +++ b/src/util/kmod.c @@ -1,7 +1,7 @@ #include "kmod.h" #if __linux__ -#include "common/io/io.h" +#include "util/io/io.h" bool ffKmodLoaded(const char* modName) { diff --git a/src/common/library.c b/src/util/library.c similarity index 98% rename from src/common/library.c rename to src/util/library.c index 8a47a1039..1ff1c02c2 100644 --- a/src/common/library.c +++ b/src/util/library.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "common/library.h" +#include "util/library.h" #ifndef FF_DISABLE_DLOPEN diff --git a/src/common/library.h b/src/util/library.h similarity index 100% rename from src/common/library.h rename to src/util/library.h diff --git a/src/common/modules.c b/src/util/modules.c similarity index 100% rename from src/common/modules.c rename to src/util/modules.c diff --git a/src/common/netif/netif.c b/src/util/netif/netif.c similarity index 100% rename from src/common/netif/netif.c rename to src/util/netif/netif.c diff --git a/src/common/netif/netif.h b/src/util/netif/netif.h similarity index 100% rename from src/common/netif/netif.h rename to src/util/netif/netif.h diff --git a/src/common/netif/netif_apple.c b/src/util/netif/netif_apple.c similarity index 99% rename from src/common/netif/netif_apple.c rename to src/util/netif/netif_apple.c index c56533062..6452077ca 100644 --- a/src/common/netif/netif_apple.c +++ b/src/util/netif/netif_apple.c @@ -1,6 +1,6 @@ #include "netif.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include diff --git a/src/common/netif/netif_bsd.c b/src/util/netif/netif_bsd.c similarity index 99% rename from src/common/netif/netif_bsd.c rename to src/util/netif/netif_bsd.c index 90c788908..e53c53641 100644 --- a/src/common/netif/netif_bsd.c +++ b/src/util/netif/netif_bsd.c @@ -1,6 +1,6 @@ #include "netif.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include diff --git a/src/common/netif/netif_gnu.c b/src/util/netif/netif_gnu.c similarity index 97% rename from src/common/netif/netif_gnu.c rename to src/util/netif/netif_gnu.c index b829af9cd..a62a9a4a4 100644 --- a/src/common/netif/netif_gnu.c +++ b/src/util/netif/netif_gnu.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "common/io/io.h" +#include "util/io/io.h" #include #include diff --git a/src/common/netif/netif_haiku.c b/src/util/netif/netif_haiku.c similarity index 99% rename from src/common/netif/netif_haiku.c rename to src/util/netif/netif_haiku.c index 06f8e90b6..d5c5906ae 100644 --- a/src/common/netif/netif_haiku.c +++ b/src/util/netif/netif_haiku.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include diff --git a/src/common/netif/netif_linux.c b/src/util/netif/netif_linux.c similarity index 99% rename from src/common/netif/netif_linux.c rename to src/util/netif/netif_linux.c index 7867d1a1e..3427bead0 100644 --- a/src/common/netif/netif_linux.c +++ b/src/util/netif/netif_linux.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include "util/debug.h" diff --git a/src/common/netif/netif_windows.c b/src/util/netif/netif_windows.c similarity index 100% rename from src/common/netif/netif_windows.c rename to src/util/netif/netif_windows.c diff --git a/src/common/networking/networking.h b/src/util/networking/networking.h similarity index 97% rename from src/common/networking/networking.h rename to src/util/networking/networking.h index 6662f3117..39cf41762 100644 --- a/src/common/networking/networking.h +++ b/src/util/networking/networking.h @@ -1,6 +1,6 @@ #pragma once -#include "common/thread.h" +#include "util/thread.h" #include "util/FFstrbuf.h" #ifdef _WIN32 diff --git a/src/common/networking/networking_common.c b/src/util/networking/networking_common.c similarity index 99% rename from src/common/networking/networking_common.c rename to src/util/networking/networking_common.c index a330dd5f7..aa6bd22e7 100644 --- a/src/common/networking/networking_common.c +++ b/src/util/networking/networking_common.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/library.h" -#include "common/networking/networking.h" +#include "util/library.h" +#include "util/networking/networking.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/common/networking/networking_linux.c b/src/util/networking/networking_linux.c similarity index 99% rename from src/common/networking/networking_linux.c rename to src/util/networking/networking_linux.c index caf19accc..068cfe3c5 100644 --- a/src/common/networking/networking_linux.c +++ b/src/util/networking/networking_linux.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "common/networking/networking.h" -#include "common/time.h" -#include "common/library.h" +#include "util/networking/networking.h" +#include "util/time.h" +#include "util/library.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" #include "util/debug.h" diff --git a/src/common/networking/networking_windows.c b/src/util/networking/networking_windows.c similarity index 99% rename from src/common/networking/networking_windows.c rename to src/util/networking/networking_windows.c index 5c45027aa..afd426618 100644 --- a/src/common/networking/networking_windows.c +++ b/src/util/networking/networking_windows.c @@ -3,7 +3,7 @@ //Must be included after #include "fastfetch.h" -#include "common/networking/networking.h" +#include "util/networking/networking.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/common/option.c b/src/util/option.c similarity index 99% rename from src/common/option.c rename to src/util/option.c index 71a9a1d19..3a808986d 100644 --- a/src/common/option.c +++ b/src/util/option.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/option.h" -#include "common/color.h" +#include "util/option.h" +#include "util/color.h" #include "util/stringUtils.h" // Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise diff --git a/src/common/option.h b/src/util/option.h similarity index 100% rename from src/common/option.h rename to src/util/option.h diff --git a/src/common/parsing.c b/src/util/parsing.c similarity index 99% rename from src/common/parsing.c rename to src/util/parsing.c index 668a28773..fbd7f1208 100644 --- a/src/common/parsing.c +++ b/src/util/parsing.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "common/parsing.h" +#include "util/parsing.h" #include diff --git a/src/common/parsing.h b/src/util/parsing.h similarity index 100% rename from src/common/parsing.h rename to src/util/parsing.h diff --git a/src/util/path.c b/src/util/path.c index 6110edfd2..b6d6999e8 100644 --- a/src/util/path.c +++ b/src/util/path.c @@ -1,6 +1,6 @@ #include "path.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/stringUtils.h" #if !_WIN32 diff --git a/src/common/percent.c b/src/util/percent.c similarity index 99% rename from src/common/percent.c rename to src/util/percent.c index ea41596d8..7f7d5e222 100644 --- a/src/common/percent.c +++ b/src/util/percent.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "common/percent.h" -#include "common/color.h" -#include "common/option.h" -#include "common/jsonconfig.h" +#include "util/percent.h" +#include "util/color.h" +#include "util/option.h" +#include "util/jsonconfig.h" #include "util/textModifier.h" #include "util/stringUtils.h" diff --git a/src/common/percent.h b/src/util/percent.h similarity index 96% rename from src/common/percent.h rename to src/util/percent.h index a8bb18e33..028d64404 100644 --- a/src/common/percent.h +++ b/src/util/percent.h @@ -1,8 +1,8 @@ #pragma once #include "util/FFstrbuf.h" -#include "common/parsing.h" -#include "common/option.h" +#include "util/parsing.h" +#include "util/option.h" typedef enum __attribute__((__packed__)) FFPercentageTypeFlags { diff --git a/src/util/platform/FFPlatform.c b/src/util/platform/FFPlatform.c index 5b0f554e0..9195e6ea4 100644 --- a/src/util/platform/FFPlatform.c +++ b/src/util/platform/FFPlatform.c @@ -1,6 +1,6 @@ #include "FFPlatform_private.h" #include "util/stringUtils.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "detection/version/version.h" void ffPlatformInit(FFPlatform* platform) diff --git a/src/util/platform/FFPlatform_unix.c b/src/util/platform/FFPlatform_unix.c index 5badc958b..464077f52 100644 --- a/src/util/platform/FFPlatform_unix.c +++ b/src/util/platform/FFPlatform_unix.c @@ -1,8 +1,8 @@ #include "FFPlatform_private.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" +#include "util/io/io.h" #include "fastfetch_config.h" -#include "common/io/io.h" #include #include diff --git a/src/util/platform/FFPlatform_windows.c b/src/util/platform/FFPlatform_windows.c index a916de4fe..26491031e 100644 --- a/src/util/platform/FFPlatform_windows.c +++ b/src/util/platform/FFPlatform_windows.c @@ -1,6 +1,6 @@ #include "FFPlatform_private.h" -#include "common/io/io.h" -#include "common/library.h" +#include "util/io/io.h" +#include "util/library.h" #include "util/stringUtils.h" #include "util/windows/unicode.h" #include "util/windows/registry.h" diff --git a/src/common/printing.c b/src/util/printing.c similarity index 99% rename from src/common/printing.c rename to src/util/printing.c index f92677b0a..a3e0595eb 100644 --- a/src/common/printing.c +++ b/src/util/printing.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "common/printing.h" -#include "logo/logo.h" +#include "util/printing.h" #include "util/textModifier.h" +#include "logo/logo.h" void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType) { diff --git a/src/common/printing.h b/src/util/printing.h similarity index 97% rename from src/common/printing.h rename to src/util/printing.h index 1ee79d540..cd6e4e4ae 100644 --- a/src/common/printing.h +++ b/src/util/printing.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "common/format.h" +#include "util/format.h" typedef enum __attribute__((__packed__)) FFPrintType { FF_PRINT_TYPE_DEFAULT = 0, diff --git a/src/common/processing.h b/src/util/processing.h similarity index 100% rename from src/common/processing.h rename to src/util/processing.h diff --git a/src/common/processing_linux.c b/src/util/processing_linux.c similarity index 99% rename from src/common/processing_linux.c rename to src/util/processing_linux.c index 73f72a5a9..ae8fcccb5 100644 --- a/src/common/processing_linux.c +++ b/src/util/processing_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/processing.h" -#include "common/io/io.h" +#include "util/processing.h" +#include "util/io/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/common/processing_windows.c b/src/util/processing_windows.c similarity index 99% rename from src/common/processing_windows.c rename to src/util/processing_windows.c index 51042a625..e0bf519f4 100644 --- a/src/common/processing_windows.c +++ b/src/util/processing_windows.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/processing.h" -#include "common/io/io.h" +#include "util/processing.h" +#include "util/io/io.h" #include #include diff --git a/src/common/properties.c b/src/util/properties.c similarity index 98% rename from src/common/properties.c rename to src/util/properties.c index 746727d9c..dd224a574 100644 --- a/src/common/properties.c +++ b/src/util/properties.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "common/properties.h" -#include "common/io/io.h" +#include "util/properties.h" +#include "util/io/io.h" #include "util/mallocHelper.h" #include diff --git a/src/common/properties.h b/src/util/properties.h similarity index 100% rename from src/common/properties.h rename to src/util/properties.h diff --git a/src/common/settings.c b/src/util/settings.c similarity index 99% rename from src/common/settings.c rename to src/util/settings.c index 1bdae2e60..6fcb6f25b 100644 --- a/src/common/settings.c +++ b/src/util/settings.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "common/settings.h" -#include "common/library.h" -#include "common/thread.h" -#include "common/io/io.h" +#include "util/settings.h" +#include "util/library.h" +#include "util/thread.h" +#include "util/io/io.h" #include @@ -197,7 +197,7 @@ FFvariant ffSettingsGetGnome(const char* dconfKey, const char* gsettingsSchemaNa } #ifdef FF_HAVE_DBUS -#include "common/dbus.h" +#include "util/dbus.h" FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type) { diff --git a/src/common/settings.h b/src/util/settings.h similarity index 100% rename from src/common/settings.h rename to src/util/settings.h diff --git a/src/common/size.c b/src/util/size.c similarity index 100% rename from src/common/size.c rename to src/util/size.c diff --git a/src/common/size.h b/src/util/size.h similarity index 85% rename from src/common/size.h rename to src/util/size.h index f234d5ae0..7f1da020c 100644 --- a/src/common/size.h +++ b/src/util/size.h @@ -1,3 +1,5 @@ +#pragma once + #include "fastfetch.h" void ffSizeAppendNum(uint64_t bytes, FFstrbuf* result); diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c index cb1c751a5..848484af3 100644 --- a/src/util/smbiosHelper.c +++ b/src/util/smbiosHelper.c @@ -1,5 +1,5 @@ #include "smbiosHelper.h" -#include "common/io/io.h" +#include "util/io/io.h" #include "util/unused.h" #include "util/mallocHelper.h" #include "util/debug.h" @@ -60,14 +60,14 @@ const FFSmbiosHeader* ffSmbiosNextEntry(const FFSmbiosHeader* header) #include #ifdef __linux__ - #include "common/properties.h" + #include "util/properties.h" #elif defined(__FreeBSD__) - #include "common/settings.h" + #include "util/settings.h" #define loff_t off_t // FreeBSD doesn't have loff_t #elif defined(__sun) #define loff_t off_t #elif defined(__NetBSD__) - #include "common/sysctl.h" + #include "util/sysctl.h" #define loff_t off_t #endif diff --git a/src/common/sysctl.c b/src/util/sysctl.c similarity index 100% rename from src/common/sysctl.c rename to src/util/sysctl.c diff --git a/src/common/sysctl.h b/src/util/sysctl.h similarity index 100% rename from src/common/sysctl.h rename to src/util/sysctl.h diff --git a/src/common/temps.c b/src/util/temps.c similarity index 99% rename from src/common/temps.c rename to src/util/temps.c index d524a79a1..dd237a649 100644 --- a/src/common/temps.c +++ b/src/util/temps.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "common/temps.h" +#include "util/temps.h" #include "util/textModifier.h" #include "util/stringUtils.h" diff --git a/src/common/temps.h b/src/util/temps.h similarity index 89% rename from src/common/temps.h rename to src/util/temps.h index f2f8eda89..1a4cecc7d 100644 --- a/src/common/temps.h +++ b/src/util/temps.h @@ -1,7 +1,7 @@ #pragma once -#include "common/parsing.h" -#include "common/option.h" +#include "util/parsing.h" +#include "util/option.h" void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module); bool ffTempsParseCommandOptions(const char* key, const char* subkey, const char* value, bool* useTemp, FFColorRangeConfig* config); diff --git a/src/common/thread.h b/src/util/thread.h similarity index 100% rename from src/common/thread.h rename to src/util/thread.h diff --git a/src/common/time.c b/src/util/time.c similarity index 100% rename from src/common/time.c rename to src/util/time.c diff --git a/src/common/time.h b/src/util/time.h similarity index 100% rename from src/common/time.h rename to src/util/time.h diff --git a/tests/color.c b/tests/color.c index 596f2f473..430317bb9 100644 --- a/tests/color.c +++ b/tests/color.c @@ -1,4 +1,4 @@ -#include "common/format.h" +#include "util/format.h" #include "util/textModifier.h" #include "fastfetch.h" diff --git a/tests/duration.c b/tests/duration.c index 283b31801..24b3c5fe5 100644 --- a/tests/duration.c +++ b/tests/duration.c @@ -1,4 +1,4 @@ -#include "common/duration.h" +#include "util/duration.h" #include "util/textModifier.h" #include "fastfetch.h" diff --git a/tests/format.c b/tests/format.c index 0e94cec87..df0b58b4e 100644 --- a/tests/format.c +++ b/tests/format.c @@ -1,4 +1,4 @@ -#include "common/format.h" +#include "util/format.h" #include "util/textModifier.h" #include "fastfetch.h" From 61690a180473e4a5ebfba4cc10ef6b90c949bd42 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 6 Jan 2026 09:13:40 +0800 Subject: [PATCH 29/67] Util: moves `util/io/io.h` to `util/io.h` --- CMakeLists.txt | 88 +++++++++---------- src/detection/battery/battery_bsd.c | 2 +- src/detection/battery/battery_haiku.c | 2 +- src/detection/battery/battery_linux.c | 2 +- src/detection/battery/battery_nbsd.c | 2 +- src/detection/battery/battery_obsd.c | 2 +- src/detection/battery/battery_windows.c | 2 +- src/detection/bios/bios_bsd.c | 2 +- src/detection/bios/bios_linux.c | 2 +- src/detection/bios/bios_windows.c | 2 +- src/detection/bluetooth/bluetooth_haiku.cpp | 2 +- src/detection/bluetooth/bluetooth_linux.c | 2 +- .../bluetoothradio/bluetoothradio_linux.c | 2 +- .../bluetoothradio/bluetoothradio_windows.c | 2 +- src/detection/board/board_linux.c | 2 +- src/detection/bootmgr/bootmgr_apple.c | 2 +- src/detection/bootmgr/bootmgr_bsd.c | 2 +- src/detection/bootmgr/bootmgr_linux.c | 2 +- src/detection/bootmgr/bootmgr_windows.c | 2 +- src/detection/brightness/brightness_bsd.c | 2 +- src/detection/brightness/brightness_linux.c | 2 +- src/detection/brightness/brightness_obsd.c | 2 +- src/detection/btrfs/btrfs_linux.c | 2 +- src/detection/camera/camera_apple.m | 2 +- src/detection/camera/camera_linux.c | 2 +- src/detection/chassis/chassis_linux.c | 2 +- src/detection/cpu/cpu.c | 2 +- src/detection/cpu/cpu_linux.c | 2 +- src/detection/cpu/cpu_nbsd.c | 2 +- src/detection/cpucache/cpucache_linux.c | 2 +- src/detection/cpuusage/cpuusage_linux.c | 2 +- src/detection/de/de_linux.c | 2 +- src/detection/disk/disk_linux.c | 2 +- src/detection/disk/disk_sunos.c | 2 +- src/detection/disk/disk_windows.c | 2 +- src/detection/diskio/diskio_linux.c | 2 +- src/detection/diskio/diskio_windows.c | 2 +- .../displayserver/linux/displayserver_linux.c | 2 +- src/detection/displayserver/linux/drm.c | 2 +- .../displayserver/linux/wayland/wayland.c | 2 +- src/detection/displayserver/linux/wmde.c | 2 +- src/detection/dns/dns_apple.c | 2 +- src/detection/dns/dns_linux.c | 2 +- src/detection/dns/dns_windows.c | 2 +- src/detection/font/font_apple.m | 2 +- src/detection/gamepad/gamepad_bsd.c | 2 +- src/detection/gamepad/gamepad_linux.c | 2 +- src/detection/gamepad/gamepad_windows.c | 2 +- src/detection/gpu/gpu_android.c | 2 +- src/detection/gpu/gpu_bsd.c | 2 +- src/detection/gpu/gpu_drm.c | 2 +- src/detection/gpu/gpu_general.c | 2 +- src/detection/gpu/gpu_haiku.c | 2 +- src/detection/gpu/gpu_linux.c | 2 +- src/detection/gpu/gpu_nbsd.c | 2 +- src/detection/gpu/gpu_obsd.c | 2 +- src/detection/gpu/gpu_pci.c | 2 +- src/detection/host/host_linux.c | 2 +- src/detection/initsystem/initsystem_haiku.c | 2 +- src/detection/keyboard/keyboard_bsd.c | 2 +- src/detection/keyboard/keyboard_linux.c | 2 +- src/detection/keyboard/keyboard_windows.c | 2 +- src/detection/loadavg/loadavg_linux.c | 2 +- src/detection/localip/localip_linux.c | 4 +- src/detection/localip/localip_windows.c | 2 +- src/detection/media/media.c | 2 +- src/detection/media/media_linux.c | 2 +- src/detection/memory/memory_linux.c | 2 +- src/detection/mouse/mouse_bsd.c | 2 +- src/detection/mouse/mouse_linux.c | 2 +- src/detection/mouse/mouse_windows.c | 2 +- src/detection/netio/netio_apple.c | 2 +- src/detection/netio/netio_bsd.c | 2 +- src/detection/netio/netio_haiku.cpp | 2 +- src/detection/netio/netio_linux.c | 4 +- src/detection/netio/netio_sunos.c | 2 +- src/detection/netio/netio_windows.c | 2 +- src/detection/opengl/opengl_haiku.cpp | 2 +- src/detection/opengl/opengl_linux.c | 2 +- src/detection/opengl/opengl_shared.c | 2 +- src/detection/os/os_apple.m | 2 +- src/detection/os/os_linux.c | 2 +- src/detection/os/os_sunos.c | 2 +- src/detection/packages/packages.c | 2 +- src/detection/packages/packages_apple.c | 2 +- src/detection/packages/packages_haiku.c | 2 +- src/detection/packages/packages_linux.c | 2 +- src/detection/packages/packages_nbsd.c | 2 +- src/detection/packages/packages_nix.c | 2 +- src/detection/packages/packages_obsd.c | 2 +- src/detection/packages/packages_windows.c | 2 +- .../physicaldisk/physicaldisk_haiku.c | 2 +- .../physicaldisk/physicaldisk_linux.c | 2 +- .../physicaldisk/physicaldisk_windows.c | 2 +- .../poweradapter/poweradapter_linux.c | 2 +- src/detection/processes/processes_linux.c | 2 +- src/detection/publicip/publicip.c | 2 +- src/detection/sound/sound_bsd.c | 2 +- src/detection/sound/sound_nbsd.c | 2 +- src/detection/sound/sound_sunos.c | 2 +- src/detection/swap/swap_linux.c | 2 +- src/detection/terminalfont/terminalfont.c | 2 +- .../terminalfont/terminalfont_android.c | 2 +- .../terminalfont/terminalfont_linux.c | 2 +- .../terminalfont/terminalfont_windows.c | 2 +- src/detection/terminalshell/terminalshell.c | 2 +- .../terminalshell/terminalshell_linux.c | 2 +- .../terminalshell/terminalshell_windows.c | 2 +- .../terminalsize/terminalsize_linux.c | 2 +- .../terminalsize/terminalsize_windows.c | 2 +- src/detection/terminaltheme/terminaltheme.c | 2 +- src/detection/tpm/tpm_linux.c | 2 +- src/detection/uptime/uptime_linux.c | 2 +- src/detection/users/users_linux.c | 2 +- src/detection/users/users_obsd.c | 2 +- src/detection/vulkan/vulkan.c | 2 +- src/detection/weather/weather.c | 2 +- src/detection/wifi/wifi_bsd.c | 2 +- src/detection/wifi/wifi_linux.c | 2 +- src/detection/wifi/wifi_nbsd.c | 2 +- src/detection/wifi/wifi_obsd.c | 2 +- src/detection/wm/wm_linux.c | 2 +- src/detection/wm/wm_windows.cpp | 2 +- src/detection/wmtheme/wmtheme_linux.c | 2 +- src/fastfetch.c | 2 +- src/fastfetch.h | 2 +- src/logo/image/image.c | 2 +- src/logo/logo.c | 2 +- src/{util => modules}/modules.c | 0 src/util/{platform => }/FFPlatform.c | 2 +- src/util/{platform => }/FFPlatform.h | 0 src/util/{platform => }/FFPlatform_private.h | 0 src/util/{platform => }/FFPlatform_unix.c | 2 +- src/util/{platform => }/FFPlatform_windows.c | 2 +- src/util/binary_apple.c | 2 +- src/util/binary_linux.c | 2 +- src/util/binary_windows.c | 2 +- src/util/{io => }/io.h | 0 src/util/{io => }/io_unix.c | 0 src/util/{io => }/io_windows.c | 0 src/util/jsonconfig.c | 2 +- src/util/kmod.c | 2 +- src/util/{netif => }/netif.c | 0 src/util/{netif => }/netif.h | 0 src/util/{netif => }/netif_apple.c | 2 +- src/util/{netif => }/netif_bsd.c | 2 +- src/util/{netif => }/netif_gnu.c | 2 +- src/util/{netif => }/netif_haiku.c | 2 +- src/util/{netif => }/netif_linux.c | 2 +- src/util/{netif => }/netif_windows.c | 0 src/util/{networking => }/networking.h | 0 src/util/{networking => }/networking_common.c | 2 +- src/util/{networking => }/networking_linux.c | 2 +- .../{networking => }/networking_windows.c | 2 +- src/util/path.c | 2 +- src/util/processing_linux.c | 2 +- src/util/processing_windows.c | 2 +- src/util/properties.c | 2 +- src/util/settings.c | 2 +- src/util/smbiosHelper.c | 2 +- 160 files changed, 195 insertions(+), 195 deletions(-) rename src/{util => modules}/modules.c (100%) rename src/util/{platform => }/FFPlatform.c (99%) rename src/util/{platform => }/FFPlatform.h (100%) rename src/util/{platform => }/FFPlatform_private.h (100%) rename src/util/{platform => }/FFPlatform_unix.c (99%) rename src/util/{platform => }/FFPlatform_windows.c (99%) rename src/util/{io => }/io.h (100%) rename src/util/{io => }/io_unix.c (100%) rename src/util/{io => }/io_windows.c (100%) rename src/util/{netif => }/netif.c (100%) rename src/util/{netif => }/netif.h (100%) rename src/util/{netif => }/netif_apple.c (99%) rename src/util/{netif => }/netif_bsd.c (99%) rename src/util/{netif => }/netif_gnu.c (97%) rename src/util/{netif => }/netif_haiku.c (99%) rename src/util/{netif => }/netif_linux.c (99%) rename src/util/{netif => }/netif_windows.c (100%) rename src/util/{networking => }/networking.h (100%) rename src/util/{networking => }/networking_common.c (99%) rename src/util/{networking => }/networking_linux.c (99%) rename src/util/{networking => }/networking_windows.c (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index efe91f626..dc33c998f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,6 +469,7 @@ set(LIBFASTFETCH_SRC src/modules/wm/wm.c src/modules/wmtheme/wmtheme.c src/modules/zpool/zpool.c + src/modules/modules.c src/options/display.c src/options/logo.c src/options/general.c @@ -480,9 +481,8 @@ set(LIBFASTFETCH_SRC src/util/init.c src/util/jsonconfig.c src/util/library.c - src/util/modules.c - src/util/netif/netif.c - src/util/networking/networking_common.c + src/util/netif.c + src/util/networking_common.c src/util/option.c src/util/parsing.c src/util/percent.c @@ -498,7 +498,7 @@ set(LIBFASTFETCH_SRC src/util/FFstrbuf.c src/util/kmod.c src/util/path.c - src/util/platform/FFPlatform.c + src/util/FFPlatform.c src/util/smbiosHelper.c ) @@ -579,11 +579,11 @@ if(LINUX) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_linux.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_linux.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(ANDROID) @@ -652,11 +652,11 @@ elseif(ANDROID) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_android.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_linux.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_linux.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(FreeBSD) @@ -733,12 +733,12 @@ elseif(FreeBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_bsd.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_bsd.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) if(DragonFly) @@ -826,12 +826,12 @@ elseif(NetBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_bsd.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_bsd.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(OpenBSD) @@ -908,12 +908,12 @@ elseif(OpenBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_bsd.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_bsd.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c src/util/smbiosHelper.c ) @@ -977,15 +977,15 @@ elseif(APPLE) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_apple.m src/detection/camera/camera_apple.m - src/util/io/io_unix.c - src/util/netif/netif_apple.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_apple.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c src/util/apple/cf_helpers.c src/util/apple/osascript.m src/util/apple/smc_temps.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_apple.c ) elseif(WIN32) @@ -1047,9 +1047,9 @@ elseif(WIN32) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_windows.c src/detection/camera/camera_windows.cpp - src/util/io/io_windows.c - src/util/netif/netif_windows.c - src/util/networking/networking_windows.c + src/util/io_windows.c + src/util/netif_windows.c + src/util/networking_windows.c src/util/processing_windows.c src/util/windows/getline.c src/util/windows/com.cpp @@ -1057,7 +1057,7 @@ elseif(WIN32) src/util/windows/unicode.c src/util/windows/wmi.cpp src/util/windows/version.c - src/util/platform/FFPlatform_windows.c + src/util/FFPlatform_windows.c src/util/binary_windows.c src/util/debug_windows.c ) @@ -1135,11 +1135,11 @@ elseif(SunOS) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_apple.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_apple.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(Haiku) @@ -1203,11 +1203,11 @@ elseif(Haiku) src/detection/wmtheme/wmtheme_nosupport.c src/detection/camera/camera_nosupport.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_haiku.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_haiku.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c src/util/haiku/version.cpp ) @@ -1282,11 +1282,11 @@ elseif(GNU) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_gnu.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_gnu.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) endif() diff --git a/src/detection/battery/battery_bsd.c b/src/detection/battery/battery_bsd.c index c938cb365..2ce220780 100644 --- a/src/detection/battery/battery_bsd.c +++ b/src/detection/battery/battery_bsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/sysctl.h" -#include "util/io/io.h" +#include "util/io.h" #include "battery.h" #include diff --git a/src/detection/battery/battery_haiku.c b/src/detection/battery/battery_haiku.c index 205d584e6..ea3a4515b 100644 --- a/src/detection/battery/battery_haiku.c +++ b/src/detection/battery/battery_haiku.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index 773af2a1c..9dc5aa138 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c index df4225683..e142050be 100644 --- a/src/detection/battery/battery_nbsd.c +++ b/src/detection/battery/battery_nbsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c index ad8369db1..ea40c6f2a 100644 --- a/src/detection/battery/battery_obsd.c +++ b/src/detection/battery/battery_obsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c index e0f9425ef..bc9b2c227 100644 --- a/src/detection/battery/battery_windows.c +++ b/src/detection/battery/battery_windows.c @@ -1,6 +1,6 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/nt.h" #include "util/windows/unicode.h" #include "util/mallocHelper.h" diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c index cdf1767f0..6ea271cb7 100644 --- a/src/detection/bios/bios_bsd.c +++ b/src/detection/bios/bios_bsd.c @@ -2,7 +2,7 @@ #include "util/settings.h" #include "util/sysctl.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" const char* ffDetectBios(FFBiosResult* result) diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c index 446371a25..f7fd2ddc3 100644 --- a/src/detection/bios/bios_linux.c +++ b/src/detection/bios/bios_linux.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c index 184a462dc..31dd51e39 100644 --- a/src/detection/bios/bios_windows.c +++ b/src/detection/bios/bios_windows.c @@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION }; } SYSTEM_BOOT_ENVIRONMENT_INFORMATION; #elif __OpenBSD__ -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/bluetooth/bluetooth_haiku.cpp b/src/detection/bluetooth/bluetooth_haiku.cpp index 4785a8f2c..6c7280840 100644 --- a/src/detection/bluetooth/bluetooth_haiku.cpp +++ b/src/detection/bluetooth/bluetooth_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "bluetooth.h" -#include "util/io/io.h" +#include "util/io.h" } #include diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c index 3479d1428..42fed40cf 100644 --- a/src/detection/bluetooth/bluetooth_linux.c +++ b/src/detection/bluetooth/bluetooth_linux.c @@ -3,7 +3,7 @@ #ifdef FF_HAVE_DBUS #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" /* Example dbus reply, striped to only the relevant parts: array [ //root diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c index 9bfc6c20b..1b3ec4ed5 100644 --- a/src/detection/bluetoothradio/bluetoothradio_linux.c +++ b/src/detection/bluetoothradio/bluetoothradio_linux.c @@ -3,7 +3,7 @@ #ifdef FF_HAVE_DBUS #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" /* Example dbus reply: array [ diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c index 288d6255b..610602444 100644 --- a/src/detection/bluetoothradio/bluetoothradio_windows.c +++ b/src/detection/bluetoothradio/bluetoothradio_windows.c @@ -1,6 +1,6 @@ #include "bluetoothradio.h" #include "util/library.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c index bd3a4a522..1afeeef21 100644 --- a/src/detection/board/board_linux.c +++ b/src/detection/board/board_linux.c @@ -1,5 +1,5 @@ #include "board.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c index e9d1e90ec..3bedb95cc 100644 --- a/src/detection/bootmgr/bootmgr_apple.c +++ b/src/detection/bootmgr/bootmgr_apple.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/apple/cf_helpers.h" #include diff --git a/src/detection/bootmgr/bootmgr_bsd.c b/src/detection/bootmgr/bootmgr_bsd.c index 19d6db1b6..c16773a73 100644 --- a/src/detection/bootmgr/bootmgr_bsd.c +++ b/src/detection/bootmgr/bootmgr_bsd.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "util/io/io.h" +#include "util/io.h" #ifdef __OpenBSD__ #include diff --git a/src/detection/bootmgr/bootmgr_linux.c b/src/detection/bootmgr/bootmgr_linux.c index 74e6cd242..e29fc0794 100644 --- a/src/detection/bootmgr/bootmgr_linux.c +++ b/src/detection/bootmgr/bootmgr_linux.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "util/io/io.h" +#include "util/io.h" #include "efi_helper.h" #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/" diff --git a/src/detection/bootmgr/bootmgr_windows.c b/src/detection/bootmgr/bootmgr_windows.c index 6f46f497f..21d527cc8 100644 --- a/src/detection/bootmgr/bootmgr_windows.c +++ b/src/detection/bootmgr/bootmgr_windows.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/brightness/brightness_bsd.c b/src/detection/brightness/brightness_bsd.c index 07d7239db..de5d585a7 100644 --- a/src/detection/brightness/brightness_bsd.c +++ b/src/detection/brightness/brightness_bsd.c @@ -2,7 +2,7 @@ #if __has_include() -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c index b24f0aef6..c52e36ff6 100644 --- a/src/detection/brightness/brightness_linux.c +++ b/src/detection/brightness/brightness_linux.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c index ddae77163..95a3ac83d 100644 --- a/src/detection/brightness/brightness_obsd.c +++ b/src/detection/brightness/brightness_obsd.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/btrfs/btrfs_linux.c b/src/detection/btrfs/btrfs_linux.c index 5dc190741..41dc90e0c 100644 --- a/src/detection/btrfs/btrfs_linux.c +++ b/src/detection/btrfs/btrfs_linux.c @@ -1,6 +1,6 @@ #include "btrfs.h" -#include "util/io/io.h" +#include "util/io.h" #include enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") }; diff --git a/src/detection/camera/camera_apple.m b/src/detection/camera/camera_apple.m index 7549f9123..64d714d16 100644 --- a/src/detection/camera/camera_apple.m +++ b/src/detection/camera/camera_apple.m @@ -1,5 +1,5 @@ #include "camera.h" -#include "util/io/io.h" +#include "util/io.h" #import diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c index 988c41293..fe93414a6 100644 --- a/src/detection/camera/camera_linux.c +++ b/src/detection/camera/camera_linux.c @@ -1,5 +1,5 @@ #include "camera.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c index 93aa79e06..013fbca96 100644 --- a/src/detection/chassis/chassis_linux.c +++ b/src/detection/chassis/chassis_linux.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c index c10f04541..ee4ce360e 100644 --- a/src/detection/cpu/cpu.c +++ b/src/detection/cpu/cpu.c @@ -130,7 +130,7 @@ void ffCPUDetectByCpuid(FFCPUResult* cpu) // Worth noting: Apple M1 is marked as ARMv8.5-A on Wikipedia, but it lacks BTI (mandatory in v8.5) #ifdef __linux__ -#include "util/io/io.h" +#include "util/io.h" #include // #include diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index 9fc2287ec..4b3847244 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/mallocHelper.h" diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c index 6f115a930..8a773f849 100644 --- a/src/detection/cpu/cpu_nbsd.c +++ b/src/detection/cpu/cpu_nbsd.c @@ -1,6 +1,6 @@ #include "cpu.h" #include "util/sysctl.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c index 07f650f61..844c6fd1e 100644 --- a/src/detection/cpucache/cpucache_linux.c +++ b/src/detection/cpucache/cpucache_linux.c @@ -1,5 +1,5 @@ #include "cpucache.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added) diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c index 27c9f4b1f..7c42d86c9 100644 --- a/src/detection/cpuusage/cpuusage_linux.c +++ b/src/detection/cpuusage/cpuusage_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index 51293b6f6..84d0b234f 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -1,7 +1,7 @@ #include "de.h" #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/parsing.h" #include "util/properties.h" diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c index b54cd86c1..92a2e0527 100644 --- a/src/detection/disk/disk_linux.c +++ b/src/detection/disk/disk_linux.c @@ -1,6 +1,6 @@ #include "disk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c index 42066fb2e..d35ae18a6 100644 --- a/src/detection/disk/disk_sunos.c +++ b/src/detection/disk/disk_sunos.c @@ -1,5 +1,5 @@ #include "disk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c index b88289fa5..8fa5b9bdb 100644 --- a/src/detection/disk/disk_windows.c +++ b/src/detection/disk/disk_windows.c @@ -1,5 +1,5 @@ #include "disk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/thread.h" #include "util/windows/unicode.h" diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c index 5b24620b8..e32c31c57 100644 --- a/src/detection/diskio/diskio_linux.c +++ b/src/detection/diskio/diskio_linux.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/stringUtils.h" diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c index 4cb17a351..f2e0f07fa 100644 --- a/src/detection/diskio/diskio_windows.c +++ b/src/detection/diskio/diskio_windows.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c index d4da9c604..66977a1e7 100644 --- a/src/detection/displayserver/linux/displayserver_linux.c +++ b/src/detection/displayserver/linux/displayserver_linux.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #ifdef __FreeBSD__ diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c index 7fbc427b0..b79513bc7 100644 --- a/src/detection/displayserver/linux/drm.c +++ b/src/detection/displayserver/linux/drm.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index ba2e95c77..1938ca49f 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -1,5 +1,5 @@ #include "../displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 8115ff57d..f7dae2f95 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c index 2061f77ff..a0831deef 100644 --- a/src/detection/dns/dns_apple.c +++ b/src/detection/dns/dns_apple.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/apple/cf_helpers.h" diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c index 6b76479ec..51c36370c 100644 --- a/src/detection/dns/dns_linux.c +++ b/src/detection/dns/dns_linux.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/dns/dns_windows.c b/src/detection/dns/dns_windows.c index b6eb792a7..9b96b3700 100644 --- a/src/detection/dns/dns_windows.c +++ b/src/detection/dns/dns_windows.c @@ -1,5 +1,5 @@ #include "detection/dns/dns.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m index 2bd4de6ac..533afb940 100644 --- a/src/detection/font/font_apple.m +++ b/src/detection/font/font_apple.m @@ -1,5 +1,5 @@ #include "util/font.h" -#include "util/io/io.h" +#include "util/io.h" #include "font.h" #import diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c index 1ad91b9fe..0a6f760a5 100644 --- a/src/detection/gamepad/gamepad_bsd.c +++ b/src/detection/gamepad/gamepad_bsd.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/gamepad/gamepad_linux.c b/src/detection/gamepad/gamepad_linux.c index a6f685461..0d211b46d 100644 --- a/src/detection/gamepad/gamepad_linux.c +++ b/src/detection/gamepad/gamepad_linux.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path) diff --git a/src/detection/gamepad/gamepad_windows.c b/src/detection/gamepad/gamepad_windows.c index e0dae742d..8bbc3cd03 100644 --- a/src/detection/gamepad/gamepad_windows.c +++ b/src/detection/gamepad/gamepad_windows.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c index ba7d7dba2..1537fa5c1 100644 --- a/src/detection/gpu/gpu_android.c +++ b/src/detection/gpu/gpu_android.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c index 570de2700..c7f534ab0 100644 --- a/src/detection/gpu/gpu_bsd.c +++ b/src/detection/gpu/gpu_bsd.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c index 3fdda54ed..c80e818d1 100644 --- a/src/detection/gpu/gpu_drm.c +++ b/src/detection/gpu/gpu_drm.c @@ -5,7 +5,7 @@ #include #include -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c index dce396e9c..8ed7d5175 100644 --- a/src/detection/gpu/gpu_general.c +++ b/src/detection/gpu/gpu_general.c @@ -2,7 +2,7 @@ #ifdef FF_HAVE_PCIACCESS -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c index 91a2f7e52..86f029016 100644 --- a/src/detection/gpu/gpu_haiku.c +++ b/src/detection/gpu/gpu_haiku.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c index 6bd51a59c..f116ff4be 100644 --- a/src/detection/gpu/gpu_linux.c +++ b/src/detection/gpu/gpu_linux.c @@ -2,7 +2,7 @@ #include "detection/vulkan/vulkan.h" #include "detection/cpu/cpu.h" #include "detection/gpu/gpu_driver_specific.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" diff --git a/src/detection/gpu/gpu_nbsd.c b/src/detection/gpu/gpu_nbsd.c index c5857086d..7e42f67bb 100644 --- a/src/detection/gpu/gpu_nbsd.c +++ b/src/detection/gpu/gpu_nbsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/gpu/gpu_obsd.c b/src/detection/gpu/gpu_obsd.c index e3600237c..50b9a8743 100644 --- a/src/detection/gpu/gpu_obsd.c +++ b/src/detection/gpu/gpu_obsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c index 1a186b3f3..3116790a9 100644 --- a/src/detection/gpu/gpu_pci.c +++ b/src/detection/gpu/gpu_pci.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c index f2a850549..90536e746 100644 --- a/src/detection/host/host_linux.c +++ b/src/detection/host/host_linux.c @@ -1,5 +1,5 @@ #include "host.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/smbiosHelper.h" diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c index 9e00b574a..1206b7927 100644 --- a/src/detection/initsystem/initsystem_haiku.c +++ b/src/detection/initsystem/initsystem_haiku.c @@ -1,7 +1,7 @@ #include "initsystem.h" #include "util/stringUtils.h" #include "util/haiku/version.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/keyboard/keyboard_bsd.c b/src/detection/keyboard/keyboard_bsd.c index 092eb42de..e77534ba6 100644 --- a/src/detection/keyboard/keyboard_bsd.c +++ b/src/detection/keyboard/keyboard_bsd.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c index 657e5dfff..d339360b2 100644 --- a/src/detection/keyboard/keyboard_linux.c +++ b/src/detection/keyboard/keyboard_linux.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */) diff --git a/src/detection/keyboard/keyboard_windows.c b/src/detection/keyboard/keyboard_windows.c index fecf747e6..777b64bf5 100644 --- a/src/detection/keyboard/keyboard_windows.c +++ b/src/detection/keyboard/keyboard_windows.c @@ -1,7 +1,7 @@ #define INITGUID #include "keyboard.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/loadavg/loadavg_linux.c b/src/detection/loadavg/loadavg_linux.c index ec123c977..8e8c9a7c4 100644 --- a/src/detection/loadavg/loadavg_linux.c +++ b/src/detection/loadavg/loadavg_linux.c @@ -1,5 +1,5 @@ #include "detection/loadavg/loadavg.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index 50f045706..18251b89e 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -1,6 +1,6 @@ #include "localip.h" -#include "util/io/io.h" -#include "util/netif/netif.h" +#include "util/io.h" +#include "util/netif.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c index 9ca2aa5f9..399129410 100644 --- a/src/detection/localip/localip_windows.c +++ b/src/detection/localip/localip_windows.c @@ -1,7 +1,7 @@ #include #include -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" #include "util/debug.h" diff --git a/src/detection/media/media.c b/src/detection/media/media.c index dc5ce58e4..cb98ef51c 100644 --- a/src/detection/media/media.c +++ b/src/detection/media/media.c @@ -1,5 +1,5 @@ #include "media.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectMediaImpl(FFMediaResult* media, bool saveCover); diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c index 35cf931c6..c965b154f 100644 --- a/src/detection/media/media_linux.c +++ b/src/detection/media/media_linux.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "detection/media/media.h" diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c index 90bb34935..f2f80581f 100644 --- a/src/detection/memory/memory_linux.c +++ b/src/detection/memory/memory_linux.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/mouse/mouse_bsd.c b/src/detection/mouse/mouse_bsd.c index 0f6507b52..e7ef78c3b 100644 --- a/src/detection/mouse/mouse_bsd.c +++ b/src/detection/mouse/mouse_bsd.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/mouse/mouse_linux.c b/src/detection/mouse/mouse_linux.c index 8d81384a3..a55fdc3d9 100644 --- a/src/detection/mouse/mouse_linux.c +++ b/src/detection/mouse/mouse_linux.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */) diff --git a/src/detection/mouse/mouse_windows.c b/src/detection/mouse/mouse_windows.c index 3ab2ff3e2..6d4105f7f 100644 --- a/src/detection/mouse/mouse_windows.c +++ b/src/detection/mouse/mouse_windows.c @@ -1,7 +1,7 @@ #define INITGUID #include "mouse.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/netio/netio_apple.c b/src/detection/netio/netio_apple.c index da1e850c5..d9bf8e7eb 100644 --- a/src/detection/netio/netio_apple.c +++ b/src/detection/netio/netio_apple.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c index 2284dd22a..58234a1ea 100644 --- a/src/detection/netio/netio_bsd.c +++ b/src/detection/netio/netio_bsd.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp index d2389d091..824652050 100644 --- a/src/detection/netio/netio_haiku.cpp +++ b/src/detection/netio/netio_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" } #include diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c index ac552c912..48631d54a 100644 --- a/src/detection/netio/netio_linux.c +++ b/src/detection/netio/netio_linux.c @@ -1,7 +1,7 @@ #include "netio.h" -#include "util/io/io.h" -#include "util/netif/netif.h" +#include "util/io.h" +#include "util/netif.h" #include "util/stringUtils.h" #include diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c index 3d06c8421..ca41b8e79 100644 --- a/src/detection/netio/netio_sunos.c +++ b/src/detection/netio/netio_sunos.c @@ -1,5 +1,5 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/stringUtils.h" #include diff --git a/src/detection/netio/netio_windows.c b/src/detection/netio/netio_windows.c index b97e761c2..196c6a086 100644 --- a/src/detection/netio/netio_windows.c +++ b/src/detection/netio/netio_windows.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/opengl/opengl_haiku.cpp b/src/detection/opengl/opengl_haiku.cpp index ca0873822..679993d42 100644 --- a/src/detection/opengl/opengl_haiku.cpp +++ b/src/detection/opengl/opengl_haiku.cpp @@ -2,7 +2,7 @@ extern "C" { #include "opengl.h" -#include "util/io/io.h" +#include "util/io.h" #if FF_HAVE_EGL const char* ffOpenGLDetectByEGL(FFOpenGLResult* result); #endif diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c index ba1c4386b..0e7a10631 100644 --- a/src/detection/opengl/opengl_linux.c +++ b/src/detection/opengl/opengl_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "opengl.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c index 4dcfdebbb..b5f4c7703 100644 --- a/src/detection/opengl/opengl_shared.c +++ b/src/detection/opengl/opengl_shared.c @@ -25,7 +25,7 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG } #if defined(FF_HAVE_EGL) || __has_include() -#include "util/io/io.h" +#include "util/io.h" #define EGL_EGL_PROTOTYPES 1 #define EGL_EGLEXT_PROTOTYPES 1 diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m index 61e6c59e7..b73d1cdef 100644 --- a/src/detection/os/os_apple.m +++ b/src/detection/os/os_apple.m @@ -1,5 +1,5 @@ #include "os.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/sysctl.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c index f1ff2b2d2..20e3d9789 100644 --- a/src/detection/os/os_linux.c +++ b/src/detection/os/os_linux.c @@ -1,7 +1,7 @@ #include "os.h" #include "util/properties.h" #include "util/parsing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/detection/os/os_sunos.c b/src/detection/os/os_sunos.c index c5964163b..d81101b28 100644 --- a/src/detection/os/os_sunos.c +++ b/src/detection/os/os_sunos.c @@ -1,5 +1,5 @@ #include "os.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectOSImpl(FFOSResult* os) { diff --git a/src/detection/packages/packages.c b/src/detection/packages/packages.c index fea48f6e2..e358e89d4 100644 --- a/src/detection/packages/packages.c +++ b/src/detection/packages/packages.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c index 300a8a35c..141c46bc2 100644 --- a/src/detection/packages/packages_apple.c +++ b/src/detection/packages/packages_apple.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/detection/packages/packages_haiku.c b/src/detection/packages/packages_haiku.c index 3f4d4eede..1cf739bd9 100644 --- a/src/detection/packages/packages_haiku.c +++ b/src/detection/packages/packages_haiku.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index d75e65ede..66560c267 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/properties.h" #include "util/settings.h" diff --git a/src/detection/packages/packages_nbsd.c b/src/detection/packages/packages_nbsd.c index 440eaaf04..19c35e82e 100644 --- a/src/detection/packages/packages_nbsd.c +++ b/src/detection/packages/packages_nbsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c index 60609bd82..b2fc99640 100644 --- a/src/detection/packages/packages_nix.c +++ b/src/detection/packages/packages_nix.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c index 41b29c8ac..07c2769f4 100644 --- a/src/detection/packages/packages_obsd.c +++ b/src/detection/packages/packages_obsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c index f78a8e952..40ee6227c 100644 --- a/src/detection/packages/packages_windows.c +++ b/src/detection/packages/packages_windows.c @@ -4,7 +4,7 @@ #include "util/path.h" #include "util/windows/unicode.h" #include "util/mallocHelper.h" -#include "util/io/io.h" +#include "util/io.h" #include #include "util/windows/nt.h" diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c index 1b4dc5d23..2c024d72a 100644 --- a/src/detection/physicaldisk/physicaldisk_haiku.c +++ b/src/detection/physicaldisk/physicaldisk_haiku.c @@ -1,6 +1,6 @@ #include "physicaldisk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c index 3f4846cfb..e0d4bc532 100644 --- a/src/detection/physicaldisk/physicaldisk_linux.c +++ b/src/detection/physicaldisk/physicaldisk_linux.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/stringUtils.h" diff --git a/src/detection/physicaldisk/physicaldisk_windows.c b/src/detection/physicaldisk/physicaldisk_windows.c index 12d9b38ed..ed56b4a0f 100644 --- a/src/detection/physicaldisk/physicaldisk_windows.c +++ b/src/detection/physicaldisk/physicaldisk_windows.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c index d1c496094..28cffe315 100644 --- a/src/detection/poweradapter/poweradapter_linux.c +++ b/src/detection/poweradapter/poweradapter_linux.c @@ -1,5 +1,5 @@ #include "poweradapter.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c index c85c4b3bb..e8e69ad36 100644 --- a/src/detection/processes/processes_linux.c +++ b/src/detection/processes/processes_linux.c @@ -1,6 +1,6 @@ #include "processes.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" const char* ffDetectProcesses(uint32_t* result) diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c index a1ec6a20e..27070bfa4 100644 --- a/src/detection/publicip/publicip.c +++ b/src/detection/publicip/publicip.c @@ -1,5 +1,5 @@ #include "publicip.h" -#include "util/networking/networking.h" +#include "util/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState states[2]; diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c index 73a5ae42b..bc5abdf4d 100644 --- a/src/detection/sound/sound_bsd.c +++ b/src/detection/sound/sound_bsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/sysctl.h" #include diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c index 792304c35..06240dede 100644 --- a/src/detection/sound/sound_nbsd.c +++ b/src/detection/sound/sound_nbsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c index 0bfda3f02..760d1c7fd 100644 --- a/src/detection/sound/sound_sunos.c +++ b/src/detection/sound/sound_sunos.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/swap/swap_linux.c b/src/detection/swap/swap_linux.c index 2c70d3064..5508c2889 100644 --- a/src/detection/swap/swap_linux.c +++ b/src/detection/swap/swap_linux.c @@ -1,6 +1,6 @@ #include "swap.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c index 3a6c5368e..5f320b5a4 100644 --- a/src/detection/terminalfont/terminalfont.c +++ b/src/detection/terminalfont/terminalfont.c @@ -1,5 +1,5 @@ #include "terminalfont.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/processing.h" #include "util/debug.h" diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c index 8514d6579..14974080f 100644 --- a/src/detection/terminalfont/terminalfont_android.c +++ b/src/detection/terminalfont/terminalfont_android.c @@ -1,7 +1,7 @@ #include "fastfetch.h" #include "terminalfont.h" #include "detection/terminalshell/terminalshell.h" -#include "util/io/io.h" +#include "util/io.h" #ifdef FF_HAVE_FREETYPE #include "util/library.h" diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 39b509bfe..59ecdd2ce 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -3,7 +3,7 @@ #include "util/settings.h" #include "util/properties.h" #include "util/parsing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c index 8065ceb29..a24df94a3 100644 --- a/src/detection/terminalfont/terminalfont_windows.c +++ b/src/detection/terminalfont/terminalfont_windows.c @@ -1,5 +1,5 @@ #include "util/library.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/windows/unicode.h" diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index 8e54995a7..96e04fa34 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/path.h" diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 3376ecbfe..7912dbb79 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -1,5 +1,5 @@ #include "terminalshell.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/processing.h" #include "util/thread.h" diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index 177f4d273..fe2709785 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -1,5 +1,5 @@ #include "terminalshell.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/thread.h" #include "util/mallocHelper.h" diff --git a/src/detection/terminalsize/terminalsize_linux.c b/src/detection/terminalsize/terminalsize_linux.c index d74a4d933..183b61875 100644 --- a/src/detection/terminalsize/terminalsize_linux.c +++ b/src/detection/terminalsize/terminalsize_linux.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/terminalsize/terminalsize_windows.c b/src/detection/terminalsize/terminalsize_windows.c index 8c05f05c2..f884499be 100644 --- a/src/detection/terminalsize/terminalsize_windows.c +++ b/src/detection/terminalsize/terminalsize_windows.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c index f40a53675..80b62be3f 100644 --- a/src/detection/terminaltheme/terminaltheme.c +++ b/src/detection/terminaltheme/terminaltheme.c @@ -1,5 +1,5 @@ #include "terminaltheme.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/tpm/tpm_linux.c b/src/detection/tpm/tpm_linux.c index 593f76555..4bd8b32c1 100644 --- a/src/detection/tpm/tpm_linux.c +++ b/src/detection/tpm/tpm_linux.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "util/io/io.h" +#include "util/io.h" const char* ffDetectTPM(FFTPMResult* result) { diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c index 6cfa770be..19def70c3 100644 --- a/src/detection/uptime/uptime_linux.c +++ b/src/detection/uptime/uptime_linux.c @@ -1,6 +1,6 @@ #include "uptime.h" #include "util/time.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/users/users_linux.c b/src/detection/users/users_linux.c index 29b18f09f..98e506d33 100644 --- a/src/detection/users/users_linux.c +++ b/src/detection/users/users_linux.c @@ -1,4 +1,4 @@ -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "fastfetch.h" #include "users.h" diff --git a/src/detection/users/users_obsd.c b/src/detection/users/users_obsd.c index 17390f4d3..6d67afeff 100644 --- a/src/detection/users/users_obsd.c +++ b/src/detection/users/users_obsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "users.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 969353e99..7e63a970d 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -4,7 +4,7 @@ #ifdef FF_HAVE_VULKAN #include "util/library.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/stringUtils.h" diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c index 9fb62cb77..128597f48 100644 --- a/src/detection/weather/weather.c +++ b/src/detection/weather/weather.c @@ -1,5 +1,5 @@ #include "weather.h" -#include "util/networking/networking.h" +#include "util/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState state; diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c index 461e61186..6a0af8b4c 100644 --- a/src/detection/wifi/wifi_bsd.c +++ b/src/detection/wifi/wifi_bsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c index 53781e64e..953233809 100644 --- a/src/detection/wifi/wifi_linux.c +++ b/src/detection/wifi/wifi_linux.c @@ -1,6 +1,6 @@ #include "wifi.h" #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/stringUtils.h" diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c index 3339cf395..e29ebfef0 100644 --- a/src/detection/wifi/wifi_nbsd.c +++ b/src/detection/wifi/wifi_nbsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #define COMPAT_FREEBSD_NET80211 1 diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c index 830e984e5..46ee270bf 100644 --- a/src/detection/wifi/wifi_obsd.c +++ b/src/detection/wifi/wifi_obsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c index 7ebc43338..147f31321 100644 --- a/src/detection/wm/wm_linux.c +++ b/src/detection/wm/wm_linux.c @@ -1,7 +1,7 @@ #include "wm.h" #include "util/processing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/binary.h" #include "util/path.h" #include "util/stringUtils.h" diff --git a/src/detection/wm/wm_windows.cpp b/src/detection/wm/wm_windows.cpp index 01acf5830..0d9c3335d 100644 --- a/src/detection/wm/wm_windows.cpp +++ b/src/detection/wm/wm_windows.cpp @@ -1,7 +1,7 @@ extern "C" { #include "wm.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/version.h" #include "detection/terminalshell/terminalshell.h" } diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c index adf3a66e0..738ed9c01 100644 --- a/src/detection/wmtheme/wmtheme_linux.c +++ b/src/detection/wmtheme/wmtheme_linux.c @@ -1,5 +1,5 @@ #include "wmtheme.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/parsing.h" #include "util/settings.h" diff --git a/src/fastfetch.c b/src/fastfetch.c index d7cfe540e..59f66b33d 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -3,7 +3,7 @@ #include "logo/logo.h" #include "util/commandoption.h" #include "util/init.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/jsonconfig.h" #include "util/time.h" #include "util/stringUtils.h" diff --git a/src/fastfetch.h b/src/fastfetch.h index bb5197d6c..eaecdbbc7 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -18,7 +18,7 @@ #include "util/arrayUtils.h" #include "util/FFstrbuf.h" #include "util/FFlist.h" -#include "util/platform/FFPlatform.h" +#include "util/FFPlatform.h" #include "util/unused.h" #include "options/logo.h" diff --git a/src/logo/image/image.c b/src/logo/image/image.c index eb070a0d4..f8b031ae0 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -1,5 +1,5 @@ #include "image.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/printing.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/logo/logo.c b/src/logo/logo.c index 5b5390431..c24311124 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -1,5 +1,5 @@ #include "logo/logo.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/printing.h" #include "util/processing.h" #include "util/textModifier.h" diff --git a/src/util/modules.c b/src/modules/modules.c similarity index 100% rename from src/util/modules.c rename to src/modules/modules.c diff --git a/src/util/platform/FFPlatform.c b/src/util/FFPlatform.c similarity index 99% rename from src/util/platform/FFPlatform.c rename to src/util/FFPlatform.c index 9195e6ea4..37c23cb1f 100644 --- a/src/util/platform/FFPlatform.c +++ b/src/util/FFPlatform.c @@ -1,6 +1,6 @@ #include "FFPlatform_private.h" #include "util/stringUtils.h" -#include "util/io/io.h" +#include "util/io.h" #include "detection/version/version.h" void ffPlatformInit(FFPlatform* platform) diff --git a/src/util/platform/FFPlatform.h b/src/util/FFPlatform.h similarity index 100% rename from src/util/platform/FFPlatform.h rename to src/util/FFPlatform.h diff --git a/src/util/platform/FFPlatform_private.h b/src/util/FFPlatform_private.h similarity index 100% rename from src/util/platform/FFPlatform_private.h rename to src/util/FFPlatform_private.h diff --git a/src/util/platform/FFPlatform_unix.c b/src/util/FFPlatform_unix.c similarity index 99% rename from src/util/platform/FFPlatform_unix.c rename to src/util/FFPlatform_unix.c index 464077f52..4827df273 100644 --- a/src/util/platform/FFPlatform_unix.c +++ b/src/util/FFPlatform_unix.c @@ -1,7 +1,7 @@ #include "FFPlatform_private.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" -#include "util/io/io.h" +#include "util/io.h" #include "fastfetch_config.h" #include diff --git a/src/util/platform/FFPlatform_windows.c b/src/util/FFPlatform_windows.c similarity index 99% rename from src/util/platform/FFPlatform_windows.c rename to src/util/FFPlatform_windows.c index 26491031e..dc22900b1 100644 --- a/src/util/platform/FFPlatform_windows.c +++ b/src/util/FFPlatform_windows.c @@ -1,5 +1,5 @@ #include "FFPlatform_private.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/stringUtils.h" #include "util/windows/unicode.h" diff --git a/src/util/binary_apple.c b/src/util/binary_apple.c index 31d975fa9..0fca0c2b4 100644 --- a/src/util/binary_apple.c +++ b/src/util/binary_apple.c @@ -1,5 +1,5 @@ #include "binary.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/binary_linux.c b/src/util/binary_linux.c index 6844ebb00..a39f4b54a 100644 --- a/src/util/binary_linux.c +++ b/src/util/binary_linux.c @@ -2,7 +2,7 @@ #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__) -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/stringUtils.h" diff --git a/src/util/binary_windows.c b/src/util/binary_windows.c index d11ae8c0e..358f10f97 100644 --- a/src/util/binary_windows.c +++ b/src/util/binary_windows.c @@ -1,5 +1,5 @@ #include "binary.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/io/io.h b/src/util/io.h similarity index 100% rename from src/util/io/io.h rename to src/util/io.h diff --git a/src/util/io/io_unix.c b/src/util/io_unix.c similarity index 100% rename from src/util/io/io_unix.c rename to src/util/io_unix.c diff --git a/src/util/io/io_windows.c b/src/util/io_windows.c similarity index 100% rename from src/util/io/io_windows.c rename to src/util/io_windows.c diff --git a/src/util/jsonconfig.c b/src/util/jsonconfig.c index c606fe0a3..3c9334c5d 100644 --- a/src/util/jsonconfig.c +++ b/src/util/jsonconfig.c @@ -2,7 +2,7 @@ #include "util/color.h" #include "util/jsonconfig.h" #include "util/printing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/time.h" #include "util/stringUtils.h" #include "detection/version/version.h" diff --git a/src/util/kmod.c b/src/util/kmod.c index 38e819f85..1a64ceaa7 100644 --- a/src/util/kmod.c +++ b/src/util/kmod.c @@ -1,7 +1,7 @@ #include "kmod.h" #if __linux__ -#include "util/io/io.h" +#include "util/io.h" bool ffKmodLoaded(const char* modName) { diff --git a/src/util/netif/netif.c b/src/util/netif.c similarity index 100% rename from src/util/netif/netif.c rename to src/util/netif.c diff --git a/src/util/netif/netif.h b/src/util/netif.h similarity index 100% rename from src/util/netif/netif.h rename to src/util/netif.h diff --git a/src/util/netif/netif_apple.c b/src/util/netif_apple.c similarity index 99% rename from src/util/netif/netif_apple.c rename to src/util/netif_apple.c index 6452077ca..3e962a0da 100644 --- a/src/util/netif/netif_apple.c +++ b/src/util/netif_apple.c @@ -1,6 +1,6 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/netif/netif_bsd.c b/src/util/netif_bsd.c similarity index 99% rename from src/util/netif/netif_bsd.c rename to src/util/netif_bsd.c index e53c53641..da4a74934 100644 --- a/src/util/netif/netif_bsd.c +++ b/src/util/netif_bsd.c @@ -1,6 +1,6 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/netif/netif_gnu.c b/src/util/netif_gnu.c similarity index 97% rename from src/util/netif/netif_gnu.c rename to src/util/netif_gnu.c index a62a9a4a4..40dd162be 100644 --- a/src/util/netif/netif_gnu.c +++ b/src/util/netif_gnu.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/util/netif/netif_haiku.c b/src/util/netif_haiku.c similarity index 99% rename from src/util/netif/netif_haiku.c rename to src/util/netif_haiku.c index d5c5906ae..46f169dcf 100644 --- a/src/util/netif/netif_haiku.c +++ b/src/util/netif_haiku.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/netif/netif_linux.c b/src/util/netif_linux.c similarity index 99% rename from src/util/netif/netif_linux.c rename to src/util/netif_linux.c index 3427bead0..50ce084df 100644 --- a/src/util/netif/netif_linux.c +++ b/src/util/netif_linux.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/debug.h" diff --git a/src/util/netif/netif_windows.c b/src/util/netif_windows.c similarity index 100% rename from src/util/netif/netif_windows.c rename to src/util/netif_windows.c diff --git a/src/util/networking/networking.h b/src/util/networking.h similarity index 100% rename from src/util/networking/networking.h rename to src/util/networking.h diff --git a/src/util/networking/networking_common.c b/src/util/networking_common.c similarity index 99% rename from src/util/networking/networking_common.c rename to src/util/networking_common.c index aa6bd22e7..d799566eb 100644 --- a/src/util/networking/networking_common.c +++ b/src/util/networking_common.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/library.h" -#include "util/networking/networking.h" +#include "util/networking.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/util/networking/networking_linux.c b/src/util/networking_linux.c similarity index 99% rename from src/util/networking/networking_linux.c rename to src/util/networking_linux.c index 068cfe3c5..f407d133a 100644 --- a/src/util/networking/networking_linux.c +++ b/src/util/networking_linux.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/networking/networking.h" +#include "util/networking.h" #include "util/time.h" #include "util/library.h" #include "util/stringUtils.h" diff --git a/src/util/networking/networking_windows.c b/src/util/networking_windows.c similarity index 99% rename from src/util/networking/networking_windows.c rename to src/util/networking_windows.c index afd426618..7f0d70699 100644 --- a/src/util/networking/networking_windows.c +++ b/src/util/networking_windows.c @@ -3,7 +3,7 @@ //Must be included after #include "fastfetch.h" -#include "util/networking/networking.h" +#include "util/networking.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/util/path.c b/src/util/path.c index b6d6999e8..d9c9dadf7 100644 --- a/src/util/path.c +++ b/src/util/path.c @@ -1,6 +1,6 @@ #include "path.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #if !_WIN32 diff --git a/src/util/processing_linux.c b/src/util/processing_linux.c index ae8fcccb5..64e549066 100644 --- a/src/util/processing_linux.c +++ b/src/util/processing_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/processing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/processing_windows.c b/src/util/processing_windows.c index e0bf519f4..142005224 100644 --- a/src/util/processing_windows.c +++ b/src/util/processing_windows.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/processing.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/util/properties.c b/src/util/properties.c index dd224a574..2b36b3dbe 100644 --- a/src/util/properties.c +++ b/src/util/properties.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/properties.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/settings.c b/src/util/settings.c index 6fcb6f25b..b6cf9e398 100644 --- a/src/util/settings.c +++ b/src/util/settings.c @@ -2,7 +2,7 @@ #include "util/settings.h" #include "util/library.h" #include "util/thread.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c index 848484af3..6a2585b2c 100644 --- a/src/util/smbiosHelper.c +++ b/src/util/smbiosHelper.c @@ -1,5 +1,5 @@ #include "smbiosHelper.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/unused.h" #include "util/mallocHelper.h" #include "util/debug.h" From 874f3918b7a0e2d9dd2befb2944e84a2bff08e31 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 6 Jan 2026 09:42:54 +0800 Subject: [PATCH 30/67] Util: moves `util/*.c` to `util/impl/` --- CMakeLists.txt | 230 +++++++++++------------ src/util/debug.h | 2 + src/util/{ => impl}/FFPlatform.c | 0 src/util/{ => impl}/FFPlatform_private.h | 2 +- src/util/{ => impl}/FFPlatform_unix.c | 0 src/util/{ => impl}/FFPlatform_windows.c | 0 src/util/{ => impl}/FFlist.c | 2 +- src/util/{ => impl}/FFstrbuf.c | 2 +- src/util/{ => impl}/base64.c | 2 +- src/util/{ => impl}/binary_apple.c | 2 +- src/util/{ => impl}/binary_linux.c | 2 +- src/util/{ => impl}/binary_windows.c | 2 +- src/util/{ => impl}/commandoption.c | 2 +- src/util/{ => impl}/dbus.c | 2 +- src/util/{ => impl}/debug_windows.c | 2 +- src/util/{ => impl}/duration.c | 2 +- src/util/{ => impl}/edidHelper.c | 2 +- src/util/{ => impl}/font.c | 0 src/util/{ => impl}/format.c | 0 src/util/{ => impl}/frequency.c | 2 +- src/util/{ => impl}/init.c | 0 src/util/{ => impl}/io_unix.c | 2 +- src/util/{ => impl}/io_windows.c | 2 +- src/util/{ => impl}/jsonconfig.c | 0 src/util/{ => impl}/kmod.c | 2 +- src/util/{ => impl}/library.c | 0 src/util/{ => impl}/netif.c | 2 +- src/util/{ => impl}/netif_apple.c | 3 +- src/util/{ => impl}/netif_bsd.c | 3 +- src/util/{ => impl}/netif_gnu.c | 2 +- src/util/{ => impl}/netif_haiku.c | 2 +- src/util/{ => impl}/netif_linux.c | 2 +- src/util/{ => impl}/netif_windows.c | 2 +- src/util/{ => impl}/networking_common.c | 0 src/util/{ => impl}/networking_linux.c | 0 src/util/{ => impl}/networking_windows.c | 0 src/util/{ => impl}/option.c | 0 src/util/{ => impl}/parsing.c | 0 src/util/{ => impl}/path.c | 3 +- src/util/{ => impl}/percent.c | 0 src/util/{ => impl}/printing.c | 0 src/util/{ => impl}/processing_linux.c | 0 src/util/{ => impl}/processing_windows.c | 0 src/util/{ => impl}/properties.c | 0 src/util/{ => impl}/settings.c | 0 src/util/{ => impl}/size.c | 2 +- src/util/{ => impl}/smbiosHelper.c | 2 +- src/util/{ => impl}/sysctl.c | 2 +- src/util/{ => impl}/temps.c | 0 src/util/impl/time.c | 83 ++++++++ src/util/{ => impl}/wcwidth.c | 0 src/util/time.c | 3 - src/util/time.h | 84 +-------- 53 files changed, 232 insertions(+), 227 deletions(-) rename src/util/{ => impl}/FFPlatform.c (100%) rename src/util/{ => impl}/FFPlatform_private.h (88%) rename src/util/{ => impl}/FFPlatform_unix.c (100%) rename src/util/{ => impl}/FFPlatform_windows.c (100%) rename src/util/{ => impl}/FFlist.c (97%) rename src/util/{ => impl}/FFstrbuf.c (99%) rename src/util/{ => impl}/base64.c (99%) rename src/util/{ => impl}/binary_apple.c (99%) rename src/util/{ => impl}/binary_linux.c (99%) rename src/util/{ => impl}/binary_windows.c (98%) rename src/util/{ => impl}/commandoption.c (99%) rename src/util/{ => impl}/dbus.c (99%) rename src/util/{ => impl}/debug_windows.c (96%) rename src/util/{ => impl}/duration.c (98%) rename src/util/{ => impl}/edidHelper.c (99%) rename src/util/{ => impl}/font.c (100%) rename src/util/{ => impl}/format.c (100%) rename src/util/{ => impl}/frequency.c (95%) rename src/util/{ => impl}/init.c (100%) rename src/util/{ => impl}/io_unix.c (99%) rename src/util/{ => impl}/io_windows.c (99%) rename src/util/{ => impl}/jsonconfig.c (100%) rename src/util/{ => impl}/kmod.c (99%) rename src/util/{ => impl}/library.c (100%) rename src/util/{ => impl}/netif.c (96%) rename src/util/{ => impl}/netif_apple.c (99%) rename src/util/{ => impl}/netif_bsd.c (99%) rename src/util/{ => impl}/netif_gnu.c (97%) rename src/util/{ => impl}/netif_haiku.c (99%) rename src/util/{ => impl}/netif_linux.c (99%) rename src/util/{ => impl}/netif_windows.c (99%) rename src/util/{ => impl}/networking_common.c (100%) rename src/util/{ => impl}/networking_linux.c (100%) rename src/util/{ => impl}/networking_windows.c (100%) rename src/util/{ => impl}/option.c (100%) rename src/util/{ => impl}/parsing.c (100%) rename src/util/{ => impl}/path.c (98%) rename src/util/{ => impl}/percent.c (100%) rename src/util/{ => impl}/printing.c (100%) rename src/util/{ => impl}/processing_linux.c (100%) rename src/util/{ => impl}/processing_windows.c (100%) rename src/util/{ => impl}/properties.c (100%) rename src/util/{ => impl}/settings.c (100%) rename src/util/{ => impl}/size.c (98%) rename src/util/{ => impl}/smbiosHelper.c (99%) rename src/util/{ => impl}/sysctl.c (99%) rename src/util/{ => impl}/temps.c (100%) create mode 100644 src/util/impl/time.c rename src/util/{ => impl}/wcwidth.c (100%) delete mode 100644 src/util/time.c diff --git a/CMakeLists.txt b/CMakeLists.txt index dc33c998f..64ee2af83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,7 +342,7 @@ fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE) configure_file(src/fastfetch_config.h.in fastfetch_config.h @ONLY) configure_file(src/fastfetch_datatext.h.in fastfetch_datatext.h @ONLY) if(APPLE) - configure_file(src/util/apple/Info.plist.in Info.plist @ONLY) + configure_file(src/util/impl/apple/Info.plist.in Info.plist @ONLY) endif() #################### @@ -473,33 +473,33 @@ set(LIBFASTFETCH_SRC src/options/display.c src/options/logo.c src/options/general.c - src/util/commandoption.c - src/util/duration.c - src/util/font.c - src/util/format.c - src/util/frequency.c - src/util/init.c - src/util/jsonconfig.c - src/util/library.c - src/util/netif.c - src/util/networking_common.c - src/util/option.c - src/util/parsing.c - src/util/percent.c - src/util/printing.c - src/util/properties.c - src/util/settings.c - src/util/size.c - src/util/temps.c - src/util/time.c - src/util/edidHelper.c - src/util/base64.c - src/util/FFlist.c - src/util/FFstrbuf.c - src/util/kmod.c - src/util/path.c - src/util/FFPlatform.c - src/util/smbiosHelper.c + src/util/impl/commandoption.c + src/util/impl/duration.c + src/util/impl/font.c + src/util/impl/format.c + src/util/impl/frequency.c + src/util/impl/init.c + src/util/impl/jsonconfig.c + src/util/impl/library.c + src/util/impl/netif.c + src/util/impl/networking_common.c + src/util/impl/option.c + src/util/impl/parsing.c + src/util/impl/percent.c + src/util/impl/printing.c + src/util/impl/properties.c + src/util/impl/settings.c + src/util/impl/size.c + src/util/impl/temps.c + src/util/impl/time.c + src/util/impl/edidHelper.c + src/util/impl/base64.c + src/util/impl/FFlist.c + src/util/impl/FFstrbuf.c + src/util/impl/kmod.c + src/util/impl/path.c + src/util/impl/FFPlatform.c + src/util/impl/smbiosHelper.c ) if(LINUX) @@ -578,13 +578,13 @@ if(LINUX) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_linux.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_linux.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c ) elseif(ANDROID) list(APPEND LIBFASTFETCH_SRC @@ -651,13 +651,13 @@ elseif(ANDROID) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_android.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_linux.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_linux.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c ) elseif(FreeBSD) list(APPEND LIBFASTFETCH_SRC @@ -732,14 +732,14 @@ elseif(FreeBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_bsd.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/sysctl.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_bsd.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/sysctl.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c ) if(DragonFly) list(APPEND LIBFASTFETCH_SRC @@ -825,14 +825,14 @@ elseif(NetBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_bsd.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/sysctl.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_bsd.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/sysctl.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c ) elseif(OpenBSD) list(APPEND LIBFASTFETCH_SRC @@ -907,15 +907,15 @@ elseif(OpenBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_bsd.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/sysctl.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c - src/util/smbiosHelper.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_bsd.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/sysctl.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c + src/util/impl/smbiosHelper.c ) elseif(APPLE) list(APPEND LIBFASTFETCH_SRC @@ -977,16 +977,16 @@ elseif(APPLE) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_apple.m src/detection/camera/camera_apple.m - src/util/io_unix.c - src/util/netif_apple.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/sysctl.c - src/util/apple/cf_helpers.c - src/util/apple/osascript.m - src/util/apple/smc_temps.c - src/util/FFPlatform_unix.c - src/util/binary_apple.c + src/util/impl/io_unix.c + src/util/impl/netif_apple.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/sysctl.c + src/util/impl/apple/cf_helpers.c + src/util/impl/apple/osascript.m + src/util/impl/apple/smc_temps.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_apple.c ) elseif(WIN32) list(APPEND LIBFASTFETCH_SRC @@ -1047,19 +1047,19 @@ elseif(WIN32) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_windows.c src/detection/camera/camera_windows.cpp - src/util/io_windows.c - src/util/netif_windows.c - src/util/networking_windows.c - src/util/processing_windows.c - src/util/windows/getline.c - src/util/windows/com.cpp - src/util/windows/registry.c - src/util/windows/unicode.c - src/util/windows/wmi.cpp - src/util/windows/version.c - src/util/FFPlatform_windows.c - src/util/binary_windows.c - src/util/debug_windows.c + src/util/impl/io_windows.c + src/util/impl/netif_windows.c + src/util/impl/networking_windows.c + src/util/impl/processing_windows.c + src/util/impl/windows/getline.c + src/util/impl/windows/com.cpp + src/util/impl/windows/registry.c + src/util/impl/windows/unicode.c + src/util/impl/windows/wmi.cpp + src/util/impl/windows/version.c + src/util/impl/FFPlatform_windows.c + src/util/impl/binary_windows.c + src/util/impl/debug_windows.c ) elseif(SunOS) list(APPEND LIBFASTFETCH_SRC @@ -1134,13 +1134,13 @@ elseif(SunOS) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_apple.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_apple.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c ) elseif(Haiku) list(APPEND LIBFASTFETCH_SRC @@ -1202,14 +1202,14 @@ elseif(Haiku) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_nosupport.c src/detection/camera/camera_nosupport.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_haiku.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c - src/util/haiku/version.cpp + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_haiku.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c + src/util/impl/haiku/version.cpp ) elseif(GNU) list(APPEND LIBFASTFETCH_SRC @@ -1281,13 +1281,13 @@ elseif(GNU) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c - src/util/dbus.c - src/util/io_unix.c - src/util/netif_gnu.c - src/util/networking_linux.c - src/util/processing_linux.c - src/util/FFPlatform_unix.c - src/util/binary_linux.c + src/util/impl/dbus.c + src/util/impl/io_unix.c + src/util/impl/netif_gnu.c + src/util/impl/networking_linux.c + src/util/impl/processing_linux.c + src/util/impl/FFPlatform_unix.c + src/util/impl/binary_linux.c ) endif() @@ -1308,7 +1308,7 @@ endif() include(CheckFunctionExists) check_function_exists(wcwidth HAVE_WCWIDTH) if(NOT HAVE_WCWIDTH) - list(APPEND LIBFASTFETCH_SRC src/util/wcwidth.c) + list(APPEND LIBFASTFETCH_SRC src/util/impl/wcwidth.c) endif() if(NOT WIN32) check_function_exists(pipe2 HAVE_PIPE2) @@ -1881,7 +1881,7 @@ set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C) if(WIN32) target_sources(fastfetch - PRIVATE src/util/windows/version.rc + PRIVATE src/util/impl/windows/version.rc ) elseif(APPLE) target_link_options(fastfetch @@ -1909,7 +1909,7 @@ if (BUILD_FLASHFETCH) if(WIN32) target_sources(flashfetch - PRIVATE src/util/windows/version.rc + PRIVATE src/util/impl/windows/version.rc ) elseif(APPLE) target_link_options(flashfetch diff --git a/src/util/debug.h b/src/util/debug.h index 60cd14d68..2b0047e5f 100644 --- a/src/util/debug.h +++ b/src/util/debug.h @@ -28,4 +28,6 @@ static inline const char* ffFindFileName(const char* file) #define FF_DEBUG(format, ...) FF_DEBUG_PRINT(__FILE__, __LINE__, format, ##__VA_ARGS__) +#if _WIN32 const char* ffDebugWin32Error(unsigned long errorCode); +#endif diff --git a/src/util/FFPlatform.c b/src/util/impl/FFPlatform.c similarity index 100% rename from src/util/FFPlatform.c rename to src/util/impl/FFPlatform.c diff --git a/src/util/FFPlatform_private.h b/src/util/impl/FFPlatform_private.h similarity index 88% rename from src/util/FFPlatform_private.h rename to src/util/impl/FFPlatform_private.h index bb0247e6a..8c6842f8b 100644 --- a/src/util/FFPlatform_private.h +++ b/src/util/impl/FFPlatform_private.h @@ -1,6 +1,6 @@ #pragma once -#include "FFPlatform.h" +#include "util/FFPlatform.h" void ffPlatformInitImpl(FFPlatform* platform); diff --git a/src/util/FFPlatform_unix.c b/src/util/impl/FFPlatform_unix.c similarity index 100% rename from src/util/FFPlatform_unix.c rename to src/util/impl/FFPlatform_unix.c diff --git a/src/util/FFPlatform_windows.c b/src/util/impl/FFPlatform_windows.c similarity index 100% rename from src/util/FFPlatform_windows.c rename to src/util/impl/FFPlatform_windows.c diff --git a/src/util/FFlist.c b/src/util/impl/FFlist.c similarity index 97% rename from src/util/FFlist.c rename to src/util/impl/FFlist.c index c1af330d5..b03e3fca5 100644 --- a/src/util/FFlist.c +++ b/src/util/impl/FFlist.c @@ -1,4 +1,4 @@ -#include "FFlist.h" +#include "util/FFlist.h" #include #include diff --git a/src/util/FFstrbuf.c b/src/util/impl/FFstrbuf.c similarity index 99% rename from src/util/FFstrbuf.c rename to src/util/impl/FFstrbuf.c index aae3f1710..b2941afe9 100644 --- a/src/util/FFstrbuf.c +++ b/src/util/impl/FFstrbuf.c @@ -1,4 +1,4 @@ -#include "FFstrbuf.h" +#include "util/FFstrbuf.h" #include "util/mallocHelper.h" #include diff --git a/src/util/base64.c b/src/util/impl/base64.c similarity index 99% rename from src/util/base64.c rename to src/util/impl/base64.c index f59438e83..7c424684d 100644 --- a/src/util/base64.c +++ b/src/util/impl/base64.c @@ -1,4 +1,4 @@ -#include "base64.h" +#include "util/base64.h" // https://github.com/kostya/benchmarks/blob/master/base64/test-nolib.c#L145 void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output) diff --git a/src/util/binary_apple.c b/src/util/impl/binary_apple.c similarity index 99% rename from src/util/binary_apple.c rename to src/util/impl/binary_apple.c index 0fca0c2b4..fdbeb77bd 100644 --- a/src/util/binary_apple.c +++ b/src/util/impl/binary_apple.c @@ -1,4 +1,4 @@ -#include "binary.h" +#include "util/binary.h" #include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/binary_linux.c b/src/util/impl/binary_linux.c similarity index 99% rename from src/util/binary_linux.c rename to src/util/impl/binary_linux.c index a39f4b54a..c418a93d3 100644 --- a/src/util/binary_linux.c +++ b/src/util/impl/binary_linux.c @@ -1,4 +1,4 @@ -#include "binary.h" +#include "util/binary.h" #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__) diff --git a/src/util/binary_windows.c b/src/util/impl/binary_windows.c similarity index 98% rename from src/util/binary_windows.c rename to src/util/impl/binary_windows.c index 358f10f97..feeead17e 100644 --- a/src/util/binary_windows.c +++ b/src/util/impl/binary_windows.c @@ -1,4 +1,4 @@ -#include "binary.h" +#include "util/binary.h" #include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/commandoption.c b/src/util/impl/commandoption.c similarity index 99% rename from src/util/commandoption.c rename to src/util/impl/commandoption.c index 948edf1c2..d6c9301b4 100644 --- a/src/util/commandoption.c +++ b/src/util/impl/commandoption.c @@ -1,4 +1,4 @@ -#include "commandoption.h" +#include "util/commandoption.h" #include "util/color.h" #include "util/printing.h" #include "util/time.h" diff --git a/src/util/dbus.c b/src/util/impl/dbus.c similarity index 99% rename from src/util/dbus.c rename to src/util/impl/dbus.c index 97b2e08a4..1455f3735 100644 --- a/src/util/dbus.c +++ b/src/util/impl/dbus.c @@ -1,4 +1,4 @@ -#include "dbus.h" +#include "util/dbus.h" #ifdef FF_HAVE_DBUS diff --git a/src/util/debug_windows.c b/src/util/impl/debug_windows.c similarity index 96% rename from src/util/debug_windows.c rename to src/util/impl/debug_windows.c index e6bf3f786..b1a1fbc40 100644 --- a/src/util/debug_windows.c +++ b/src/util/impl/debug_windows.c @@ -1,4 +1,4 @@ -#include "debug.h" +#include "util/debug.h" #include diff --git a/src/util/duration.c b/src/util/impl/duration.c similarity index 98% rename from src/util/duration.c rename to src/util/impl/duration.c index c9dd6fbd8..1449bf13d 100644 --- a/src/util/duration.c +++ b/src/util/impl/duration.c @@ -1,4 +1,4 @@ -#include "duration.h" +#include "util/duration.h" void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result) { diff --git a/src/util/edidHelper.c b/src/util/impl/edidHelper.c similarity index 99% rename from src/util/edidHelper.c rename to src/util/impl/edidHelper.c index d05c87361..2bb8cad36 100644 --- a/src/util/edidHelper.c +++ b/src/util/impl/edidHelper.c @@ -1,4 +1,4 @@ -#include "edidHelper.h" +#include "util/edidHelper.h" void ffEdidGetPhysicalResolution(const uint8_t edid[128], uint32_t* width, uint32_t* height) { diff --git a/src/util/font.c b/src/util/impl/font.c similarity index 100% rename from src/util/font.c rename to src/util/impl/font.c diff --git a/src/util/format.c b/src/util/impl/format.c similarity index 100% rename from src/util/format.c rename to src/util/impl/format.c diff --git a/src/util/frequency.c b/src/util/impl/frequency.c similarity index 95% rename from src/util/frequency.c rename to src/util/impl/frequency.c index ae1318969..41bbf7246 100644 --- a/src/util/frequency.c +++ b/src/util/impl/frequency.c @@ -1,4 +1,4 @@ -#include "frequency.h" +#include "util/frequency.h" bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result) { diff --git a/src/util/init.c b/src/util/impl/init.c similarity index 100% rename from src/util/init.c rename to src/util/impl/init.c diff --git a/src/util/io_unix.c b/src/util/impl/io_unix.c similarity index 99% rename from src/util/io_unix.c rename to src/util/impl/io_unix.c index 3b6a9b27e..8d59ba698 100644 --- a/src/util/io_unix.c +++ b/src/util/impl/io_unix.c @@ -1,4 +1,4 @@ -#include "io.h" +#include "util/io.h" #include "fastfetch.h" #include "util/stringUtils.h" #include "util/time.h" diff --git a/src/util/io_windows.c b/src/util/impl/io_windows.c similarity index 99% rename from src/util/io_windows.c rename to src/util/impl/io_windows.c index 33f9c1941..e894d4808 100644 --- a/src/util/io_windows.c +++ b/src/util/impl/io_windows.c @@ -1,4 +1,4 @@ -#include "io.h" +#include "util/io.h" #include "fastfetch.h" #include "util/stringUtils.h" diff --git a/src/util/jsonconfig.c b/src/util/impl/jsonconfig.c similarity index 100% rename from src/util/jsonconfig.c rename to src/util/impl/jsonconfig.c diff --git a/src/util/kmod.c b/src/util/impl/kmod.c similarity index 99% rename from src/util/kmod.c rename to src/util/impl/kmod.c index 1a64ceaa7..46d0b6353 100644 --- a/src/util/kmod.c +++ b/src/util/impl/kmod.c @@ -1,4 +1,4 @@ -#include "kmod.h" +#include "util/kmod.h" #if __linux__ #include "util/io.h" diff --git a/src/util/library.c b/src/util/impl/library.c similarity index 100% rename from src/util/library.c rename to src/util/impl/library.c diff --git a/src/util/netif.c b/src/util/impl/netif.c similarity index 96% rename from src/util/netif.c rename to src/util/impl/netif.c index 52792a9f9..466e990f9 100644 --- a/src/util/netif.c +++ b/src/util/impl/netif.c @@ -1,4 +1,4 @@ -#include "netif.h" +#include "util/netif.h" #ifndef _WIN32 #include diff --git a/src/util/netif_apple.c b/src/util/impl/netif_apple.c similarity index 99% rename from src/util/netif_apple.c rename to src/util/impl/netif_apple.c index 3e962a0da..1ce541317 100644 --- a/src/util/netif_apple.c +++ b/src/util/impl/netif_apple.c @@ -1,5 +1,4 @@ -#include "netif.h" - +#include "util/netif.h" #include "util/io.h" #include "util/mallocHelper.h" diff --git a/src/util/netif_bsd.c b/src/util/impl/netif_bsd.c similarity index 99% rename from src/util/netif_bsd.c rename to src/util/impl/netif_bsd.c index da4a74934..bd85c5ea6 100644 --- a/src/util/netif_bsd.c +++ b/src/util/impl/netif_bsd.c @@ -1,5 +1,4 @@ -#include "netif.h" - +#include "util/netif.h" #include "util/io.h" #include "util/mallocHelper.h" diff --git a/src/util/netif_gnu.c b/src/util/impl/netif_gnu.c similarity index 97% rename from src/util/netif_gnu.c rename to src/util/impl/netif_gnu.c index 40dd162be..9cc6acb21 100644 --- a/src/util/netif_gnu.c +++ b/src/util/impl/netif_gnu.c @@ -1,4 +1,4 @@ -#include "netif.h" +#include "util/netif.h" #include "util/io.h" #include diff --git a/src/util/netif_haiku.c b/src/util/impl/netif_haiku.c similarity index 99% rename from src/util/netif_haiku.c rename to src/util/impl/netif_haiku.c index 46f169dcf..3e39290e0 100644 --- a/src/util/netif_haiku.c +++ b/src/util/impl/netif_haiku.c @@ -1,4 +1,4 @@ -#include "netif.h" +#include "util/netif.h" #include "util/io.h" #include "util/mallocHelper.h" diff --git a/src/util/netif_linux.c b/src/util/impl/netif_linux.c similarity index 99% rename from src/util/netif_linux.c rename to src/util/impl/netif_linux.c index 50ce084df..493fd4e11 100644 --- a/src/util/netif_linux.c +++ b/src/util/impl/netif_linux.c @@ -1,4 +1,4 @@ -#include "netif.h" +#include "util/netif.h" #include "util/io.h" #include "util/mallocHelper.h" #include "util/debug.h" diff --git a/src/util/netif_windows.c b/src/util/impl/netif_windows.c similarity index 99% rename from src/util/netif_windows.c rename to src/util/impl/netif_windows.c index 4fa7144b3..0eeba1ce3 100644 --- a/src/util/netif_windows.c +++ b/src/util/impl/netif_windows.c @@ -1,4 +1,4 @@ -#include "netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include // AF_INET6, IN6_IS_ADDR_UNSPECIFIED diff --git a/src/util/networking_common.c b/src/util/impl/networking_common.c similarity index 100% rename from src/util/networking_common.c rename to src/util/impl/networking_common.c diff --git a/src/util/networking_linux.c b/src/util/impl/networking_linux.c similarity index 100% rename from src/util/networking_linux.c rename to src/util/impl/networking_linux.c diff --git a/src/util/networking_windows.c b/src/util/impl/networking_windows.c similarity index 100% rename from src/util/networking_windows.c rename to src/util/impl/networking_windows.c diff --git a/src/util/option.c b/src/util/impl/option.c similarity index 100% rename from src/util/option.c rename to src/util/impl/option.c diff --git a/src/util/parsing.c b/src/util/impl/parsing.c similarity index 100% rename from src/util/parsing.c rename to src/util/impl/parsing.c diff --git a/src/util/path.c b/src/util/impl/path.c similarity index 98% rename from src/util/path.c rename to src/util/impl/path.c index d9c9dadf7..7d2aa032c 100644 --- a/src/util/path.c +++ b/src/util/impl/path.c @@ -1,5 +1,4 @@ -#include "path.h" - +#include "util/path.h" #include "util/io.h" #include "util/stringUtils.h" diff --git a/src/util/percent.c b/src/util/impl/percent.c similarity index 100% rename from src/util/percent.c rename to src/util/impl/percent.c diff --git a/src/util/printing.c b/src/util/impl/printing.c similarity index 100% rename from src/util/printing.c rename to src/util/impl/printing.c diff --git a/src/util/processing_linux.c b/src/util/impl/processing_linux.c similarity index 100% rename from src/util/processing_linux.c rename to src/util/impl/processing_linux.c diff --git a/src/util/processing_windows.c b/src/util/impl/processing_windows.c similarity index 100% rename from src/util/processing_windows.c rename to src/util/impl/processing_windows.c diff --git a/src/util/properties.c b/src/util/impl/properties.c similarity index 100% rename from src/util/properties.c rename to src/util/impl/properties.c diff --git a/src/util/settings.c b/src/util/impl/settings.c similarity index 100% rename from src/util/settings.c rename to src/util/impl/settings.c diff --git a/src/util/size.c b/src/util/impl/size.c similarity index 98% rename from src/util/size.c rename to src/util/impl/size.c index 07ce86da5..6e29ad535 100644 --- a/src/util/size.c +++ b/src/util/impl/size.c @@ -1,4 +1,4 @@ -#include "size.h" +#include "util/size.h" #include diff --git a/src/util/smbiosHelper.c b/src/util/impl/smbiosHelper.c similarity index 99% rename from src/util/smbiosHelper.c rename to src/util/impl/smbiosHelper.c index 6a2585b2c..19c02e658 100644 --- a/src/util/smbiosHelper.c +++ b/src/util/impl/smbiosHelper.c @@ -1,4 +1,4 @@ -#include "smbiosHelper.h" +#include "util/smbiosHelper.h" #include "util/io.h" #include "util/unused.h" #include "util/mallocHelper.h" diff --git a/src/util/sysctl.c b/src/util/impl/sysctl.c similarity index 99% rename from src/util/sysctl.c rename to src/util/impl/sysctl.c index 42a5875a6..6683c5c9a 100644 --- a/src/util/sysctl.c +++ b/src/util/impl/sysctl.c @@ -1,4 +1,4 @@ -#include "sysctl.h" +#include "util/sysctl.h" #include diff --git a/src/util/temps.c b/src/util/impl/temps.c similarity index 100% rename from src/util/temps.c rename to src/util/impl/temps.c diff --git a/src/util/impl/time.c b/src/util/impl/time.c new file mode 100644 index 000000000..e596f729f --- /dev/null +++ b/src/util/impl/time.c @@ -0,0 +1,83 @@ +#include "util/time.h" + +#include + +char ffTimeInternalBuffer[64]; // Reduce memory usage and prevent redundant allocations + +#ifdef _WIN32 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wformat" +#endif + +const char* ffTimeToFullStr(uint64_t msec) +{ + if (msec == 0) return ""; + time_t tsec = (time_t) (msec / 1000); + const struct tm* tm = localtime(&tsec); + + uint32_t len = 0; + len += (uint32_t) strftime(ffTimeInternalBuffer, ARRAY_SIZE(ffTimeInternalBuffer) - len, "%FT%T", tm); + len += (uint32_t) snprintf(ffTimeInternalBuffer + len, ARRAY_SIZE(ffTimeInternalBuffer) - len, ".%03u", (unsigned) (msec % 1000)); + len += (uint32_t) strftime(ffTimeInternalBuffer + len, ARRAY_SIZE(ffTimeInternalBuffer) - len, "%z", tm); + return ffTimeInternalBuffer; +} + +const char* ffTimeToShortStr(uint64_t msec) +{ + if (msec == 0) return ""; + time_t tsec = (time_t) (msec / 1000); + + strftime(ffTimeInternalBuffer, ARRAY_SIZE(ffTimeInternalBuffer), "%F %T", localtime(&tsec)); + return ffTimeInternalBuffer; +} + +const char* ffTimeToTimeStr(uint64_t msec) +{ + if (msec == 0) return ""; + time_t tsec = (time_t) (msec / 1000); + + uint32_t len = (uint32_t) strftime(ffTimeInternalBuffer, ARRAY_SIZE(ffTimeInternalBuffer), "%T", localtime(&tsec)); + sprintf(ffTimeInternalBuffer + len, ".%03u", (unsigned) (msec % 1000)); + return ffTimeInternalBuffer; +} + +#ifdef _WIN32 + #pragma GCC diagnostic pop +#endif + +FFTimeGetAgeResult ffTimeGetAge(uint64_t birthMs, uint64_t nowMs) +{ + FFTimeGetAgeResult result = {}; + if (__builtin_expect(birthMs == 0 || nowMs < birthMs, 0)) + return result; + + time_t birth_s = (time_t) (birthMs / 1000); + struct tm birth_tm; + #ifdef _WIN32 + localtime_s(&birth_tm, &birth_s); + #else + localtime_r(&birth_s, &birth_tm); + #endif + + time_t now_s = (time_t) (nowMs / 1000); + struct tm now_tm; + #ifdef _WIN32 + localtime_s(&now_tm, &now_s); + #else + localtime_r(&now_s, &now_tm); + #endif + + result.years = (uint32_t) (now_tm.tm_year - birth_tm.tm_year); + if (now_tm.tm_yday < birth_tm.tm_yday) + result.years--; + + birth_tm.tm_year += (int) result.years; + birth_s = mktime(&birth_tm); + uint32_t diff_s = (uint32_t) (now_s - birth_s); + result.daysOfYear = diff_s / (24 * 60 * 60); + + birth_tm.tm_year += 1; + result.yearsFraction = (double) diff_s / (double) (mktime(&birth_tm) - birth_s) + result.years; + + return result; +} diff --git a/src/util/wcwidth.c b/src/util/impl/wcwidth.c similarity index 100% rename from src/util/wcwidth.c rename to src/util/impl/wcwidth.c diff --git a/src/util/time.c b/src/util/time.c deleted file mode 100644 index 84eab78be..000000000 --- a/src/util/time.c +++ /dev/null @@ -1,3 +0,0 @@ -#include - -char ffTimeInternalBuffer[64]; // Reduce memory usage and prevent redundant allocations diff --git a/src/util/time.h b/src/util/time.h index 7390f1819..adc3e5f92 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -2,7 +2,6 @@ #include #include -#include #ifdef _WIN32 #include #include @@ -54,52 +53,14 @@ static inline void ffTimeSleep(uint32_t msec) #endif } -#ifdef _WIN32 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wformat" -#endif +// Not thread-safe +const char* ffTimeToFullStr(uint64_t msec); // Not thread-safe -static inline const char* ffTimeToFullStr(uint64_t msec) -{ - if (msec == 0) return ""; - time_t tsec = (time_t) (msec / 1000); - const struct tm* tm = localtime(&tsec); - - extern char ffTimeInternalBuffer[64]; - uint32_t len = 0; - len += (uint32_t) strftime(ffTimeInternalBuffer, ARRAY_SIZE(ffTimeInternalBuffer) - len, "%FT%T", tm); - len += (uint32_t) snprintf(ffTimeInternalBuffer + len, ARRAY_SIZE(ffTimeInternalBuffer) - len, ".%03u", (unsigned) (msec % 1000)); - len += (uint32_t) strftime(ffTimeInternalBuffer + len, ARRAY_SIZE(ffTimeInternalBuffer) - len, "%z", tm); - return ffTimeInternalBuffer; -} +const char* ffTimeToShortStr(uint64_t msec); // Not thread-safe -static inline const char* ffTimeToShortStr(uint64_t msec) -{ - if (msec == 0) return ""; - time_t tsec = (time_t) (msec / 1000); - - extern char ffTimeInternalBuffer[64]; - strftime(ffTimeInternalBuffer, ARRAY_SIZE(ffTimeInternalBuffer), "%F %T", localtime(&tsec)); - return ffTimeInternalBuffer; -} - -// Not thread-safe -static inline const char* ffTimeToTimeStr(uint64_t msec) -{ - if (msec == 0) return ""; - time_t tsec = (time_t) (msec / 1000); - - extern char ffTimeInternalBuffer[64]; - uint32_t len = (uint32_t) strftime(ffTimeInternalBuffer, ARRAY_SIZE(ffTimeInternalBuffer), "%T", localtime(&tsec)); - sprintf(ffTimeInternalBuffer + len, ".%03u", (unsigned) (msec % 1000)); - return ffTimeInternalBuffer; -} - -#ifdef _WIN32 - #pragma GCC diagnostic pop -#endif +const char* ffTimeToTimeStr(uint64_t msec); typedef struct FFTimeGetAgeResult { @@ -108,39 +69,4 @@ typedef struct FFTimeGetAgeResult double yearsFraction; } FFTimeGetAgeResult; -static inline FFTimeGetAgeResult ffTimeGetAge(uint64_t birthMs, uint64_t nowMs) -{ - FFTimeGetAgeResult result = {}; - if (__builtin_expect(birthMs == 0 || nowMs < birthMs, 0)) - return result; - - time_t birth_s = (time_t) (birthMs / 1000); - struct tm birth_tm; - #ifdef _WIN32 - localtime_s(&birth_tm, &birth_s); - #else - localtime_r(&birth_s, &birth_tm); - #endif - - time_t now_s = (time_t) (nowMs / 1000); - struct tm now_tm; - #ifdef _WIN32 - localtime_s(&now_tm, &now_s); - #else - localtime_r(&now_s, &now_tm); - #endif - - result.years = (uint32_t) (now_tm.tm_year - birth_tm.tm_year); - if (now_tm.tm_yday < birth_tm.tm_yday) - result.years--; - - birth_tm.tm_year += (int) result.years; - birth_s = mktime(&birth_tm); - uint32_t diff_s = (uint32_t) (now_s - birth_s); - result.daysOfYear = diff_s / (24 * 60 * 60); - - birth_tm.tm_year += 1; - result.yearsFraction = (double) diff_s / (double) (mktime(&birth_tm) - birth_s) + result.years; - - return result; -} +FFTimeGetAgeResult ffTimeGetAge(uint64_t birthMs, uint64_t nowMs); From d60b25e424a094ae1213f9a97b1c90411423c260 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 6 Jan 2026 09:48:38 +0800 Subject: [PATCH 31/67] Refactor: renames `src/util` to `src/common` --- CMakeLists.txt | 230 +++++++++--------- src/{util => common}/FFPlatform.h | 4 +- src/{util => common}/FFcheckmacros.h | 0 src/{util => common}/FFlist.h | 0 src/{util => common}/FFstrbuf.h | 0 src/{util => common}/apple/Info.plist.in | 0 src/{util => common}/apple/cf_helpers.c | 0 src/{util => common}/apple/cf_helpers.h | 0 src/{util => common}/apple/osascript.h | 0 src/{util => common}/apple/osascript.m | 0 src/{util => common}/apple/smc_temps.c | 4 +- src/{util => common}/apple/smc_temps.h | 0 src/{util => common}/arrayUtils.h | 0 src/{util => common}/base64.h | 0 src/{util => common}/binary.h | 0 src/{util => common}/color.h | 0 src/{util => common}/commandoption.h | 0 src/{util => common}/dbus.h | 4 +- src/{util => common}/debug.h | 2 +- src/{util => common}/duration.h | 0 src/{util => common}/edidHelper.h | 2 +- src/{util => common}/font.h | 4 +- src/{util => common}/format.h | 2 +- src/{util => common}/frequency.h | 0 src/{util => common}/haiku/version.cpp | 0 src/{util => common}/haiku/version.h | 2 +- src/{util => common}/impl/FFPlatform.c | 4 +- .../impl/FFPlatform_private.h | 2 +- src/{util => common}/impl/FFPlatform_unix.c | 6 +- .../impl/FFPlatform_windows.c | 12 +- src/{util => common}/impl/FFlist.c | 2 +- src/{util => common}/impl/FFstrbuf.c | 4 +- src/{util => common}/impl/base64.c | 2 +- src/{util => common}/impl/binary_apple.c | 8 +- src/{util => common}/impl/binary_linux.c | 8 +- src/{util => common}/impl/binary_windows.c | 8 +- src/{util => common}/impl/commandoption.c | 12 +- src/{util => common}/impl/dbus.c | 6 +- src/{util => common}/impl/debug_windows.c | 2 +- src/{util => common}/impl/duration.c | 2 +- src/{util => common}/impl/edidHelper.c | 2 +- src/{util => common}/impl/font.c | 8 +- src/{util => common}/impl/format.c | 8 +- src/{util => common}/impl/frequency.c | 2 +- src/{util => common}/impl/init.c | 10 +- src/{util => common}/impl/io_unix.c | 6 +- src/{util => common}/impl/io_windows.c | 6 +- src/{util => common}/impl/jsonconfig.c | 12 +- src/{util => common}/impl/kmod.c | 8 +- src/{util => common}/impl/library.c | 2 +- src/{util => common}/impl/netif.c | 2 +- src/{util => common}/impl/netif_apple.c | 6 +- src/{util => common}/impl/netif_bsd.c | 6 +- src/{util => common}/impl/netif_gnu.c | 4 +- src/{util => common}/impl/netif_haiku.c | 6 +- src/{util => common}/impl/netif_linux.c | 8 +- src/{util => common}/impl/netif_windows.c | 4 +- src/{util => common}/impl/networking_common.c | 8 +- src/{util => common}/impl/networking_linux.c | 12 +- .../impl/networking_windows.c | 6 +- src/{util => common}/impl/option.c | 6 +- src/{util => common}/impl/parsing.c | 2 +- src/{util => common}/impl/path.c | 6 +- src/{util => common}/impl/percent.c | 12 +- src/{util => common}/impl/printing.c | 4 +- src/{util => common}/impl/processing_linux.c | 8 +- .../impl/processing_windows.c | 4 +- src/{util => common}/impl/properties.c | 8 +- src/{util => common}/impl/settings.c | 10 +- src/{util => common}/impl/size.c | 2 +- src/{util => common}/impl/smbiosHelper.c | 16 +- src/{util => common}/impl/sysctl.c | 2 +- src/{util => common}/impl/temps.c | 6 +- src/{util => common}/impl/time.c | 2 +- src/{util => common}/impl/wcwidth.c | 0 src/{util => common}/init.h | 0 src/{util => common}/io.h | 4 +- src/{util => common}/jsonconfig.h | 0 src/{util => common}/kmod.h | 0 src/{util => common}/library.h | 2 +- src/{util => common}/mallocHelper.h | 0 src/{util => common}/netif.h | 0 src/{util => common}/networking.h | 4 +- src/{util => common}/option.h | 2 +- src/{util => common}/parsing.h | 2 +- src/{util => common}/path.h | 4 +- src/{util => common}/percent.h | 6 +- src/{util => common}/printing.h | 2 +- src/{util => common}/processing.h | 2 +- src/{util => common}/properties.h | 0 src/{util => common}/settings.h | 0 src/{util => common}/size.h | 0 src/{util => common}/smbiosHelper.h | 2 +- src/{util => common}/stringUtils.h | 0 src/{util => common}/sysctl.h | 2 +- src/{util => common}/temps.h | 4 +- src/{util => common}/textModifier.h | 0 src/{util => common}/thread.h | 0 src/{util => common}/time.h | 2 +- src/{util => common}/unused.h | 0 src/{util => common}/wcwidth.h | 0 src/{util => common}/windows/c-logo.sh | 0 src/{util => common}/windows/com.cpp | 0 src/{util => common}/windows/com.hpp | 0 src/{util => common}/windows/getline.c | 0 src/{util => common}/windows/getline.h | 0 src/{util => common}/windows/logo.ico | Bin src/{util => common}/windows/logo.svg | 0 src/{util => common}/windows/manifest.xml | 0 src/{util => common}/windows/nt.h | 0 src/{util => common}/windows/perflib_.h | 0 src/{util => common}/windows/registry.c | 2 +- src/{util => common}/windows/registry.h | 0 src/{util => common}/windows/unicode.c | 0 src/{util => common}/windows/unicode.h | 2 +- src/{util => common}/windows/unicode.hpp | 0 src/{util => common}/windows/variant.hpp | 0 src/{util => common}/windows/version.c | 6 +- src/{util => common}/windows/version.h | 0 src/{util => common}/windows/version.rc | 0 src/{util => common}/windows/wmi.cpp | 4 +- src/{util => common}/windows/wmi.hpp | 0 src/detection/battery/battery_android.c | 6 +- src/detection/battery/battery_apple.c | 4 +- src/detection/battery/battery_bsd.c | 4 +- src/detection/battery/battery_haiku.c | 2 +- src/detection/battery/battery_linux.c | 4 +- src/detection/battery/battery_nbsd.c | 6 +- src/detection/battery/battery_obsd.c | 2 +- src/detection/battery/battery_windows.c | 10 +- src/detection/bios/bios_android.c | 2 +- src/detection/bios/bios_apple.c | 2 +- src/detection/bios/bios_bsd.c | 8 +- src/detection/bios/bios_linux.c | 4 +- src/detection/bios/bios_nbsd.c | 4 +- src/detection/bios/bios_windows.c | 6 +- src/detection/bluetooth/bluetooth_haiku.cpp | 2 +- src/detection/bluetooth/bluetooth_linux.c | 6 +- src/detection/bluetooth/bluetooth_windows.c | 4 +- src/detection/bluetooth/bluetooth_windows.cpp | 4 +- .../bluetoothradio/bluetoothradio_apple.m | 2 +- .../bluetoothradio/bluetoothradio_linux.c | 6 +- .../bluetoothradio/bluetoothradio_windows.c | 6 +- src/detection/board/board_android.c | 2 +- src/detection/board/board_apple.c | 2 +- src/detection/board/board_bsd.c | 4 +- src/detection/board/board_linux.c | 4 +- src/detection/board/board_nbsd.c | 4 +- src/detection/board/board_windows.c | 2 +- src/detection/bootmgr/bootmgr_apple.c | 4 +- src/detection/bootmgr/bootmgr_bsd.c | 2 +- src/detection/bootmgr/bootmgr_linux.c | 2 +- src/detection/bootmgr/bootmgr_windows.c | 2 +- src/detection/brightness/brightness_apple.c | 4 +- src/detection/brightness/brightness_bsd.c | 2 +- src/detection/brightness/brightness_linux.c | 10 +- src/detection/brightness/brightness_nbsd.c | 2 +- src/detection/brightness/brightness_obsd.c | 2 +- .../brightness/brightness_windows.cpp | 6 +- src/detection/btrfs/btrfs_linux.c | 2 +- src/detection/camera/camera_android.c | 4 +- src/detection/camera/camera_apple.m | 2 +- src/detection/camera/camera_linux.c | 2 +- src/detection/camera/camera_windows.cpp | 6 +- src/detection/chassis/chassis_bsd.c | 4 +- src/detection/chassis/chassis_linux.c | 4 +- src/detection/chassis/chassis_nbsd.c | 4 +- src/detection/chassis/chassis_windows.c | 2 +- src/detection/command/command.c | 4 +- src/detection/cpu/cpu.c | 2 +- src/detection/cpu/cpu_apple.c | 8 +- src/detection/cpu/cpu_bsd.c | 4 +- src/detection/cpu/cpu_haiku.c | 2 +- src/detection/cpu/cpu_linux.c | 14 +- src/detection/cpu/cpu_nbsd.c | 4 +- src/detection/cpu/cpu_obsd.c | 4 +- src/detection/cpu/cpu_sunos.c | 4 +- src/detection/cpu/cpu_windows.c | 10 +- src/detection/cpucache/cpucache_apple.c | 4 +- src/detection/cpucache/cpucache_linux.c | 4 +- src/detection/cpucache/cpucache_shared.c | 4 +- src/detection/cpucache/cpucache_windows.c | 2 +- src/detection/cpuusage/cpuusage.c | 2 +- src/detection/cpuusage/cpuusage_bsd.c | 2 +- src/detection/cpuusage/cpuusage_haiku.c | 2 +- src/detection/cpuusage/cpuusage_linux.c | 2 +- src/detection/cpuusage/cpuusage_windows.c | 4 +- src/detection/cursor/cursor_linux.c | 8 +- src/detection/cursor/cursor_windows.c | 2 +- src/detection/de/de_linux.c | 16 +- src/detection/disk/disk_bsd.c | 6 +- src/detection/disk/disk_haiku.cpp | 2 +- src/detection/disk/disk_linux.c | 4 +- src/detection/disk/disk_sunos.c | 4 +- src/detection/disk/disk_windows.c | 6 +- src/detection/diskio/diskio.c | 2 +- src/detection/diskio/diskio_apple.c | 2 +- src/detection/diskio/diskio_bsd.c | 2 +- src/detection/diskio/diskio_linux.c | 6 +- src/detection/diskio/diskio_nbsd.c | 4 +- src/detection/diskio/diskio_obsd.c | 4 +- src/detection/diskio/diskio_sunos.c | 2 +- src/detection/diskio/diskio_windows.c | 4 +- .../displayserver/displayserver_android.c | 4 +- .../displayserver/displayserver_apple.c | 6 +- .../displayserver/displayserver_windows.c | 4 +- src/detection/displayserver/linux/common.c | 2 +- .../displayserver/linux/displayserver_linux.c | 6 +- src/detection/displayserver/linux/drm.c | 8 +- .../linux/wayland/global-output.c | 2 +- .../displayserver/linux/wayland/kde-output.c | 4 +- .../displayserver/linux/wayland/wayland.c | 8 +- .../displayserver/linux/wayland/wayland.h | 4 +- src/detection/displayserver/linux/wmde.c | 8 +- src/detection/displayserver/linux/xcb.c | 10 +- src/detection/displayserver/linux/xlib.c | 8 +- src/detection/dns/dns_apple.c | 10 +- src/detection/dns/dns_linux.c | 8 +- src/detection/dns/dns_windows.c | 4 +- src/detection/editor/editor.c | 10 +- src/detection/font/font_apple.m | 4 +- src/detection/font/font_linux.c | 4 +- src/detection/font/font_windows.c | 2 +- src/detection/gamepad/gamepad_apple.c | 4 +- src/detection/gamepad/gamepad_bsd.c | 2 +- src/detection/gamepad/gamepad_linux.c | 4 +- src/detection/gamepad/gamepad_windows.c | 6 +- src/detection/gpu/gpu_amd.c | 6 +- src/detection/gpu/gpu_android.c | 4 +- src/detection/gpu/gpu_apple.c | 6 +- src/detection/gpu/gpu_bsd.c | 8 +- src/detection/gpu/gpu_drm.c | 8 +- src/detection/gpu/gpu_general.c | 4 +- src/detection/gpu/gpu_haiku.c | 2 +- src/detection/gpu/gpu_intel.c | 4 +- src/detection/gpu/gpu_linux.c | 10 +- src/detection/gpu/gpu_mthreads.c | 2 +- src/detection/gpu/gpu_nbsd.c | 2 +- src/detection/gpu/gpu_nvidia.c | 2 +- src/detection/gpu/gpu_obsd.c | 2 +- src/detection/gpu/gpu_pci.c | 4 +- src/detection/gpu/gpu_sunos.c | 2 +- src/detection/gpu/gpu_windows.c | 12 +- src/detection/gpu/gpu_wsl.cpp | 2 +- src/detection/gtk_qt/gtk.c | 6 +- src/detection/gtk_qt/qt.c | 6 +- src/detection/host/host_android.c | 2 +- src/detection/host/host_apple.c | 4 +- src/detection/host/host_bsd.c | 4 +- src/detection/host/host_linux.c | 6 +- src/detection/host/host_mac.c | 2 +- src/detection/host/host_nbsd.c | 4 +- src/detection/host/host_obsd.c | 4 +- src/detection/host/host_windows.c | 2 +- src/detection/icons/icons_linux.c | 2 +- src/detection/icons/icons_windows.c | 2 +- src/detection/initsystem/initsystem_haiku.c | 6 +- src/detection/initsystem/initsystem_linux.c | 6 +- src/detection/keyboard/keyboard_apple.c | 4 +- src/detection/keyboard/keyboard_bsd.c | 2 +- src/detection/keyboard/keyboard_linux.c | 4 +- src/detection/keyboard/keyboard_windows.c | 6 +- src/detection/lm/lm_linux.c | 8 +- src/detection/loadavg/loadavg_linux.c | 2 +- src/detection/locale/locale_windows.c | 2 +- src/detection/localip/localip_linux.c | 8 +- src/detection/localip/localip_windows.c | 8 +- src/detection/media/media.c | 2 +- src/detection/media/media_apple.m | 4 +- src/detection/media/media_linux.c | 6 +- src/detection/media/media_windows.c | 4 +- src/detection/memory/memory_bsd.c | 2 +- src/detection/memory/memory_linux.c | 4 +- src/detection/memory/memory_nbsd.c | 2 +- src/detection/memory/memory_obsd.c | 2 +- src/detection/mouse/mouse_apple.c | 4 +- src/detection/mouse/mouse_bsd.c | 2 +- src/detection/mouse/mouse_linux.c | 4 +- src/detection/mouse/mouse_windows.c | 6 +- src/detection/netio/netio.c | 2 +- src/detection/netio/netio_apple.c | 4 +- src/detection/netio/netio_bsd.c | 4 +- src/detection/netio/netio_haiku.cpp | 2 +- src/detection/netio/netio_linux.c | 6 +- src/detection/netio/netio_sunos.c | 4 +- src/detection/netio/netio_windows.c | 6 +- src/detection/opencl/opencl.c | 6 +- src/detection/opengl/opengl_haiku.cpp | 2 +- src/detection/opengl/opengl_linux.c | 4 +- src/detection/opengl/opengl_shared.c | 4 +- src/detection/opengl/opengl_windows.c | 4 +- src/detection/os/os_android.c | 2 +- src/detection/os/os_apple.m | 8 +- src/detection/os/os_linux.c | 10 +- src/detection/os/os_sunos.c | 2 +- src/detection/os/os_windows.cpp | 10 +- src/detection/packages/packages.c | 2 +- src/detection/packages/packages_apple.c | 8 +- src/detection/packages/packages_bsd.c | 2 +- src/detection/packages/packages_haiku.c | 2 +- src/detection/packages/packages_linux.c | 12 +- src/detection/packages/packages_nbsd.c | 2 +- src/detection/packages/packages_nix.c | 6 +- src/detection/packages/packages_obsd.c | 2 +- src/detection/packages/packages_windows.c | 14 +- .../physicaldisk/physicaldisk_apple.c | 2 +- src/detection/physicaldisk/physicaldisk_bsd.c | 2 +- .../physicaldisk/physicaldisk_haiku.c | 4 +- .../physicaldisk/physicaldisk_linux.c | 6 +- .../physicaldisk/physicaldisk_sunos.c | 2 +- .../physicaldisk/physicaldisk_windows.c | 4 +- .../physicalmemory/physicalmemory_apple.m | 8 +- .../physicalmemory/physicalmemory_linux.c | 2 +- .../poweradapter/poweradapter_apple.c | 2 +- .../poweradapter/poweradapter_linux.c | 4 +- src/detection/processes/processes_linux.c | 4 +- src/detection/processes/processes_windows.c | 2 +- src/detection/publicip/publicip.c | 2 +- src/detection/sound/sound_apple.c | 2 +- src/detection/sound/sound_bsd.c | 4 +- src/detection/sound/sound_haiku.cpp | 2 +- src/detection/sound/sound_linux.c | 2 +- src/detection/sound/sound_nbsd.c | 2 +- src/detection/sound/sound_obsd.c | 2 +- src/detection/sound/sound_sunos.c | 4 +- src/detection/sound/sound_windows.cpp | 4 +- src/detection/swap/swap_bsd.c | 2 +- src/detection/swap/swap_linux.c | 4 +- src/detection/swap/swap_obsd.c | 4 +- src/detection/swap/swap_windows.c | 4 +- src/detection/terminalfont/terminalfont.c | 10 +- src/detection/terminalfont/terminalfont.h | 2 +- .../terminalfont/terminalfont_android.c | 4 +- .../terminalfont/terminalfont_apple.m | 4 +- .../terminalfont/terminalfont_linux.c | 18 +- .../terminalfont/terminalfont_windows.c | 14 +- src/detection/terminalshell/terminalshell.c | 16 +- .../terminalshell/terminalshell_linux.c | 10 +- .../terminalshell/terminalshell_windows.c | 16 +- .../terminalsize/terminalsize_linux.c | 2 +- .../terminalsize/terminalsize_windows.c | 2 +- src/detection/terminaltheme/terminaltheme.c | 4 +- src/detection/theme/theme_linux.c | 2 +- src/detection/tpm/tpm_apple.c | 2 +- src/detection/tpm/tpm_bsd.c | 4 +- src/detection/tpm/tpm_linux.c | 2 +- src/detection/tpm/tpm_windows.c | 2 +- src/detection/uptime/uptime_bsd.c | 2 +- src/detection/uptime/uptime_haiku.c | 2 +- src/detection/uptime/uptime_linux.c | 4 +- src/detection/uptime/uptime_sunos.c | 2 +- src/detection/uptime/uptime_windows.c | 2 +- src/detection/users/users_linux.c | 4 +- src/detection/users/users_obsd.c | 2 +- src/detection/users/users_windows.c | 2 +- src/detection/vulkan/vulkan.c | 8 +- src/detection/wallpaper/wallpaper_apple.m | 4 +- src/detection/wallpaper/wallpaper_linux.c | 2 +- src/detection/wallpaper/wallpaper_windows.c | 28 +-- src/detection/weather/weather.c | 2 +- src/detection/wifi/wifi_android.c | 4 +- src/detection/wifi/wifi_apple.m | 4 +- src/detection/wifi/wifi_bsd.c | 4 +- src/detection/wifi/wifi_linux.c | 12 +- src/detection/wifi/wifi_nbsd.c | 4 +- src/detection/wifi/wifi_obsd.c | 4 +- src/detection/wifi/wifi_windows.c | 4 +- src/detection/wm/wm_apple.m | 6 +- src/detection/wm/wm_linux.c | 12 +- src/detection/wm/wm_windows.cpp | 6 +- src/detection/wmtheme/wmtheme_linux.c | 12 +- src/detection/wmtheme/wmtheme_windows.c | 2 +- src/detection/zpool/zpool.c | 4 +- src/fastfetch.c | 16 +- src/fastfetch.h | 10 +- src/flashfetch.c | 2 +- src/logo/builtin.c | 2 +- src/logo/image/im6.c | 2 +- src/logo/image/im7.c | 2 +- src/logo/image/image.c | 12 +- src/logo/logo.c | 10 +- src/modules/battery/battery.c | 12 +- src/modules/battery/option.h | 4 +- src/modules/bios/bios.c | 6 +- src/modules/bios/option.h | 2 +- src/modules/bluetooth/bluetooth.c | 8 +- src/modules/bluetooth/option.h | 4 +- src/modules/bluetoothradio/bluetoothradio.c | 8 +- src/modules/bluetoothradio/option.h | 4 +- src/modules/board/board.c | 6 +- src/modules/board/option.h | 2 +- src/modules/bootmgr/bootmgr.c | 6 +- src/modules/bootmgr/option.h | 2 +- src/modules/break/break.c | 2 +- src/modules/break/option.h | 2 +- src/modules/brightness/brightness.c | 8 +- src/modules/brightness/option.h | 4 +- src/modules/btrfs/btrfs.c | 10 +- src/modules/btrfs/option.h | 4 +- src/modules/camera/camera.c | 6 +- src/modules/camera/option.h | 2 +- src/modules/chassis/chassis.c | 6 +- src/modules/chassis/option.h | 2 +- src/modules/colors/colors.c | 8 +- src/modules/colors/option.h | 2 +- src/modules/command/command.c | 4 +- src/modules/command/option.h | 2 +- src/modules/cpu/cpu.c | 10 +- src/modules/cpu/option.h | 2 +- src/modules/cpucache/cpucache.c | 8 +- src/modules/cpucache/option.h | 2 +- src/modules/cpuusage/cpuusage.c | 8 +- src/modules/cpuusage/option.h | 4 +- src/modules/cursor/cursor.c | 6 +- src/modules/cursor/option.h | 2 +- src/modules/custom/custom.c | 8 +- src/modules/custom/option.h | 2 +- src/modules/datetime/datetime.c | 8 +- src/modules/datetime/option.h | 2 +- src/modules/de/de.c | 6 +- src/modules/de/option.h | 2 +- src/modules/disk/disk.c | 10 +- src/modules/disk/option.h | 4 +- src/modules/diskio/diskio.c | 8 +- src/modules/diskio/option.h | 2 +- src/modules/display/display.c | 8 +- src/modules/display/option.h | 2 +- src/modules/dns/dns.c | 6 +- src/modules/dns/option.h | 2 +- src/modules/editor/editor.c | 6 +- src/modules/editor/option.h | 2 +- src/modules/font/font.c | 6 +- src/modules/font/option.h | 2 +- src/modules/gamepad/gamepad.c | 8 +- src/modules/gamepad/option.h | 4 +- src/modules/gpu/gpu.c | 14 +- src/modules/gpu/option.h | 4 +- src/modules/host/host.c | 6 +- src/modules/host/option.h | 2 +- src/modules/icons/icons.c | 6 +- src/modules/icons/option.h | 2 +- src/modules/initsystem/initsystem.c | 6 +- src/modules/initsystem/option.h | 2 +- src/modules/kernel/kernel.c | 8 +- src/modules/kernel/option.h | 2 +- src/modules/keyboard/keyboard.c | 8 +- src/modules/keyboard/option.h | 4 +- src/modules/lm/lm.c | 6 +- src/modules/lm/option.h | 2 +- src/modules/loadavg/loadavg.c | 8 +- src/modules/loadavg/option.h | 2 +- src/modules/locale/locale.c | 6 +- src/modules/locale/option.h | 2 +- src/modules/localip/localip.c | 6 +- src/modules/localip/option.h | 2 +- src/modules/media/media.c | 6 +- src/modules/media/option.h | 2 +- src/modules/memory/memory.c | 10 +- src/modules/memory/option.h | 4 +- src/modules/monitor/monitor.c | 6 +- src/modules/monitor/option.h | 2 +- src/modules/mouse/mouse.c | 8 +- src/modules/mouse/option.h | 4 +- src/modules/netio/netio.c | 8 +- src/modules/netio/option.h | 2 +- src/modules/opencl/opencl.c | 6 +- src/modules/opencl/option.h | 2 +- src/modules/opengl/opengl.c | 6 +- src/modules/opengl/option.h | 2 +- src/modules/os/option.h | 2 +- src/modules/os/os.c | 8 +- src/modules/packages/option.h | 2 +- src/modules/packages/packages.c | 6 +- src/modules/physicaldisk/option.h | 2 +- src/modules/physicaldisk/physicaldisk.c | 10 +- src/modules/physicalmemory/option.h | 4 +- src/modules/physicalmemory/physicalmemory.c | 10 +- src/modules/player/option.h | 2 +- src/modules/player/player.c | 6 +- src/modules/poweradapter/option.h | 2 +- src/modules/poweradapter/poweradapter.c | 6 +- src/modules/processes/option.h | 2 +- src/modules/processes/processes.c | 6 +- src/modules/publicip/option.h | 2 +- src/modules/publicip/publicip.c | 6 +- src/modules/separator/option.h | 2 +- src/modules/separator/separator.c | 12 +- src/modules/shell/option.h | 2 +- src/modules/shell/shell.c | 6 +- src/modules/sound/option.h | 4 +- src/modules/sound/sound.c | 8 +- src/modules/swap/option.h | 4 +- src/modules/swap/swap.c | 10 +- src/modules/terminal/option.h | 2 +- src/modules/terminal/terminal.c | 6 +- src/modules/terminalfont/option.h | 2 +- src/modules/terminalfont/terminalfont.c | 6 +- src/modules/terminalsize/option.h | 2 +- src/modules/terminalsize/terminalsize.c | 6 +- src/modules/terminaltheme/option.h | 2 +- src/modules/terminaltheme/terminaltheme.c | 6 +- src/modules/theme/option.h | 2 +- src/modules/theme/theme.c | 6 +- src/modules/title/option.h | 2 +- src/modules/title/title.c | 6 +- src/modules/tpm/option.h | 2 +- src/modules/tpm/tpm.c | 6 +- src/modules/uptime/option.h | 2 +- src/modules/uptime/uptime.c | 10 +- src/modules/users/option.h | 2 +- src/modules/users/users.c | 8 +- src/modules/version/option.h | 2 +- src/modules/version/version.c | 6 +- src/modules/vulkan/option.h | 2 +- src/modules/vulkan/vulkan.c | 6 +- src/modules/wallpaper/option.h | 2 +- src/modules/wallpaper/wallpaper.c | 6 +- src/modules/weather/option.h | 2 +- src/modules/weather/weather.c | 6 +- src/modules/wifi/option.h | 2 +- src/modules/wifi/wifi.c | 6 +- src/modules/wm/option.h | 2 +- src/modules/wm/wm.c | 6 +- src/modules/wmtheme/option.h | 2 +- src/modules/wmtheme/wmtheme.c | 6 +- src/modules/zpool/option.h | 4 +- src/modules/zpool/zpool.c | 12 +- src/options/display.c | 8 +- src/options/display.h | 6 +- src/options/general.c | 6 +- src/options/general.h | 2 +- src/options/logo.c | 4 +- src/options/logo.h | 2 +- tests/color.c | 4 +- tests/duration.c | 4 +- tests/format.c | 4 +- tests/list.c | 4 +- tests/strbuf.c | 4 +- 538 files changed, 1281 insertions(+), 1281 deletions(-) rename src/{util => common}/FFPlatform.h (92%) rename src/{util => common}/FFcheckmacros.h (100%) rename src/{util => common}/FFlist.h (100%) rename src/{util => common}/FFstrbuf.h (100%) rename src/{util => common}/apple/Info.plist.in (100%) rename src/{util => common}/apple/cf_helpers.c (100%) rename src/{util => common}/apple/cf_helpers.h (100%) rename src/{util => common}/apple/osascript.h (100%) rename src/{util => common}/apple/osascript.m (100%) rename src/{util => common}/apple/smc_temps.c (99%) rename src/{util => common}/apple/smc_temps.h (100%) rename src/{util => common}/arrayUtils.h (100%) rename src/{util => common}/base64.h (100%) rename src/{util => common}/binary.h (100%) rename src/{util => common}/color.h (100%) rename src/{util => common}/commandoption.h (100%) rename src/{util => common}/dbus.h (97%) rename src/{util => common}/debug.h (97%) rename src/{util => common}/duration.h (100%) rename src/{util => common}/edidHelper.h (95%) rename src/{util => common}/font.h (92%) rename src/{util => common}/format.h (98%) rename src/{util => common}/frequency.h (100%) rename src/{util => common}/haiku/version.cpp (100%) rename src/{util => common}/haiku/version.h (69%) rename src/{util => common}/impl/FFPlatform.c (97%) rename src/{util => common}/impl/FFPlatform_private.h (87%) rename src/{util => common}/impl/FFPlatform_unix.c (98%) rename src/{util => common}/impl/FFPlatform_windows.c (98%) rename src/{util => common}/impl/FFlist.c (97%) rename src/{util => common}/impl/FFstrbuf.c (99%) rename src/{util => common}/impl/base64.c (99%) rename src/{util => common}/impl/binary_apple.c (98%) rename src/{util => common}/impl/binary_linux.c (97%) rename src/{util => common}/impl/binary_windows.c (94%) rename src/{util => common}/impl/commandoption.c (97%) rename src/{util => common}/impl/dbus.c (99%) rename src/{util => common}/impl/debug_windows.c (96%) rename src/{util => common}/impl/duration.c (98%) rename src/{util => common}/impl/edidHelper.c (99%) rename src/{util => common}/impl/font.c (99%) rename src/{util => common}/impl/format.c (99%) rename src/{util => common}/impl/frequency.c (95%) rename src/{util => common}/impl/init.c (97%) rename src/{util => common}/impl/io_unix.c (99%) rename src/{util => common}/impl/io_windows.c (99%) rename src/{util => common}/impl/jsonconfig.c (98%) rename src/{util => common}/impl/kmod.c (95%) rename src/{util => common}/impl/library.c (98%) rename src/{util => common}/impl/netif.c (96%) rename src/{util => common}/impl/netif_apple.c (98%) rename src/{util => common}/impl/netif_bsd.c (98%) rename src/{util => common}/impl/netif_gnu.c (94%) rename src/{util => common}/impl/netif_haiku.c (97%) rename src/{util => common}/impl/netif_linux.c (99%) rename src/{util => common}/impl/netif_windows.c (98%) rename src/{util => common}/impl/networking_common.c (98%) rename src/{util => common}/impl/networking_linux.c (99%) rename src/{util => common}/impl/networking_windows.c (99%) rename src/{util => common}/impl/option.c (98%) rename src/{util => common}/impl/parsing.c (99%) rename src/{util => common}/impl/path.c (94%) rename src/{util => common}/impl/percent.c (98%) rename src/{util => common}/impl/printing.c (98%) rename src/{util => common}/impl/processing_linux.c (99%) rename src/{util => common}/impl/processing_windows.c (99%) rename src/{util => common}/impl/properties.c (97%) rename src/{util => common}/impl/settings.c (99%) rename src/{util => common}/impl/size.c (98%) rename src/{util => common}/impl/smbiosHelper.c (98%) rename src/{util => common}/impl/sysctl.c (98%) rename src/{util => common}/impl/temps.c (98%) rename src/{util => common}/impl/time.c (98%) rename src/{util => common}/impl/wcwidth.c (100%) rename src/{util => common}/init.h (100%) rename src/{util => common}/io.h (99%) rename src/{util => common}/jsonconfig.h (100%) rename src/{util => common}/kmod.h (100%) rename src/{util => common}/library.h (99%) rename src/{util => common}/mallocHelper.h (100%) rename src/{util => common}/netif.h (100%) rename src/{util => common}/networking.h (94%) rename src/{util => common}/option.h (99%) rename src/{util => common}/parsing.h (95%) rename src/{util => common}/path.h (86%) rename src/{util => common}/percent.h (95%) rename src/{util => common}/printing.h (97%) rename src/{util => common}/processing.h (98%) rename src/{util => common}/properties.h (100%) rename src/{util => common}/settings.h (100%) rename src/{util => common}/size.h (100%) rename src/{util => common}/smbiosHelper.h (99%) rename src/{util => common}/stringUtils.h (100%) rename src/{util => common}/sysctl.h (95%) rename src/{util => common}/temps.h (89%) rename src/{util => common}/textModifier.h (100%) rename src/{util => common}/thread.h (100%) rename src/{util => common}/time.h (98%) rename src/{util => common}/unused.h (100%) rename src/{util => common}/wcwidth.h (100%) rename src/{util => common}/windows/c-logo.sh (100%) rename src/{util => common}/windows/com.cpp (100%) rename src/{util => common}/windows/com.hpp (100%) rename src/{util => common}/windows/getline.c (100%) rename src/{util => common}/windows/getline.h (100%) rename src/{util => common}/windows/logo.ico (100%) rename src/{util => common}/windows/logo.svg (100%) rename src/{util => common}/windows/manifest.xml (100%) rename src/{util => common}/windows/nt.h (100%) rename src/{util => common}/windows/perflib_.h (100%) rename src/{util => common}/windows/registry.c (99%) rename src/{util => common}/windows/registry.h (100%) rename src/{util => common}/windows/unicode.c (100%) rename src/{util => common}/windows/unicode.h (97%) rename src/{util => common}/windows/unicode.hpp (100%) rename src/{util => common}/windows/variant.hpp (100%) rename src/{util => common}/windows/version.c (95%) rename src/{util => common}/windows/version.h (100%) rename src/{util => common}/windows/version.rc (100%) rename src/{util => common}/windows/wmi.cpp (99%) rename src/{util => common}/windows/wmi.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64ee2af83..028eba917 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,7 +342,7 @@ fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE) configure_file(src/fastfetch_config.h.in fastfetch_config.h @ONLY) configure_file(src/fastfetch_datatext.h.in fastfetch_datatext.h @ONLY) if(APPLE) - configure_file(src/util/impl/apple/Info.plist.in Info.plist @ONLY) + configure_file(src/common/impl/apple/Info.plist.in Info.plist @ONLY) endif() #################### @@ -364,6 +364,33 @@ file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}") ####################### set(LIBFASTFETCH_SRC + src/common/impl/commandoption.c + src/common/impl/duration.c + src/common/impl/font.c + src/common/impl/format.c + src/common/impl/frequency.c + src/common/impl/init.c + src/common/impl/jsonconfig.c + src/common/impl/library.c + src/common/impl/netif.c + src/common/impl/networking_common.c + src/common/impl/option.c + src/common/impl/parsing.c + src/common/impl/percent.c + src/common/impl/printing.c + src/common/impl/properties.c + src/common/impl/settings.c + src/common/impl/size.c + src/common/impl/temps.c + src/common/impl/time.c + src/common/impl/edidHelper.c + src/common/impl/base64.c + src/common/impl/FFlist.c + src/common/impl/FFstrbuf.c + src/common/impl/kmod.c + src/common/impl/path.c + src/common/impl/FFPlatform.c + src/common/impl/smbiosHelper.c src/detection/bluetoothradio/bluetoothradio.c src/detection/bootmgr/bootmgr.c src/detection/chassis/chassis.c @@ -473,37 +500,17 @@ set(LIBFASTFETCH_SRC src/options/display.c src/options/logo.c src/options/general.c - src/util/impl/commandoption.c - src/util/impl/duration.c - src/util/impl/font.c - src/util/impl/format.c - src/util/impl/frequency.c - src/util/impl/init.c - src/util/impl/jsonconfig.c - src/util/impl/library.c - src/util/impl/netif.c - src/util/impl/networking_common.c - src/util/impl/option.c - src/util/impl/parsing.c - src/util/impl/percent.c - src/util/impl/printing.c - src/util/impl/properties.c - src/util/impl/settings.c - src/util/impl/size.c - src/util/impl/temps.c - src/util/impl/time.c - src/util/impl/edidHelper.c - src/util/impl/base64.c - src/util/impl/FFlist.c - src/util/impl/FFstrbuf.c - src/util/impl/kmod.c - src/util/impl/path.c - src/util/impl/FFPlatform.c - src/util/impl/smbiosHelper.c ) if(LINUX) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_linux.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c src/detection/battery/battery_linux.c src/detection/bios/bios_linux.c src/detection/board/board_linux.c @@ -578,16 +585,16 @@ if(LINUX) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_linux.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c ) elseif(ANDROID) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_linux.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c src/detection/battery/battery_android.c src/detection/bios/bios_android.c src/detection/bluetooth/bluetooth_nosupport.c @@ -651,16 +658,17 @@ elseif(ANDROID) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_android.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_linux.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c ) elseif(FreeBSD) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_bsd.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/sysctl.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c src/detection/battery/battery_bsd.c src/detection/bios/bios_bsd.c src/detection/bluetoothradio/bluetoothradio_nosupport.c @@ -732,14 +740,6 @@ elseif(FreeBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_bsd.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/sysctl.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c ) if(DragonFly) list(APPEND LIBFASTFETCH_SRC @@ -754,6 +754,14 @@ elseif(FreeBSD) endif() elseif(NetBSD) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_bsd.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/sysctl.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c src/detection/battery/battery_nbsd.c src/detection/bios/bios_nbsd.c src/detection/bluetooth/bluetooth_bsd.c @@ -825,17 +833,18 @@ elseif(NetBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_bsd.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/sysctl.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c ) elseif(OpenBSD) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_bsd.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/sysctl.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c + src/common/impl/smbiosHelper.c src/detection/battery/battery_obsd.c src/detection/bios/bios_windows.c src/detection/bluetooth/bluetooth_nosupport.c @@ -907,18 +916,19 @@ elseif(OpenBSD) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_bsd.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/sysctl.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c - src/util/impl/smbiosHelper.c ) elseif(APPLE) list(APPEND LIBFASTFETCH_SRC + src/common/impl/io_unix.c + src/common/impl/netif_apple.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/sysctl.c + src/common/impl/apple/cf_helpers.c + src/common/impl/apple/osascript.m + src/common/impl/apple/smc_temps.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_apple.c src/detection/battery/battery_apple.c src/detection/bios/bios_apple.c src/detection/bluetooth/bluetooth_apple.m @@ -977,19 +987,22 @@ elseif(APPLE) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_apple.m src/detection/camera/camera_apple.m - src/util/impl/io_unix.c - src/util/impl/netif_apple.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/sysctl.c - src/util/impl/apple/cf_helpers.c - src/util/impl/apple/osascript.m - src/util/impl/apple/smc_temps.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_apple.c ) elseif(WIN32) list(APPEND LIBFASTFETCH_SRC + src/common/impl/io_windows.c + src/common/impl/netif_windows.c + src/common/impl/networking_windows.c + src/common/impl/processing_windows.c + src/common/impl/windows/getline.c + src/common/impl/windows/com.cpp + src/common/impl/windows/registry.c + src/common/impl/windows/unicode.c + src/common/impl/windows/wmi.cpp + src/common/impl/windows/version.c + src/common/impl/FFPlatform_windows.c + src/common/impl/binary_windows.c + src/common/impl/debug_windows.c src/detection/battery/battery_windows.c src/detection/bios/bios_windows.c src/detection/bluetooth/bluetooth_windows.c @@ -1047,22 +1060,16 @@ elseif(WIN32) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_windows.c src/detection/camera/camera_windows.cpp - src/util/impl/io_windows.c - src/util/impl/netif_windows.c - src/util/impl/networking_windows.c - src/util/impl/processing_windows.c - src/util/impl/windows/getline.c - src/util/impl/windows/com.cpp - src/util/impl/windows/registry.c - src/util/impl/windows/unicode.c - src/util/impl/windows/wmi.cpp - src/util/impl/windows/version.c - src/util/impl/FFPlatform_windows.c - src/util/impl/binary_windows.c - src/util/impl/debug_windows.c ) elseif(SunOS) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_apple.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c src/detection/battery/battery_nosupport.c src/detection/bios/bios_windows.c src/detection/board/board_windows.c @@ -1134,16 +1141,17 @@ elseif(SunOS) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_apple.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c ) elseif(Haiku) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_haiku.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c + src/common/impl/haiku/version.cpp src/detection/battery/battery_haiku.c src/detection/bios/bios_windows.c src/detection/board/board_windows.c @@ -1202,17 +1210,16 @@ elseif(Haiku) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_nosupport.c src/detection/camera/camera_nosupport.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_haiku.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c - src/util/impl/haiku/version.cpp ) elseif(GNU) list(APPEND LIBFASTFETCH_SRC + src/common/impl/dbus.c + src/common/impl/io_unix.c + src/common/impl/netif_gnu.c + src/common/impl/networking_linux.c + src/common/impl/processing_linux.c + src/common/impl/FFPlatform_unix.c + src/common/impl/binary_linux.c src/detection/battery/battery_nosupport.c src/detection/bios/bios_nosupport.c src/detection/board/board_nosupport.c @@ -1281,13 +1288,6 @@ elseif(GNU) src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c - src/util/impl/dbus.c - src/util/impl/io_unix.c - src/util/impl/netif_gnu.c - src/util/impl/networking_linux.c - src/util/impl/processing_linux.c - src/util/impl/FFPlatform_unix.c - src/util/impl/binary_linux.c ) endif() @@ -1308,7 +1308,7 @@ endif() include(CheckFunctionExists) check_function_exists(wcwidth HAVE_WCWIDTH) if(NOT HAVE_WCWIDTH) - list(APPEND LIBFASTFETCH_SRC src/util/impl/wcwidth.c) + list(APPEND LIBFASTFETCH_SRC src/common/impl/wcwidth.c) endif() if(NOT WIN32) check_function_exists(pipe2 HAVE_PIPE2) @@ -1881,7 +1881,7 @@ set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C) if(WIN32) target_sources(fastfetch - PRIVATE src/util/impl/windows/version.rc + PRIVATE src/common/impl/windows/version.rc ) elseif(APPLE) target_link_options(fastfetch @@ -1909,7 +1909,7 @@ if (BUILD_FLASHFETCH) if(WIN32) target_sources(flashfetch - PRIVATE src/util/impl/windows/version.rc + PRIVATE src/common/impl/windows/version.rc ) elseif(APPLE) target_link_options(flashfetch diff --git a/src/util/FFPlatform.h b/src/common/FFPlatform.h similarity index 92% rename from src/util/FFPlatform.h rename to src/common/FFPlatform.h index 2afd730f7..bf3af7856 100644 --- a/src/util/FFPlatform.h +++ b/src/common/FFPlatform.h @@ -1,7 +1,7 @@ #pragma once -#include "util/FFstrbuf.h" -#include "util/FFlist.h" +#include "common/FFstrbuf.h" +#include "common/FFlist.h" typedef struct FFPlatformSysinfo { diff --git a/src/util/FFcheckmacros.h b/src/common/FFcheckmacros.h similarity index 100% rename from src/util/FFcheckmacros.h rename to src/common/FFcheckmacros.h diff --git a/src/util/FFlist.h b/src/common/FFlist.h similarity index 100% rename from src/util/FFlist.h rename to src/common/FFlist.h diff --git a/src/util/FFstrbuf.h b/src/common/FFstrbuf.h similarity index 100% rename from src/util/FFstrbuf.h rename to src/common/FFstrbuf.h diff --git a/src/util/apple/Info.plist.in b/src/common/apple/Info.plist.in similarity index 100% rename from src/util/apple/Info.plist.in rename to src/common/apple/Info.plist.in diff --git a/src/util/apple/cf_helpers.c b/src/common/apple/cf_helpers.c similarity index 100% rename from src/util/apple/cf_helpers.c rename to src/common/apple/cf_helpers.c diff --git a/src/util/apple/cf_helpers.h b/src/common/apple/cf_helpers.h similarity index 100% rename from src/util/apple/cf_helpers.h rename to src/common/apple/cf_helpers.h diff --git a/src/util/apple/osascript.h b/src/common/apple/osascript.h similarity index 100% rename from src/util/apple/osascript.h rename to src/common/apple/osascript.h diff --git a/src/util/apple/osascript.m b/src/common/apple/osascript.m similarity index 100% rename from src/util/apple/osascript.m rename to src/common/apple/osascript.m diff --git a/src/util/apple/smc_temps.c b/src/common/apple/smc_temps.c similarity index 99% rename from src/util/apple/smc_temps.c rename to src/common/apple/smc_temps.c index bd89b0138..708ae7437 100644 --- a/src/util/apple/smc_temps.c +++ b/src/common/apple/smc_temps.c @@ -1,6 +1,6 @@ #include "smc_temps.h" -#include "util/apple/cf_helpers.h" -#include "util/stringUtils.h" +#include "common/apple/cf_helpers.h" +#include "common/stringUtils.h" #include #include diff --git a/src/util/apple/smc_temps.h b/src/common/apple/smc_temps.h similarity index 100% rename from src/util/apple/smc_temps.h rename to src/common/apple/smc_temps.h diff --git a/src/util/arrayUtils.h b/src/common/arrayUtils.h similarity index 100% rename from src/util/arrayUtils.h rename to src/common/arrayUtils.h diff --git a/src/util/base64.h b/src/common/base64.h similarity index 100% rename from src/util/base64.h rename to src/common/base64.h diff --git a/src/util/binary.h b/src/common/binary.h similarity index 100% rename from src/util/binary.h rename to src/common/binary.h diff --git a/src/util/color.h b/src/common/color.h similarity index 100% rename from src/util/color.h rename to src/common/color.h diff --git a/src/util/commandoption.h b/src/common/commandoption.h similarity index 100% rename from src/util/commandoption.h rename to src/common/commandoption.h diff --git a/src/util/dbus.h b/src/common/dbus.h similarity index 97% rename from src/util/dbus.h rename to src/common/dbus.h index 50cffdcee..ee5eb432c 100644 --- a/src/util/dbus.h +++ b/src/common/dbus.h @@ -3,8 +3,8 @@ #ifdef FF_HAVE_DBUS #include -#include "util/FFstrbuf.h" -#include "util/library.h" +#include "common/FFstrbuf.h" +#include "common/library.h" typedef struct FFDBusLibrary { diff --git a/src/util/debug.h b/src/common/debug.h similarity index 97% rename from src/util/debug.h rename to src/common/debug.h index 2b0047e5f..770fd7133 100644 --- a/src/util/debug.h +++ b/src/common/debug.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "util/time.h" +#include "common/time.h" static inline const char* ffFindFileName(const char* file) { diff --git a/src/util/duration.h b/src/common/duration.h similarity index 100% rename from src/util/duration.h rename to src/common/duration.h diff --git a/src/util/edidHelper.h b/src/common/edidHelper.h similarity index 95% rename from src/util/edidHelper.h rename to src/common/edidHelper.h index cad9e6ce9..d36793772 100644 --- a/src/util/edidHelper.h +++ b/src/common/edidHelper.h @@ -1,7 +1,7 @@ #pragma once #include -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" void ffEdidGetVendorAndModel(const uint8_t edid[128], FFstrbuf* result); bool ffEdidGetName(const uint8_t edid[128], FFstrbuf* name); diff --git a/src/util/font.h b/src/common/font.h similarity index 92% rename from src/util/font.h rename to src/common/font.h index ac6932c8b..e10817eec 100644 --- a/src/util/font.h +++ b/src/common/font.h @@ -1,7 +1,7 @@ #pragma once -#include "util/FFstrbuf.h" -#include "util/FFlist.h" +#include "common/FFstrbuf.h" +#include "common/FFlist.h" typedef struct FFfont { diff --git a/src/util/format.h b/src/common/format.h similarity index 98% rename from src/util/format.h rename to src/common/format.h index d4ded993b..70fa4a15e 100644 --- a/src/util/format.h +++ b/src/common/format.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" typedef enum __attribute__((__packed__)) FFformatArgType { diff --git a/src/util/frequency.h b/src/common/frequency.h similarity index 100% rename from src/util/frequency.h rename to src/common/frequency.h diff --git a/src/util/haiku/version.cpp b/src/common/haiku/version.cpp similarity index 100% rename from src/util/haiku/version.cpp rename to src/common/haiku/version.cpp diff --git a/src/util/haiku/version.h b/src/common/haiku/version.h similarity index 69% rename from src/util/haiku/version.h rename to src/common/haiku/version.h index 829801a88..4f047a218 100644 --- a/src/util/haiku/version.h +++ b/src/common/haiku/version.h @@ -1,3 +1,3 @@ -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" bool ffGetFileVersion(const char* filePath, FFstrbuf* version); diff --git a/src/util/impl/FFPlatform.c b/src/common/impl/FFPlatform.c similarity index 97% rename from src/util/impl/FFPlatform.c rename to src/common/impl/FFPlatform.c index 37c23cb1f..399559799 100644 --- a/src/util/impl/FFPlatform.c +++ b/src/common/impl/FFPlatform.c @@ -1,6 +1,6 @@ #include "FFPlatform_private.h" -#include "util/stringUtils.h" -#include "util/io.h" +#include "common/stringUtils.h" +#include "common/io.h" #include "detection/version/version.h" void ffPlatformInit(FFPlatform* platform) diff --git a/src/util/impl/FFPlatform_private.h b/src/common/impl/FFPlatform_private.h similarity index 87% rename from src/util/impl/FFPlatform_private.h rename to src/common/impl/FFPlatform_private.h index 8c6842f8b..e9dfd7163 100644 --- a/src/util/impl/FFPlatform_private.h +++ b/src/common/impl/FFPlatform_private.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFPlatform.h" +#include "common/FFPlatform.h" void ffPlatformInitImpl(FFPlatform* platform); diff --git a/src/util/impl/FFPlatform_unix.c b/src/common/impl/FFPlatform_unix.c similarity index 98% rename from src/util/impl/FFPlatform_unix.c rename to src/common/impl/FFPlatform_unix.c index 4827df273..6b25bd537 100644 --- a/src/util/impl/FFPlatform_unix.c +++ b/src/common/impl/FFPlatform_unix.c @@ -1,7 +1,7 @@ #include "FFPlatform_private.h" -#include "util/FFstrbuf.h" -#include "util/stringUtils.h" -#include "util/io.h" +#include "common/FFstrbuf.h" +#include "common/stringUtils.h" +#include "common/io.h" #include "fastfetch_config.h" #include diff --git a/src/util/impl/FFPlatform_windows.c b/src/common/impl/FFPlatform_windows.c similarity index 98% rename from src/util/impl/FFPlatform_windows.c rename to src/common/impl/FFPlatform_windows.c index dc22900b1..d5b7433e6 100644 --- a/src/util/impl/FFPlatform_windows.c +++ b/src/common/impl/FFPlatform_windows.c @@ -1,10 +1,10 @@ #include "FFPlatform_private.h" -#include "util/io.h" -#include "util/library.h" -#include "util/stringUtils.h" -#include "util/windows/unicode.h" -#include "util/windows/registry.h" -#include "util/windows/nt.h" +#include "common/io.h" +#include "common/library.h" +#include "common/stringUtils.h" +#include "common/windows/unicode.h" +#include "common/windows/registry.h" +#include "common/windows/nt.h" #include #include diff --git a/src/util/impl/FFlist.c b/src/common/impl/FFlist.c similarity index 97% rename from src/util/impl/FFlist.c rename to src/common/impl/FFlist.c index b03e3fca5..55dc28671 100644 --- a/src/util/impl/FFlist.c +++ b/src/common/impl/FFlist.c @@ -1,4 +1,4 @@ -#include "util/FFlist.h" +#include "common/FFlist.h" #include #include diff --git a/src/util/impl/FFstrbuf.c b/src/common/impl/FFstrbuf.c similarity index 99% rename from src/util/impl/FFstrbuf.c rename to src/common/impl/FFstrbuf.c index b2941afe9..d65902108 100644 --- a/src/util/impl/FFstrbuf.c +++ b/src/common/impl/FFstrbuf.c @@ -1,5 +1,5 @@ -#include "util/FFstrbuf.h" -#include "util/mallocHelper.h" +#include "common/FFstrbuf.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/base64.c b/src/common/impl/base64.c similarity index 99% rename from src/util/impl/base64.c rename to src/common/impl/base64.c index 7c424684d..0567b75ed 100644 --- a/src/util/impl/base64.c +++ b/src/common/impl/base64.c @@ -1,4 +1,4 @@ -#include "util/base64.h" +#include "common/base64.h" // https://github.com/kostya/benchmarks/blob/master/base64/test-nolib.c#L145 void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output) diff --git a/src/util/impl/binary_apple.c b/src/common/impl/binary_apple.c similarity index 98% rename from src/util/impl/binary_apple.c rename to src/common/impl/binary_apple.c index fdbeb77bd..dee65b6a6 100644 --- a/src/util/impl/binary_apple.c +++ b/src/common/impl/binary_apple.c @@ -1,7 +1,7 @@ -#include "util/binary.h" -#include "util/io.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/binary.h" +#include "common/io.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/binary_linux.c b/src/common/impl/binary_linux.c similarity index 97% rename from src/util/impl/binary_linux.c rename to src/common/impl/binary_linux.c index c418a93d3..d6ecf15b5 100644 --- a/src/util/impl/binary_linux.c +++ b/src/common/impl/binary_linux.c @@ -1,10 +1,10 @@ -#include "util/binary.h" +#include "common/binary.h" #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__) -#include "util/io.h" -#include "util/library.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/library.h" +#include "common/stringUtils.h" #include // #1254 #include diff --git a/src/util/impl/binary_windows.c b/src/common/impl/binary_windows.c similarity index 94% rename from src/util/impl/binary_windows.c rename to src/common/impl/binary_windows.c index feeead17e..b6f0bb1fa 100644 --- a/src/util/impl/binary_windows.c +++ b/src/common/impl/binary_windows.c @@ -1,7 +1,7 @@ -#include "util/binary.h" -#include "util/io.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/binary.h" +#include "common/io.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/commandoption.c b/src/common/impl/commandoption.c similarity index 97% rename from src/util/impl/commandoption.c rename to src/common/impl/commandoption.c index d6c9301b4..e19be4edc 100644 --- a/src/util/impl/commandoption.c +++ b/src/common/impl/commandoption.c @@ -1,9 +1,9 @@ -#include "util/commandoption.h" -#include "util/color.h" -#include "util/printing.h" -#include "util/time.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/commandoption.h" +#include "common/color.h" +#include "common/printing.h" +#include "common/time.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "fastfetch_datatext.h" #include "modules/modules.h" diff --git a/src/util/impl/dbus.c b/src/common/impl/dbus.c similarity index 99% rename from src/util/impl/dbus.c rename to src/common/impl/dbus.c index 1455f3735..87aacdf85 100644 --- a/src/util/impl/dbus.c +++ b/src/common/impl/dbus.c @@ -1,9 +1,9 @@ -#include "util/dbus.h" +#include "common/dbus.h" #ifdef FF_HAVE_DBUS -#include "util/thread.h" -#include "util/stringUtils.h" +#include "common/thread.h" +#include "common/stringUtils.h" static bool loadLibSymbols(FFDBusLibrary* lib) { diff --git a/src/util/impl/debug_windows.c b/src/common/impl/debug_windows.c similarity index 96% rename from src/util/impl/debug_windows.c rename to src/common/impl/debug_windows.c index b1a1fbc40..c1eb2c1b2 100644 --- a/src/util/impl/debug_windows.c +++ b/src/common/impl/debug_windows.c @@ -1,4 +1,4 @@ -#include "util/debug.h" +#include "common/debug.h" #include diff --git a/src/util/impl/duration.c b/src/common/impl/duration.c similarity index 98% rename from src/util/impl/duration.c rename to src/common/impl/duration.c index 1449bf13d..a767ca386 100644 --- a/src/util/impl/duration.c +++ b/src/common/impl/duration.c @@ -1,4 +1,4 @@ -#include "util/duration.h" +#include "common/duration.h" void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result) { diff --git a/src/util/impl/edidHelper.c b/src/common/impl/edidHelper.c similarity index 99% rename from src/util/impl/edidHelper.c rename to src/common/impl/edidHelper.c index 2bb8cad36..240d714e8 100644 --- a/src/util/impl/edidHelper.c +++ b/src/common/impl/edidHelper.c @@ -1,4 +1,4 @@ -#include "util/edidHelper.h" +#include "common/edidHelper.h" void ffEdidGetPhysicalResolution(const uint8_t edid[128], uint32_t* width, uint32_t* height) { diff --git a/src/util/impl/font.c b/src/common/impl/font.c similarity index 99% rename from src/util/impl/font.c rename to src/common/impl/font.c index e506f6376..7548ab2de 100644 --- a/src/util/impl/font.c +++ b/src/common/impl/font.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/FFlist.h" -#include "util/FFstrbuf.h" -#include "util/stringUtils.h" -#include "util/font.h" +#include "common/FFlist.h" +#include "common/FFstrbuf.h" +#include "common/stringUtils.h" +#include "common/font.h" #include #include diff --git a/src/util/impl/format.c b/src/common/impl/format.c similarity index 99% rename from src/util/impl/format.c rename to src/common/impl/format.c index 132ad32d9..469aceed4 100644 --- a/src/util/impl/format.c +++ b/src/common/impl/format.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/format.h" -#include "util/parsing.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" +#include "common/format.h" +#include "common/parsing.h" +#include "common/textModifier.h" +#include "common/stringUtils.h" #include diff --git a/src/util/impl/frequency.c b/src/common/impl/frequency.c similarity index 95% rename from src/util/impl/frequency.c rename to src/common/impl/frequency.c index 41bbf7246..3e5185be4 100644 --- a/src/util/impl/frequency.c +++ b/src/common/impl/frequency.c @@ -1,4 +1,4 @@ -#include "util/frequency.h" +#include "common/frequency.h" bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result) { diff --git a/src/util/impl/init.c b/src/common/impl/init.c similarity index 97% rename from src/util/impl/init.c rename to src/common/impl/init.c index e0f3f80be..0e38be713 100644 --- a/src/util/impl/init.c +++ b/src/common/impl/init.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/init.h" -#include "util/parsing.h" -#include "util/thread.h" -#include "util/textModifier.h" +#include "common/init.h" +#include "common/parsing.h" +#include "common/thread.h" +#include "common/textModifier.h" #include "detection/displayserver/displayserver.h" #include "detection/terminaltheme/terminaltheme.h" #include "logo/logo.h" @@ -12,7 +12,7 @@ #include #ifdef _WIN32 #include - #include "util/windows/unicode.h" + #include "common/windows/unicode.h" #else #include #endif diff --git a/src/util/impl/io_unix.c b/src/common/impl/io_unix.c similarity index 99% rename from src/util/impl/io_unix.c rename to src/common/impl/io_unix.c index 8d59ba698..63fc81e4d 100644 --- a/src/util/impl/io_unix.c +++ b/src/common/impl/io_unix.c @@ -1,7 +1,7 @@ -#include "util/io.h" +#include "common/io.h" #include "fastfetch.h" -#include "util/stringUtils.h" -#include "util/time.h" +#include "common/stringUtils.h" +#include "common/time.h" #include #include diff --git a/src/util/impl/io_windows.c b/src/common/impl/io_windows.c similarity index 99% rename from src/util/impl/io_windows.c rename to src/common/impl/io_windows.c index e894d4808..bdaaea198 100644 --- a/src/util/impl/io_windows.c +++ b/src/common/impl/io_windows.c @@ -1,9 +1,9 @@ -#include "util/io.h" +#include "common/io.h" #include "fastfetch.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include -#include "util/windows/nt.h" +#include "common/windows/nt.h" #include static void createSubfolders(const char* fileName) diff --git a/src/util/impl/jsonconfig.c b/src/common/impl/jsonconfig.c similarity index 98% rename from src/util/impl/jsonconfig.c rename to src/common/impl/jsonconfig.c index 3c9334c5d..f1e270b48 100644 --- a/src/util/impl/jsonconfig.c +++ b/src/common/impl/jsonconfig.c @@ -1,10 +1,10 @@ #include "fastfetch.h" -#include "util/color.h" -#include "util/jsonconfig.h" -#include "util/printing.h" -#include "util/io.h" -#include "util/time.h" -#include "util/stringUtils.h" +#include "common/color.h" +#include "common/jsonconfig.h" +#include "common/printing.h" +#include "common/io.h" +#include "common/time.h" +#include "common/stringUtils.h" #include "detection/version/version.h" #include "modules/modules.h" diff --git a/src/util/impl/kmod.c b/src/common/impl/kmod.c similarity index 95% rename from src/util/impl/kmod.c rename to src/common/impl/kmod.c index 46d0b6353..145c6ab78 100644 --- a/src/util/impl/kmod.c +++ b/src/common/impl/kmod.c @@ -1,7 +1,7 @@ -#include "util/kmod.h" +#include "common/kmod.h" #if __linux__ -#include "util/io.h" +#include "common/io.h" bool ffKmodLoaded(const char* modName) { @@ -32,7 +32,7 @@ bool ffKmodLoaded(const char* modName) return modfind(modName) >= 0; } #elif __NetBSD__ -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include #include @@ -75,7 +75,7 @@ bool ffKmodLoaded(const char* modName) return false; } #elif __APPLE__ -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include #include diff --git a/src/util/impl/library.c b/src/common/impl/library.c similarity index 98% rename from src/util/impl/library.c rename to src/common/impl/library.c index 1ff1c02c2..8a47a1039 100644 --- a/src/util/impl/library.c +++ b/src/common/impl/library.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/library.h" +#include "common/library.h" #ifndef FF_DISABLE_DLOPEN diff --git a/src/util/impl/netif.c b/src/common/impl/netif.c similarity index 96% rename from src/util/impl/netif.c rename to src/common/impl/netif.c index 466e990f9..708399bfa 100644 --- a/src/util/impl/netif.c +++ b/src/common/impl/netif.c @@ -1,4 +1,4 @@ -#include "util/netif.h" +#include "common/netif.h" #ifndef _WIN32 #include diff --git a/src/util/impl/netif_apple.c b/src/common/impl/netif_apple.c similarity index 98% rename from src/util/impl/netif_apple.c rename to src/common/impl/netif_apple.c index 1ce541317..54128ec9c 100644 --- a/src/util/impl/netif_apple.c +++ b/src/common/impl/netif_apple.c @@ -1,6 +1,6 @@ -#include "util/netif.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/netif_bsd.c b/src/common/impl/netif_bsd.c similarity index 98% rename from src/util/impl/netif_bsd.c rename to src/common/impl/netif_bsd.c index bd85c5ea6..a5b240c00 100644 --- a/src/util/impl/netif_bsd.c +++ b/src/common/impl/netif_bsd.c @@ -1,6 +1,6 @@ -#include "util/netif.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/netif_gnu.c b/src/common/impl/netif_gnu.c similarity index 94% rename from src/util/impl/netif_gnu.c rename to src/common/impl/netif_gnu.c index 9cc6acb21..219bbebab 100644 --- a/src/util/impl/netif_gnu.c +++ b/src/common/impl/netif_gnu.c @@ -1,5 +1,5 @@ -#include "util/netif.h" -#include "util/io.h" +#include "common/netif.h" +#include "common/io.h" #include #include diff --git a/src/util/impl/netif_haiku.c b/src/common/impl/netif_haiku.c similarity index 97% rename from src/util/impl/netif_haiku.c rename to src/common/impl/netif_haiku.c index 3e39290e0..faa3ee876 100644 --- a/src/util/impl/netif_haiku.c +++ b/src/common/impl/netif_haiku.c @@ -1,6 +1,6 @@ -#include "util/netif.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/netif_linux.c b/src/common/impl/netif_linux.c similarity index 99% rename from src/util/impl/netif_linux.c rename to src/common/impl/netif_linux.c index 493fd4e11..03ade7d9d 100644 --- a/src/util/impl/netif_linux.c +++ b/src/common/impl/netif_linux.c @@ -1,7 +1,7 @@ -#include "util/netif.h" -#include "util/io.h" -#include "util/mallocHelper.h" -#include "util/debug.h" +#include "common/netif.h" +#include "common/io.h" +#include "common/mallocHelper.h" +#include "common/debug.h" #include #include diff --git a/src/util/impl/netif_windows.c b/src/common/impl/netif_windows.c similarity index 98% rename from src/util/impl/netif_windows.c rename to src/common/impl/netif_windows.c index 0eeba1ce3..a78bbfba0 100644 --- a/src/util/impl/netif_windows.c +++ b/src/common/impl/netif_windows.c @@ -1,5 +1,5 @@ -#include "util/netif.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/mallocHelper.h" #include // AF_INET6, IN6_IS_ADDR_UNSPECIFIED #include diff --git a/src/util/impl/networking_common.c b/src/common/impl/networking_common.c similarity index 98% rename from src/util/impl/networking_common.c rename to src/common/impl/networking_common.c index d799566eb..7cb1bc4ad 100644 --- a/src/util/impl/networking_common.c +++ b/src/common/impl/networking_common.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/library.h" -#include "util/networking.h" -#include "util/stringUtils.h" -#include "util/debug.h" +#include "common/library.h" +#include "common/networking.h" +#include "common/stringUtils.h" +#include "common/debug.h" #ifdef FF_HAVE_ZLIB #include diff --git a/src/util/impl/networking_linux.c b/src/common/impl/networking_linux.c similarity index 99% rename from src/util/impl/networking_linux.c rename to src/common/impl/networking_linux.c index f407d133a..e90e243d4 100644 --- a/src/util/impl/networking_linux.c +++ b/src/common/impl/networking_linux.c @@ -1,10 +1,10 @@ #include "fastfetch.h" -#include "util/networking.h" -#include "util/time.h" -#include "util/library.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" -#include "util/debug.h" +#include "common/networking.h" +#include "common/time.h" +#include "common/library.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" +#include "common/debug.h" #include #include diff --git a/src/util/impl/networking_windows.c b/src/common/impl/networking_windows.c similarity index 99% rename from src/util/impl/networking_windows.c rename to src/common/impl/networking_windows.c index 7f0d70699..3131e770b 100644 --- a/src/util/impl/networking_windows.c +++ b/src/common/impl/networking_windows.c @@ -3,9 +3,9 @@ //Must be included after #include "fastfetch.h" -#include "util/networking.h" -#include "util/stringUtils.h" -#include "util/debug.h" +#include "common/networking.h" +#include "common/stringUtils.h" +#include "common/debug.h" static LPFN_CONNECTEX ConnectEx; diff --git a/src/util/impl/option.c b/src/common/impl/option.c similarity index 98% rename from src/util/impl/option.c rename to src/common/impl/option.c index 3a808986d..d5a5fabaf 100644 --- a/src/util/impl/option.c +++ b/src/common/impl/option.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "util/option.h" -#include "util/color.h" -#include "util/stringUtils.h" +#include "common/option.h" +#include "common/color.h" +#include "common/stringUtils.h" // Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise const char* ffOptionTestPrefix(const char* argumentKey, const char* moduleName) diff --git a/src/util/impl/parsing.c b/src/common/impl/parsing.c similarity index 99% rename from src/util/impl/parsing.c rename to src/common/impl/parsing.c index fbd7f1208..668a28773 100644 --- a/src/util/impl/parsing.c +++ b/src/common/impl/parsing.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/parsing.h" +#include "common/parsing.h" #include diff --git a/src/util/impl/path.c b/src/common/impl/path.c similarity index 94% rename from src/util/impl/path.c rename to src/common/impl/path.c index 7d2aa032c..7a960c1ad 100644 --- a/src/util/impl/path.c +++ b/src/common/impl/path.c @@ -1,6 +1,6 @@ -#include "util/path.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/path.h" +#include "common/io.h" +#include "common/stringUtils.h" #if !_WIN32 const char* ffFindExecutableInPath(const char* name, FFstrbuf* result) diff --git a/src/util/impl/percent.c b/src/common/impl/percent.c similarity index 98% rename from src/util/impl/percent.c rename to src/common/impl/percent.c index 7f7d5e222..1ab0c1e57 100644 --- a/src/util/impl/percent.c +++ b/src/common/impl/percent.c @@ -1,10 +1,10 @@ #include "fastfetch.h" -#include "util/percent.h" -#include "util/color.h" -#include "util/option.h" -#include "util/jsonconfig.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/color.h" +#include "common/option.h" +#include "common/jsonconfig.h" +#include "common/textModifier.h" +#include "common/stringUtils.h" static void appendOutputColor(FFstrbuf* buffer, const FFModuleArgs* module) { diff --git a/src/util/impl/printing.c b/src/common/impl/printing.c similarity index 98% rename from src/util/impl/printing.c rename to src/common/impl/printing.c index a3e0595eb..b851864b5 100644 --- a/src/util/impl/printing.c +++ b/src/common/impl/printing.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "util/printing.h" -#include "util/textModifier.h" +#include "common/printing.h" +#include "common/textModifier.h" #include "logo/logo.h" void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType) diff --git a/src/util/impl/processing_linux.c b/src/common/impl/processing_linux.c similarity index 99% rename from src/util/impl/processing_linux.c rename to src/common/impl/processing_linux.c index 64e549066..c270ab01a 100644 --- a/src/util/impl/processing_linux.c +++ b/src/common/impl/processing_linux.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/processing.h" -#include "util/io.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/processing.h" +#include "common/io.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/util/impl/processing_windows.c b/src/common/impl/processing_windows.c similarity index 99% rename from src/util/impl/processing_windows.c rename to src/common/impl/processing_windows.c index 142005224..4a5ec4373 100644 --- a/src/util/impl/processing_windows.c +++ b/src/common/impl/processing_windows.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "util/processing.h" -#include "util/io.h" +#include "common/processing.h" +#include "common/io.h" #include #include diff --git a/src/util/impl/properties.c b/src/common/impl/properties.c similarity index 97% rename from src/util/impl/properties.c rename to src/common/impl/properties.c index 2b36b3dbe..8b7859bdb 100644 --- a/src/util/impl/properties.c +++ b/src/common/impl/properties.c @@ -1,12 +1,12 @@ #include "fastfetch.h" -#include "util/properties.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/properties.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include #include #ifdef _WIN32 - #include "util/windows/getline.h" + #include "common/windows/getline.h" #endif bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer) diff --git a/src/util/impl/settings.c b/src/common/impl/settings.c similarity index 99% rename from src/util/impl/settings.c rename to src/common/impl/settings.c index b6cf9e398..bb7d820cf 100644 --- a/src/util/impl/settings.c +++ b/src/common/impl/settings.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/settings.h" -#include "util/library.h" -#include "util/thread.h" -#include "util/io.h" +#include "common/settings.h" +#include "common/library.h" +#include "common/thread.h" +#include "common/io.h" #include @@ -197,7 +197,7 @@ FFvariant ffSettingsGetGnome(const char* dconfKey, const char* gsettingsSchemaNa } #ifdef FF_HAVE_DBUS -#include "util/dbus.h" +#include "common/dbus.h" FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type) { diff --git a/src/util/impl/size.c b/src/common/impl/size.c similarity index 98% rename from src/util/impl/size.c rename to src/common/impl/size.c index 6e29ad535..89e7e0551 100644 --- a/src/util/impl/size.c +++ b/src/common/impl/size.c @@ -1,4 +1,4 @@ -#include "util/size.h" +#include "common/size.h" #include diff --git a/src/util/impl/smbiosHelper.c b/src/common/impl/smbiosHelper.c similarity index 98% rename from src/util/impl/smbiosHelper.c rename to src/common/impl/smbiosHelper.c index 19c02e658..ba573b181 100644 --- a/src/util/impl/smbiosHelper.c +++ b/src/common/impl/smbiosHelper.c @@ -1,8 +1,8 @@ -#include "util/smbiosHelper.h" -#include "util/io.h" -#include "util/unused.h" -#include "util/mallocHelper.h" -#include "util/debug.h" +#include "common/smbiosHelper.h" +#include "common/io.h" +#include "common/unused.h" +#include "common/mallocHelper.h" +#include "common/debug.h" bool ffIsSmbiosValueSet(FFstrbuf* value) { @@ -60,14 +60,14 @@ const FFSmbiosHeader* ffSmbiosNextEntry(const FFSmbiosHeader* header) #include #ifdef __linux__ - #include "util/properties.h" + #include "common/properties.h" #elif defined(__FreeBSD__) - #include "util/settings.h" + #include "common/settings.h" #define loff_t off_t // FreeBSD doesn't have loff_t #elif defined(__sun) #define loff_t off_t #elif defined(__NetBSD__) - #include "util/sysctl.h" + #include "common/sysctl.h" #define loff_t off_t #endif diff --git a/src/util/impl/sysctl.c b/src/common/impl/sysctl.c similarity index 98% rename from src/util/impl/sysctl.c rename to src/common/impl/sysctl.c index 6683c5c9a..9b1c52d11 100644 --- a/src/util/impl/sysctl.c +++ b/src/common/impl/sysctl.c @@ -1,4 +1,4 @@ -#include "util/sysctl.h" +#include "common/sysctl.h" #include diff --git a/src/util/impl/temps.c b/src/common/impl/temps.c similarity index 98% rename from src/util/impl/temps.c rename to src/common/impl/temps.c index dd237a649..c3c6f47f3 100644 --- a/src/util/impl/temps.c +++ b/src/common/impl/temps.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "util/temps.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" +#include "common/temps.h" +#include "common/textModifier.h" +#include "common/stringUtils.h" void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module) { diff --git a/src/util/impl/time.c b/src/common/impl/time.c similarity index 98% rename from src/util/impl/time.c rename to src/common/impl/time.c index e596f729f..b49dd0aee 100644 --- a/src/util/impl/time.c +++ b/src/common/impl/time.c @@ -1,4 +1,4 @@ -#include "util/time.h" +#include "common/time.h" #include diff --git a/src/util/impl/wcwidth.c b/src/common/impl/wcwidth.c similarity index 100% rename from src/util/impl/wcwidth.c rename to src/common/impl/wcwidth.c diff --git a/src/util/init.h b/src/common/init.h similarity index 100% rename from src/util/init.h rename to src/common/init.h diff --git a/src/util/io.h b/src/common/io.h similarity index 99% rename from src/util/io.h rename to src/common/io.h index 9e3f44d30..340ccff60 100644 --- a/src/util/io.h +++ b/src/common/io.h @@ -1,7 +1,7 @@ #pragma once -#include "util/FFstrbuf.h" -#include "util/FFlist.h" +#include "common/FFstrbuf.h" +#include "common/FFlist.h" #ifdef _WIN32 #include diff --git a/src/util/jsonconfig.h b/src/common/jsonconfig.h similarity index 100% rename from src/util/jsonconfig.h rename to src/common/jsonconfig.h diff --git a/src/util/kmod.h b/src/common/kmod.h similarity index 100% rename from src/util/kmod.h rename to src/common/kmod.h diff --git a/src/util/library.h b/src/common/library.h similarity index 99% rename from src/util/library.h rename to src/common/library.h index 2a3b30008..a1197c331 100644 --- a/src/util/library.h +++ b/src/common/library.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "util/FFcheckmacros.h" +#include "common/FFcheckmacros.h" #ifndef FF_DISABLE_DLOPEN diff --git a/src/util/mallocHelper.h b/src/common/mallocHelper.h similarity index 100% rename from src/util/mallocHelper.h rename to src/common/mallocHelper.h diff --git a/src/util/netif.h b/src/common/netif.h similarity index 100% rename from src/util/netif.h rename to src/common/netif.h diff --git a/src/util/networking.h b/src/common/networking.h similarity index 94% rename from src/util/networking.h rename to src/common/networking.h index 39cf41762..d3285e2aa 100644 --- a/src/util/networking.h +++ b/src/common/networking.h @@ -1,7 +1,7 @@ #pragma once -#include "util/thread.h" -#include "util/FFstrbuf.h" +#include "common/thread.h" +#include "common/FFstrbuf.h" #ifdef _WIN32 #include diff --git a/src/util/option.h b/src/common/option.h similarity index 99% rename from src/util/option.h rename to src/common/option.h index 713e5ba53..00a082361 100644 --- a/src/util/option.h +++ b/src/common/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" struct yyjson_val; struct yyjson_mut_doc; diff --git a/src/util/parsing.h b/src/common/parsing.h similarity index 95% rename from src/util/parsing.h rename to src/common/parsing.h index f18987906..f870fd185 100644 --- a/src/util/parsing.h +++ b/src/common/parsing.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" #include diff --git a/src/util/path.h b/src/common/path.h similarity index 86% rename from src/util/path.h rename to src/common/path.h index adaad7a36..bec304150 100644 --- a/src/util/path.h +++ b/src/common/path.h @@ -1,7 +1,7 @@ #pragma once -#include "util/FFstrbuf.h" -#include "util/stringUtils.h" +#include "common/FFstrbuf.h" +#include "common/stringUtils.h" const char* ffFindExecutableInPath(const char* name, FFstrbuf* result); static inline bool ffIsAbsolutePath(const char* path) diff --git a/src/util/percent.h b/src/common/percent.h similarity index 95% rename from src/util/percent.h rename to src/common/percent.h index 028d64404..4ce3c2f0b 100644 --- a/src/util/percent.h +++ b/src/common/percent.h @@ -1,8 +1,8 @@ #pragma once -#include "util/FFstrbuf.h" -#include "util/parsing.h" -#include "util/option.h" +#include "common/FFstrbuf.h" +#include "common/parsing.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFPercentageTypeFlags { diff --git a/src/util/printing.h b/src/common/printing.h similarity index 97% rename from src/util/printing.h rename to src/common/printing.h index cd6e4e4ae..1ee79d540 100644 --- a/src/util/printing.h +++ b/src/common/printing.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "util/format.h" +#include "common/format.h" typedef enum __attribute__((__packed__)) FFPrintType { FF_PRINT_TYPE_DEFAULT = 0, diff --git a/src/util/processing.h b/src/common/processing.h similarity index 98% rename from src/util/processing.h rename to src/common/processing.h index 7b9f373fd..c62235ca2 100644 --- a/src/util/processing.h +++ b/src/common/processing.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" #ifndef _WIN32 #include // pid_t diff --git a/src/util/properties.h b/src/common/properties.h similarity index 100% rename from src/util/properties.h rename to src/common/properties.h diff --git a/src/util/settings.h b/src/common/settings.h similarity index 100% rename from src/util/settings.h rename to src/common/settings.h diff --git a/src/util/size.h b/src/common/size.h similarity index 100% rename from src/util/size.h rename to src/common/size.h diff --git a/src/util/smbiosHelper.h b/src/common/smbiosHelper.h similarity index 99% rename from src/util/smbiosHelper.h rename to src/common/smbiosHelper.h index 1bce70b48..9518e47cd 100644 --- a/src/util/smbiosHelper.h +++ b/src/common/smbiosHelper.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" bool ffIsSmbiosValueSet(FFstrbuf* value); static inline void ffCleanUpSmbiosValue(FFstrbuf* value) diff --git a/src/util/stringUtils.h b/src/common/stringUtils.h similarity index 100% rename from src/util/stringUtils.h rename to src/common/stringUtils.h diff --git a/src/util/sysctl.h b/src/common/sysctl.h similarity index 95% rename from src/util/sysctl.h rename to src/common/sysctl.h index 1d5cc503a..3442c4e91 100644 --- a/src/util/sysctl.h +++ b/src/common/sysctl.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "util/FFcheckmacros.h" +#include "common/FFcheckmacros.h" #include #include diff --git a/src/util/temps.h b/src/common/temps.h similarity index 89% rename from src/util/temps.h rename to src/common/temps.h index 1a4cecc7d..f2f8eda89 100644 --- a/src/util/temps.h +++ b/src/common/temps.h @@ -1,7 +1,7 @@ #pragma once -#include "util/parsing.h" -#include "util/option.h" +#include "common/parsing.h" +#include "common/option.h" void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module); bool ffTempsParseCommandOptions(const char* key, const char* subkey, const char* value, bool* useTemp, FFColorRangeConfig* config); diff --git a/src/util/textModifier.h b/src/common/textModifier.h similarity index 100% rename from src/util/textModifier.h rename to src/common/textModifier.h diff --git a/src/util/thread.h b/src/common/thread.h similarity index 100% rename from src/util/thread.h rename to src/common/thread.h diff --git a/src/util/time.h b/src/common/time.h similarity index 98% rename from src/util/time.h rename to src/common/time.h index adc3e5f92..cdb345d3c 100644 --- a/src/util/time.h +++ b/src/common/time.h @@ -10,7 +10,7 @@ #include #endif -#include "util/arrayUtils.h" +#include "common/arrayUtils.h" static inline double ffTimeGetTick(void) //In msec { diff --git a/src/util/unused.h b/src/common/unused.h similarity index 100% rename from src/util/unused.h rename to src/common/unused.h diff --git a/src/util/wcwidth.h b/src/common/wcwidth.h similarity index 100% rename from src/util/wcwidth.h rename to src/common/wcwidth.h diff --git a/src/util/windows/c-logo.sh b/src/common/windows/c-logo.sh similarity index 100% rename from src/util/windows/c-logo.sh rename to src/common/windows/c-logo.sh diff --git a/src/util/windows/com.cpp b/src/common/windows/com.cpp similarity index 100% rename from src/util/windows/com.cpp rename to src/common/windows/com.cpp diff --git a/src/util/windows/com.hpp b/src/common/windows/com.hpp similarity index 100% rename from src/util/windows/com.hpp rename to src/common/windows/com.hpp diff --git a/src/util/windows/getline.c b/src/common/windows/getline.c similarity index 100% rename from src/util/windows/getline.c rename to src/common/windows/getline.c diff --git a/src/util/windows/getline.h b/src/common/windows/getline.h similarity index 100% rename from src/util/windows/getline.h rename to src/common/windows/getline.h diff --git a/src/util/windows/logo.ico b/src/common/windows/logo.ico similarity index 100% rename from src/util/windows/logo.ico rename to src/common/windows/logo.ico diff --git a/src/util/windows/logo.svg b/src/common/windows/logo.svg similarity index 100% rename from src/util/windows/logo.svg rename to src/common/windows/logo.svg diff --git a/src/util/windows/manifest.xml b/src/common/windows/manifest.xml similarity index 100% rename from src/util/windows/manifest.xml rename to src/common/windows/manifest.xml diff --git a/src/util/windows/nt.h b/src/common/windows/nt.h similarity index 100% rename from src/util/windows/nt.h rename to src/common/windows/nt.h diff --git a/src/util/windows/perflib_.h b/src/common/windows/perflib_.h similarity index 100% rename from src/util/windows/perflib_.h rename to src/common/windows/perflib_.h diff --git a/src/util/windows/registry.c b/src/common/windows/registry.c similarity index 99% rename from src/util/windows/registry.c rename to src/common/windows/registry.c index a324527cd..02aeffb06 100644 --- a/src/util/windows/registry.c +++ b/src/common/windows/registry.c @@ -1,6 +1,6 @@ #include "registry.h" #include "unicode.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" static const char* hKey2Str(HKEY hKey) { diff --git a/src/util/windows/registry.h b/src/common/windows/registry.h similarity index 100% rename from src/util/windows/registry.h rename to src/common/windows/registry.h diff --git a/src/util/windows/unicode.c b/src/common/windows/unicode.c similarity index 100% rename from src/util/windows/unicode.c rename to src/common/windows/unicode.c diff --git a/src/util/windows/unicode.h b/src/common/windows/unicode.h similarity index 97% rename from src/util/windows/unicode.h rename to src/common/windows/unicode.h index 9c7cfc01d..8a3162432 100644 --- a/src/util/windows/unicode.h +++ b/src/common/windows/unicode.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" #include void ffStrbufSetNWS(FFstrbuf* result, uint32_t length, const wchar_t* source); diff --git a/src/util/windows/unicode.hpp b/src/common/windows/unicode.hpp similarity index 100% rename from src/util/windows/unicode.hpp rename to src/common/windows/unicode.hpp diff --git a/src/util/windows/variant.hpp b/src/common/windows/variant.hpp similarity index 100% rename from src/util/windows/variant.hpp rename to src/common/windows/variant.hpp diff --git a/src/util/windows/version.c b/src/common/windows/version.c similarity index 95% rename from src/util/windows/version.c rename to src/common/windows/version.c index 684a4fcce..4019edb84 100644 --- a/src/util/windows/version.c +++ b/src/common/windows/version.c @@ -1,6 +1,6 @@ -#include "util/windows/version.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" +#include "common/windows/version.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" #include diff --git a/src/util/windows/version.h b/src/common/windows/version.h similarity index 100% rename from src/util/windows/version.h rename to src/common/windows/version.h diff --git a/src/util/windows/version.rc b/src/common/windows/version.rc similarity index 100% rename from src/util/windows/version.rc rename to src/common/windows/version.rc diff --git a/src/util/windows/wmi.cpp b/src/common/windows/wmi.cpp similarity index 99% rename from src/util/windows/wmi.cpp rename to src/common/windows/wmi.cpp index 68d560013..74dbb3f19 100644 --- a/src/util/windows/wmi.cpp +++ b/src/common/windows/wmi.cpp @@ -1,6 +1,6 @@ #include "wmi.hpp" -#include "util/windows/com.hpp" -#include "util/windows/unicode.hpp" +#include "common/windows/com.hpp" +#include "common/windows/unicode.hpp" #include #include diff --git a/src/util/windows/wmi.hpp b/src/common/windows/wmi.hpp similarity index 100% rename from src/util/windows/wmi.hpp rename to src/common/windows/wmi.hpp diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index fc7f3fcdb..9425dbd19 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -1,8 +1,8 @@ #include "fastfetch.h" #include "battery.h" -#include "util/stringUtils.h" -#include "util/processing.h" -#include "util/properties.h" +#include "common/stringUtils.h" +#include "common/processing.h" +#include "common/properties.h" #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" #define FF_TERMUX_API_PARAM "BatteryStatus" diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c index 3d7ac45c8..d4935de2f 100644 --- a/src/detection/battery/battery_apple.c +++ b/src/detection/battery/battery_apple.c @@ -1,7 +1,7 @@ #include "fastfetch.h" #include "battery.h" -#include "util/apple/cf_helpers.h" -#include "util/apple/smc_temps.h" +#include "common/apple/cf_helpers.h" +#include "common/apple/smc_temps.h" #include #include diff --git a/src/detection/battery/battery_bsd.c b/src/detection/battery/battery_bsd.c index 2ce220780..d8ccd97f6 100644 --- a/src/detection/battery/battery_bsd.c +++ b/src/detection/battery/battery_bsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "util/sysctl.h" -#include "util/io.h" +#include "common/sysctl.h" +#include "common/io.h" #include "battery.h" #include diff --git a/src/detection/battery/battery_haiku.c b/src/detection/battery/battery_haiku.c index ea3a4515b..54d5978ee 100644 --- a/src/detection/battery/battery_haiku.c +++ b/src/detection/battery/battery_haiku.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "battery.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index 9dc5aa138..d750dc61e 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -1,6 +1,6 @@ #include "battery.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c index e142050be..37ef64966 100644 --- a/src/detection/battery/battery_nbsd.c +++ b/src/detection/battery/battery_nbsd.c @@ -1,7 +1,7 @@ #include "battery.h" -#include "util/io.h" -#include "util/FFstrbuf.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/FFstrbuf.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c index ea40c6f2a..2cd5c9e4a 100644 --- a/src/detection/battery/battery_obsd.c +++ b/src/detection/battery/battery_obsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c index bc9b2c227..ba0111d3a 100644 --- a/src/detection/battery/battery_windows.c +++ b/src/detection/battery/battery_windows.c @@ -1,10 +1,10 @@ #include "battery.h" -#include "util/io.h" -#include "util/windows/nt.h" -#include "util/windows/unicode.h" -#include "util/mallocHelper.h" -#include "util/smbiosHelper.h" +#include "common/io.h" +#include "common/windows/nt.h" +#include "common/windows/unicode.h" +#include "common/mallocHelper.h" +#include "common/smbiosHelper.h" #undef WIN32_LEAN_AND_MEAN #include diff --git a/src/detection/bios/bios_android.c b/src/detection/bios/bios_android.c index 256d6d830..b2b20aaf9 100644 --- a/src/detection/bios/bios_android.c +++ b/src/detection/bios/bios_android.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "util/settings.h" +#include "common/settings.h" const char* ffDetectBios(FFBiosResult* bios) { diff --git a/src/detection/bios/bios_apple.c b/src/detection/bios/bios_apple.c index 66815464e..16ef31843 100644 --- a/src/detection/bios/bios_apple.c +++ b/src/detection/bios/bios_apple.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c index 6ea271cb7..35f371ab7 100644 --- a/src/detection/bios/bios_bsd.c +++ b/src/detection/bios/bios_bsd.c @@ -1,9 +1,9 @@ #include "bios.h" -#include "util/settings.h" -#include "util/sysctl.h" -#include "util/io.h" -#include "util/smbiosHelper.h" +#include "common/settings.h" +#include "common/sysctl.h" +#include "common/io.h" +#include "common/smbiosHelper.h" const char* ffDetectBios(FFBiosResult* result) { diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c index f7fd2ddc3..91267a210 100644 --- a/src/detection/bios/bios_linux.c +++ b/src/detection/bios/bios_linux.c @@ -1,6 +1,6 @@ #include "bios.h" -#include "util/io.h" -#include "util/smbiosHelper.h" +#include "common/io.h" +#include "common/smbiosHelper.h" #include diff --git a/src/detection/bios/bios_nbsd.c b/src/detection/bios/bios_nbsd.c index a1e920b77..10b326dd1 100644 --- a/src/detection/bios/bios_nbsd.c +++ b/src/detection/bios/bios_nbsd.c @@ -1,6 +1,6 @@ #include "bios.h" -#include "util/sysctl.h" -#include "util/smbiosHelper.h" +#include "common/sysctl.h" +#include "common/smbiosHelper.h" const char* ffDetectBios(FFBiosResult* bios) { diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c index 31dd51e39..059ebce46 100644 --- a/src/detection/bios/bios_windows.c +++ b/src/detection/bios/bios_windows.c @@ -1,8 +1,8 @@ #include "bios.h" -#include "util/smbiosHelper.h" +#include "common/smbiosHelper.h" #ifdef _WIN32 -#include "util/windows/registry.h" +#include "common/windows/registry.h" #include #include @@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION }; } SYSTEM_BOOT_ENVIRONMENT_INFORMATION; #elif __OpenBSD__ -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/bluetooth/bluetooth_haiku.cpp b/src/detection/bluetooth/bluetooth_haiku.cpp index 6c7280840..188d2a845 100644 --- a/src/detection/bluetooth/bluetooth_haiku.cpp +++ b/src/detection/bluetooth/bluetooth_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "bluetooth.h" -#include "util/io.h" +#include "common/io.h" } #include diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c index 42fed40cf..162e60a51 100644 --- a/src/detection/bluetooth/bluetooth_linux.c +++ b/src/detection/bluetooth/bluetooth_linux.c @@ -1,9 +1,9 @@ #include "bluetooth.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #ifdef FF_HAVE_DBUS -#include "util/dbus.h" -#include "util/io.h" +#include "common/dbus.h" +#include "common/io.h" /* Example dbus reply, striped to only the relevant parts: array [ //root diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c index 841695668..050929fee 100644 --- a/src/detection/bluetooth/bluetooth_windows.c +++ b/src/detection/bluetooth/bluetooth_windows.c @@ -1,6 +1,6 @@ #include "bluetooth.h" -#include "util/library.h" -#include "util/windows/unicode.h" +#include "common/library.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/bluetooth/bluetooth_windows.cpp b/src/detection/bluetooth/bluetooth_windows.cpp index e995d2376..069084b24 100644 --- a/src/detection/bluetooth/bluetooth_windows.cpp +++ b/src/detection/bluetooth/bluetooth_windows.cpp @@ -2,8 +2,8 @@ extern "C" { #include "bluetooth.h" } -#include "util/windows/wmi.hpp" -#include "util/windows/unicode.hpp" +#include "common/windows/wmi.hpp" +#include "common/windows/unicode.hpp" STDAPI InitVariantFromStringArray(_In_reads_(cElems) PCWSTR *prgsz, _In_ ULONG cElems, _Out_ VARIANT *pvar); diff --git a/src/detection/bluetoothradio/bluetoothradio_apple.m b/src/detection/bluetoothradio/bluetoothradio_apple.m index 0e9ceb0e9..63af39d9c 100644 --- a/src/detection/bluetoothradio/bluetoothradio_apple.m +++ b/src/detection/bluetoothradio/bluetoothradio_apple.m @@ -1,5 +1,5 @@ #include "bluetoothradio.h" -#include "util/processing.h" +#include "common/processing.h" #import diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c index 1b3ec4ed5..f7f3971ba 100644 --- a/src/detection/bluetoothradio/bluetoothradio_linux.c +++ b/src/detection/bluetoothradio/bluetoothradio_linux.c @@ -1,9 +1,9 @@ #include "bluetoothradio.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #ifdef FF_HAVE_DBUS -#include "util/dbus.h" -#include "util/io.h" +#include "common/dbus.h" +#include "common/io.h" /* Example dbus reply: array [ diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c index 610602444..057bf2933 100644 --- a/src/detection/bluetoothradio/bluetoothradio_windows.c +++ b/src/detection/bluetoothradio/bluetoothradio_windows.c @@ -1,7 +1,7 @@ #include "bluetoothradio.h" -#include "util/library.h" -#include "util/io.h" -#include "util/windows/unicode.h" +#include "common/library.h" +#include "common/io.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/board/board_android.c b/src/detection/board/board_android.c index c1d504062..64e917e6a 100644 --- a/src/detection/board/board_android.c +++ b/src/detection/board/board_android.c @@ -1,5 +1,5 @@ #include "board.h" -#include "util/settings.h" +#include "common/settings.h" const char* ffDetectBoard(FFBoardResult* board) { diff --git a/src/detection/board/board_apple.c b/src/detection/board/board_apple.c index 1a760fd8b..6e93165b1 100644 --- a/src/detection/board/board_apple.c +++ b/src/detection/board/board_apple.c @@ -1,6 +1,6 @@ #include "board.h" -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" const char* ffDetectBoard(FFBoardResult* result) { diff --git a/src/detection/board/board_bsd.c b/src/detection/board/board_bsd.c index 4f138286e..537ca35ad 100644 --- a/src/detection/board/board_bsd.c +++ b/src/detection/board/board_bsd.c @@ -1,6 +1,6 @@ #include "board.h" -#include "util/settings.h" -#include "util/smbiosHelper.h" +#include "common/settings.h" +#include "common/smbiosHelper.h" const char* ffDetectBoard(FFBoardResult* result) { diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c index 1afeeef21..1a10ea3eb 100644 --- a/src/detection/board/board_linux.c +++ b/src/detection/board/board_linux.c @@ -1,6 +1,6 @@ #include "board.h" -#include "util/io.h" -#include "util/smbiosHelper.h" +#include "common/io.h" +#include "common/smbiosHelper.h" #include diff --git a/src/detection/board/board_nbsd.c b/src/detection/board/board_nbsd.c index bcb713f5d..bfe419020 100644 --- a/src/detection/board/board_nbsd.c +++ b/src/detection/board/board_nbsd.c @@ -1,6 +1,6 @@ #include "board.h" -#include "util/sysctl.h" -#include "util/smbiosHelper.h" +#include "common/sysctl.h" +#include "common/smbiosHelper.h" const char* ffDetectBoard(FFBoardResult* board) { diff --git a/src/detection/board/board_windows.c b/src/detection/board/board_windows.c index bec6192e7..aeb7176c6 100644 --- a/src/detection/board/board_windows.c +++ b/src/detection/board/board_windows.c @@ -1,5 +1,5 @@ #include "board.h" -#include "util/smbiosHelper.h" +#include "common/smbiosHelper.h" typedef struct FFSmbiosBaseboard { diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c index 3bedb95cc..c7e1bde73 100644 --- a/src/detection/bootmgr/bootmgr_apple.c +++ b/src/detection/bootmgr/bootmgr_apple.c @@ -1,6 +1,6 @@ #include "bootmgr.h" -#include "util/io.h" -#include "util/apple/cf_helpers.h" +#include "common/io.h" +#include "common/apple/cf_helpers.h" #include diff --git a/src/detection/bootmgr/bootmgr_bsd.c b/src/detection/bootmgr/bootmgr_bsd.c index c16773a73..ce9663b61 100644 --- a/src/detection/bootmgr/bootmgr_bsd.c +++ b/src/detection/bootmgr/bootmgr_bsd.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "util/io.h" +#include "common/io.h" #ifdef __OpenBSD__ #include diff --git a/src/detection/bootmgr/bootmgr_linux.c b/src/detection/bootmgr/bootmgr_linux.c index e29fc0794..aef323ad6 100644 --- a/src/detection/bootmgr/bootmgr_linux.c +++ b/src/detection/bootmgr/bootmgr_linux.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "util/io.h" +#include "common/io.h" #include "efi_helper.h" #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/" diff --git a/src/detection/bootmgr/bootmgr_windows.c b/src/detection/bootmgr/bootmgr_windows.c index 21d527cc8..cb6a974b3 100644 --- a/src/detection/bootmgr/bootmgr_windows.c +++ b/src/detection/bootmgr/bootmgr_windows.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "util/io.h" +#include "common/io.h" #include diff --git a/src/detection/brightness/brightness_apple.c b/src/detection/brightness/brightness_apple.c index a6a77b2af..2ea39afd0 100644 --- a/src/detection/brightness/brightness_apple.c +++ b/src/detection/brightness/brightness_apple.c @@ -1,7 +1,7 @@ #include "brightness.h" #include "detection/displayserver/displayserver.h" -#include "util/apple/cf_helpers.h" -#include "util/edidHelper.h" +#include "common/apple/cf_helpers.h" +#include "common/edidHelper.h" #include diff --git a/src/detection/brightness/brightness_bsd.c b/src/detection/brightness/brightness_bsd.c index de5d585a7..fb574e46e 100644 --- a/src/detection/brightness/brightness_bsd.c +++ b/src/detection/brightness/brightness_bsd.c @@ -2,7 +2,7 @@ #if __has_include() -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c index c52e36ff6..2afbec184 100644 --- a/src/detection/brightness/brightness_linux.c +++ b/src/detection/brightness/brightness_linux.c @@ -1,7 +1,7 @@ #include "brightness.h" -#include "util/io.h" -#include "util/edidHelper.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/edidHelper.h" +#include "common/stringUtils.h" #include #include @@ -87,8 +87,8 @@ static const char* detectWithBacklight(FFlist* result) #ifdef FF_HAVE_DDCUTIL #include "detection/displayserver/displayserver.h" -#include "util/library.h" -#include "util/mallocHelper.h" +#include "common/library.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/brightness/brightness_nbsd.c b/src/detection/brightness/brightness_nbsd.c index 3e5b629b2..67464772e 100644 --- a/src/detection/brightness/brightness_nbsd.c +++ b/src/detection/brightness/brightness_nbsd.c @@ -1,6 +1,6 @@ #include "brightness.h" -#include "util/sysctl.h" +#include "common/sysctl.h" const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result) { diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c index 95a3ac83d..9dbb65afc 100644 --- a/src/detection/brightness/brightness_obsd.c +++ b/src/detection/brightness/brightness_obsd.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/brightness/brightness_windows.cpp b/src/detection/brightness/brightness_windows.cpp index 8cddd3b76..a7b4332a2 100644 --- a/src/detection/brightness/brightness_windows.cpp +++ b/src/detection/brightness/brightness_windows.cpp @@ -2,10 +2,10 @@ extern "C" { #include "brightness.h" #include "detection/displayserver/displayserver.h" -#include "util/library.h" +#include "common/library.h" } -#include "util/windows/wmi.hpp" -#include "util/windows/unicode.hpp" +#include "common/windows/wmi.hpp" +#include "common/windows/unicode.hpp" #include #include diff --git a/src/detection/btrfs/btrfs_linux.c b/src/detection/btrfs/btrfs_linux.c index 41dc90e0c..369e38371 100644 --- a/src/detection/btrfs/btrfs_linux.c +++ b/src/detection/btrfs/btrfs_linux.c @@ -1,6 +1,6 @@ #include "btrfs.h" -#include "util/io.h" +#include "common/io.h" #include enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") }; diff --git a/src/detection/camera/camera_android.c b/src/detection/camera/camera_android.c index 804e2ead8..7f5f24447 100644 --- a/src/detection/camera/camera_android.c +++ b/src/detection/camera/camera_android.c @@ -1,7 +1,7 @@ #include "camera.h" -#include "util/processing.h" -#include "util/properties.h" +#include "common/processing.h" +#include "common/properties.h" #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" #define FF_TERMUX_API_PARAM "CameraInfo" diff --git a/src/detection/camera/camera_apple.m b/src/detection/camera/camera_apple.m index 64d714d16..4e3e60070 100644 --- a/src/detection/camera/camera_apple.m +++ b/src/detection/camera/camera_apple.m @@ -1,5 +1,5 @@ #include "camera.h" -#include "util/io.h" +#include "common/io.h" #import diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c index fe93414a6..52e1ea136 100644 --- a/src/detection/camera/camera_linux.c +++ b/src/detection/camera/camera_linux.c @@ -1,5 +1,5 @@ #include "camera.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/camera/camera_windows.cpp b/src/detection/camera/camera_windows.cpp index f185cc131..a1b9f9763 100644 --- a/src/detection/camera/camera_windows.cpp +++ b/src/detection/camera/camera_windows.cpp @@ -1,9 +1,9 @@ extern "C" { #include "camera.h" -#include "util/library.h" +#include "common/library.h" } -#include "util/windows/com.hpp" -#include "util/windows/unicode.hpp" +#include "common/windows/com.hpp" +#include "common/windows/unicode.hpp" #include #include diff --git a/src/detection/chassis/chassis_bsd.c b/src/detection/chassis/chassis_bsd.c index d660d668e..dd050f3c5 100644 --- a/src/detection/chassis/chassis_bsd.c +++ b/src/detection/chassis/chassis_bsd.c @@ -1,6 +1,6 @@ #include "chassis.h" -#include "util/settings.h" -#include "util/smbiosHelper.h" +#include "common/settings.h" +#include "common/smbiosHelper.h" const char* ffDetectChassis(FFChassisResult* result) { diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c index 013fbca96..d44d9bddf 100644 --- a/src/detection/chassis/chassis_linux.c +++ b/src/detection/chassis/chassis_linux.c @@ -1,6 +1,6 @@ #include "chassis.h" -#include "util/io.h" -#include "util/smbiosHelper.h" +#include "common/io.h" +#include "common/smbiosHelper.h" #include diff --git a/src/detection/chassis/chassis_nbsd.c b/src/detection/chassis/chassis_nbsd.c index b9786cee4..5b9bb23fa 100644 --- a/src/detection/chassis/chassis_nbsd.c +++ b/src/detection/chassis/chassis_nbsd.c @@ -1,6 +1,6 @@ #include "chassis.h" -#include "util/sysctl.h" -#include "util/smbiosHelper.h" +#include "common/sysctl.h" +#include "common/smbiosHelper.h" const char* ffDetectChassis(FFChassisResult* chassis) { diff --git a/src/detection/chassis/chassis_windows.c b/src/detection/chassis/chassis_windows.c index a9f4aeedb..f50eaf9e0 100644 --- a/src/detection/chassis/chassis_windows.c +++ b/src/detection/chassis/chassis_windows.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "util/smbiosHelper.h" +#include "common/smbiosHelper.h" // 7.4 typedef struct FFSmbiosSystemEnclosure diff --git a/src/detection/command/command.c b/src/detection/command/command.c index d6263eed7..982b66fa4 100644 --- a/src/detection/command/command.c +++ b/src/detection/command/command.c @@ -1,6 +1,6 @@ #include "detection/command/command.h" -#include "util/processing.h" -#include "util/FFstrbuf.h" +#include "common/processing.h" +#include "common/FFstrbuf.h" typedef struct FFCommandResultBundle { diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c index ee4ce360e..9bfa7e7fd 100644 --- a/src/detection/cpu/cpu.c +++ b/src/detection/cpu/cpu.c @@ -130,7 +130,7 @@ void ffCPUDetectByCpuid(FFCPUResult* cpu) // Worth noting: Apple M1 is marked as ARMv8.5-A on Wikipedia, but it lacks BTI (mandatory in v8.5) #ifdef __linux__ -#include "util/io.h" +#include "common/io.h" #include // #include diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c index f046a2e45..c141a7284 100644 --- a/src/detection/cpu/cpu_apple.c +++ b/src/detection/cpu/cpu_apple.c @@ -1,7 +1,7 @@ #include "cpu.h" -#include "util/sysctl.h" -#include "util/apple/smc_temps.h" -#include "util/stringUtils.h" +#include "common/sysctl.h" +#include "common/apple/smc_temps.h" +#include "common/stringUtils.h" static double detectCpuTemp(const FFCPUOptions* options, const FFstrbuf* cpuName) { @@ -37,7 +37,7 @@ static double detectCpuTemp(const FFCPUOptions* options, const FFstrbuf* cpuName } #ifdef __aarch64__ -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include diff --git a/src/detection/cpu/cpu_bsd.c b/src/detection/cpu/cpu_bsd.c index 9bc0605a1..c8401dde1 100644 --- a/src/detection/cpu/cpu_bsd.c +++ b/src/detection/cpu/cpu_bsd.c @@ -1,6 +1,6 @@ #include "cpu.h" -#include "util/sysctl.h" -#include "util/stringUtils.h" +#include "common/sysctl.h" +#include "common/stringUtils.h" #include #if __has_include() diff --git a/src/detection/cpu/cpu_haiku.c b/src/detection/cpu/cpu_haiku.c index 2c604d4be..7e38f31f6 100644 --- a/src/detection/cpu/cpu_haiku.c +++ b/src/detection/cpu/cpu_haiku.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index 4b3847244..b6cb7b054 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -1,10 +1,10 @@ #include "cpu.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/properties.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" -#include "util/path.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/properties.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" +#include "common/path.h" #include #include @@ -200,7 +200,7 @@ static void detectNumaNodes(FFCPUResult* cpu) } #ifdef __ANDROID__ -#include "util/settings.h" +#include "common/settings.h" static void detectQualcomm(FFCPUResult* cpu) { diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c index 8a773f849..104b02e4d 100644 --- a/src/detection/cpu/cpu_nbsd.c +++ b/src/detection/cpu/cpu_nbsd.c @@ -1,6 +1,6 @@ #include "cpu.h" -#include "util/sysctl.h" -#include "util/io.h" +#include "common/sysctl.h" +#include "common/io.h" #include #include diff --git a/src/detection/cpu/cpu_obsd.c b/src/detection/cpu/cpu_obsd.c index cc1638002..16ffd5cc0 100644 --- a/src/detection/cpu/cpu_obsd.c +++ b/src/detection/cpu/cpu_obsd.c @@ -1,6 +1,6 @@ #include "cpu.h" -#include "util/sysctl.h" -#include "util/stringUtils.h" +#include "common/sysctl.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/cpu/cpu_sunos.c b/src/detection/cpu/cpu_sunos.c index 0f9bb994f..fec93a486 100644 --- a/src/detection/cpu/cpu_sunos.c +++ b/src/detection/cpu/cpu_sunos.c @@ -1,6 +1,6 @@ #include "cpu.h" -#include "util/processing.h" -#include "util/stringUtils.h" +#include "common/processing.h" +#include "common/stringUtils.h" #include static const char* detectCPUTempByKstat(const FFCPUOptions* options, kstat_ctl_t* kc, FFCPUResult* cpu) diff --git a/src/detection/cpu/cpu_windows.c b/src/detection/cpu/cpu_windows.c index c83687769..1e1333d9c 100644 --- a/src/detection/cpu/cpu_windows.c +++ b/src/detection/cpu/cpu_windows.c @@ -1,11 +1,11 @@ #include "cpu.h" -#include "util/windows/registry.h" -#include "util/windows/nt.h" -#include "util/mallocHelper.h" -#include "util/smbiosHelper.h" +#include "common/windows/registry.h" +#include "common/windows/nt.h" +#include "common/mallocHelper.h" +#include "common/smbiosHelper.h" #include -#include "util/windows/perflib_.h" +#include "common/windows/perflib_.h" #include static inline void ffPerfCloseQueryHandle(HANDLE* phQuery) diff --git a/src/detection/cpucache/cpucache_apple.c b/src/detection/cpucache/cpucache_apple.c index 9496d4261..09e890c28 100644 --- a/src/detection/cpucache/cpucache_apple.c +++ b/src/detection/cpucache/cpucache_apple.c @@ -1,6 +1,6 @@ #include "cpucache.h" -#include "util/sysctl.h" -#include "util/stringUtils.h" +#include "common/sysctl.h" +#include "common/stringUtils.h" const char* ffDetectCPUCache(FFCPUCacheResult* result) { diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c index 844c6fd1e..bf15b1586 100644 --- a/src/detection/cpucache/cpucache_linux.c +++ b/src/detection/cpucache/cpucache_linux.c @@ -1,6 +1,6 @@ #include "cpucache.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added) { diff --git a/src/detection/cpucache/cpucache_shared.c b/src/detection/cpucache/cpucache_shared.c index abf0e9474..c1379eedc 100644 --- a/src/detection/cpucache/cpucache_shared.c +++ b/src/detection/cpucache/cpucache_shared.c @@ -1,6 +1,6 @@ #include "cpucache.h" -#include "util/smbiosHelper.h" -#include "util/stringUtils.h" +#include "common/smbiosHelper.h" +#include "common/stringUtils.h" typedef struct FFSmbiosCacheInfo { diff --git a/src/detection/cpucache/cpucache_windows.c b/src/detection/cpucache/cpucache_windows.c index f68c902d2..e04f276e0 100644 --- a/src/detection/cpucache/cpucache_windows.c +++ b/src/detection/cpucache/cpucache_windows.c @@ -1,5 +1,5 @@ #include "cpucache.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" #include diff --git a/src/detection/cpuusage/cpuusage.c b/src/detection/cpuusage/cpuusage.c index a90c00225..40e569528 100644 --- a/src/detection/cpuusage/cpuusage.c +++ b/src/detection/cpuusage/cpuusage.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "util/time.h" +#include "common/time.h" #include diff --git a/src/detection/cpuusage/cpuusage_bsd.c b/src/detection/cpuusage/cpuusage_bsd.c index 4ed135eab..eee4ac20d 100644 --- a/src/detection/cpuusage/cpuusage_bsd.c +++ b/src/detection/cpuusage/cpuusage_bsd.c @@ -1,5 +1,5 @@ #include "detection/cpuusage/cpuusage.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/cpuusage/cpuusage_haiku.c b/src/detection/cpuusage/cpuusage_haiku.c index 88a734ee2..f946ecbf4 100644 --- a/src/detection/cpuusage/cpuusage_haiku.c +++ b/src/detection/cpuusage/cpuusage_haiku.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" #include diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c index 7c42d86c9..355fb2d12 100644 --- a/src/detection/cpuusage/cpuusage_linux.c +++ b/src/detection/cpuusage/cpuusage_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/cpuusage/cpuusage_windows.c b/src/detection/cpuusage/cpuusage_windows.c index f88e0928b..1679350d4 100644 --- a/src/detection/cpuusage/cpuusage_windows.c +++ b/src/detection/cpuusage/cpuusage_windows.c @@ -1,13 +1,13 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" #include #include #include #include -#include "util/windows/perflib_.h" +#include "common/windows/perflib_.h" static const char* getInfoByNqsi(FFlist* cpuTimes) { diff --git a/src/detection/cursor/cursor_linux.c b/src/detection/cursor/cursor_linux.c index 5258afbd9..4cccd721d 100644 --- a/src/detection/cursor/cursor_linux.c +++ b/src/detection/cursor/cursor_linux.c @@ -2,10 +2,10 @@ #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" -#include "util/properties.h" -#include "util/parsing.h" -#include "util/settings.h" -#include "util/stringUtils.h" +#include "common/properties.h" +#include "common/parsing.h" +#include "common/settings.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/cursor/cursor_windows.c b/src/detection/cursor/cursor_windows.c index d992ff83c..1856ad04d 100644 --- a/src/detection/cursor/cursor_windows.c +++ b/src/detection/cursor/cursor_windows.c @@ -1,6 +1,6 @@ #include "cursor.h" -#include "util/windows/registry.h" +#include "common/windows/registry.h" void ffDetectCursor(FFCursorResult* result) { diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index 84d0b234f..b4d4e4eb9 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -1,13 +1,13 @@ #include "de.h" -#include "util/dbus.h" -#include "util/io.h" -#include "util/library.h" -#include "util/parsing.h" -#include "util/properties.h" -#include "util/processing.h" -#include "util/binary.h" -#include "util/path.h" +#include "common/dbus.h" +#include "common/io.h" +#include "common/library.h" +#include "common/parsing.h" +#include "common/properties.h" +#include "common/processing.h" +#include "common/binary.h" +#include "common/path.h" #include "detection/displayserver/displayserver.h" #include diff --git a/src/detection/disk/disk_bsd.c b/src/detection/disk/disk_bsd.c index 35386b8bb..8781fd107 100644 --- a/src/detection/disk/disk_bsd.c +++ b/src/detection/disk/disk_bsd.c @@ -1,6 +1,6 @@ #include "disk.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" #include #include @@ -76,7 +76,7 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk) detectFsLabel(fs, disk); } #elif __APPLE__ -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include #include diff --git a/src/detection/disk/disk_haiku.cpp b/src/detection/disk/disk_haiku.cpp index 70479667e..267e75845 100644 --- a/src/detection/disk/disk_haiku.cpp +++ b/src/detection/disk/disk_haiku.cpp @@ -1,7 +1,7 @@ extern "C" { #include "disk.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" } #include #include diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c index 92a2e0527..5bdf83644 100644 --- a/src/detection/disk/disk_linux.c +++ b/src/detection/disk/disk_linux.c @@ -1,7 +1,7 @@ #include "disk.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c index d35ae18a6..aa201c6c7 100644 --- a/src/detection/disk/disk_sunos.c +++ b/src/detection/disk/disk_sunos.c @@ -1,6 +1,6 @@ #include "disk.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c index 8fa5b9bdb..e13cec90a 100644 --- a/src/detection/disk/disk_windows.c +++ b/src/detection/disk/disk_windows.c @@ -1,7 +1,7 @@ #include "disk.h" -#include "util/io.h" -#include "util/thread.h" -#include "util/windows/unicode.h" +#include "common/io.h" +#include "common/thread.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/diskio/diskio.c b/src/detection/diskio/diskio.c index decd7d4d3..9413a7125 100644 --- a/src/detection/diskio/diskio.c +++ b/src/detection/diskio/diskio.c @@ -1,6 +1,6 @@ #include "diskio.h" -#include "util/time.h" +#include "common/time.h" const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options); diff --git a/src/detection/diskio/diskio_apple.c b/src/detection/diskio/diskio_apple.c index 2e202f3d9..4cf2ec2aa 100644 --- a/src/detection/diskio/diskio_apple.c +++ b/src/detection/diskio/diskio_apple.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include #include diff --git a/src/detection/diskio/diskio_bsd.c b/src/detection/diskio/diskio_bsd.c index abd339e6f..563baa4fa 100644 --- a/src/detection/diskio/diskio_bsd.c +++ b/src/detection/diskio/diskio_bsd.c @@ -2,7 +2,7 @@ #if __has_include() -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c index e32c31c57..1855115ac 100644 --- a/src/detection/diskio/diskio_linux.c +++ b/src/detection/diskio/diskio_linux.c @@ -1,7 +1,7 @@ #include "diskio.h" -#include "util/io.h" -#include "util/properties.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/properties.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/diskio/diskio_nbsd.c b/src/detection/diskio/diskio_nbsd.c index 340cd856c..8e015fc4e 100644 --- a/src/detection/diskio/diskio_nbsd.c +++ b/src/detection/diskio/diskio_nbsd.c @@ -1,6 +1,6 @@ #include "diskio.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/diskio/diskio_obsd.c b/src/detection/diskio/diskio_obsd.c index 5dbfcd228..9411e030f 100644 --- a/src/detection/diskio/diskio_obsd.c +++ b/src/detection/diskio/diskio_obsd.c @@ -1,6 +1,6 @@ #include "diskio.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/diskio/diskio_sunos.c b/src/detection/diskio/diskio_sunos.c index 8cc6810bb..5147b21b2 100644 --- a/src/detection/diskio/diskio_sunos.c +++ b/src/detection/diskio/diskio_sunos.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include static inline void kstatFreeWrap(kstat_ctl_t** pkc) diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c index f2e0f07fa..7622e99f9 100644 --- a/src/detection/diskio/diskio_windows.c +++ b/src/detection/diskio/diskio_windows.c @@ -1,6 +1,6 @@ #include "diskio.h" -#include "util/io.h" -#include "util/windows/unicode.h" +#include "common/io.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/displayserver/displayserver_android.c b/src/detection/displayserver/displayserver_android.c index 137b290e5..76e152de4 100644 --- a/src/detection/displayserver/displayserver_android.c +++ b/src/detection/displayserver/displayserver_android.c @@ -1,6 +1,6 @@ #include "displayserver.h" -#include "util/settings.h" -#include "util/processing.h" +#include "common/settings.h" +#include "common/processing.h" #include "linux/displayserver_linux.h" #include diff --git a/src/detection/displayserver/displayserver_apple.c b/src/detection/displayserver/displayserver_apple.c index 7cf41204d..7f34bfb73 100644 --- a/src/detection/displayserver/displayserver_apple.c +++ b/src/detection/displayserver/displayserver_apple.c @@ -1,7 +1,7 @@ #include "displayserver.h" -#include "util/apple/cf_helpers.h" -#include "util/stringUtils.h" -#include "util/edidHelper.h" +#include "common/apple/cf_helpers.h" +#include "common/stringUtils.h" +#include "common/edidHelper.h" #include "detection/os/os.h" #include diff --git a/src/detection/displayserver/displayserver_windows.c b/src/detection/displayserver/displayserver_windows.c index c5917f857..b72a81b99 100644 --- a/src/detection/displayserver/displayserver_windows.c +++ b/src/detection/displayserver/displayserver_windows.c @@ -1,6 +1,6 @@ #include "displayserver.h" -#include "util/windows/unicode.h" -#include "util/edidHelper.h" +#include "common/windows/unicode.h" +#include "common/edidHelper.h" #include #include diff --git a/src/detection/displayserver/linux/common.c b/src/detection/displayserver/linux/common.c index 71abee2b9..ead84a112 100644 --- a/src/detection/displayserver/linux/common.c +++ b/src/detection/displayserver/linux/common.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" FFDisplayType ffdsGetDisplayType(const char* name) { diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c index 66977a1e7..d54eab452 100644 --- a/src/detection/displayserver/linux/displayserver_linux.c +++ b/src/detection/displayserver/linux/displayserver_linux.c @@ -1,9 +1,9 @@ #include "displayserver_linux.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #ifdef __FreeBSD__ - #include "util/settings.h" + #include "common/settings.h" #endif static void getWMProtocolNameFromEnv(FFDisplayServerResult* result) diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c index b79513bc7..90f784bf1 100644 --- a/src/detection/displayserver/linux/drm.c +++ b/src/detection/displayserver/linux/drm.c @@ -1,7 +1,7 @@ #include "displayserver_linux.h" -#include "util/io.h" -#include "util/edidHelper.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/edidHelper.h" +#include "common/stringUtils.h" #ifdef __linux__ #include @@ -110,7 +110,7 @@ static const char* drmParseSysfs(FFDisplayServerResult* result) #ifdef FF_HAVE_DRM -#include "util/library.h" +#include "common/library.h" #include #include diff --git a/src/detection/displayserver/linux/wayland/global-output.c b/src/detection/displayserver/linux/wayland/global-output.c index 36a9ff22d..4f2889c92 100644 --- a/src/detection/displayserver/linux/wayland/global-output.c +++ b/src/detection/displayserver/linux/wayland/global-output.c @@ -1,7 +1,7 @@ #ifdef FF_HAVE_WAYLAND #include "wayland.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include "xdg-output-unstable-v1-client-protocol.h" static void waylandOutputModeListener(void* data, FF_MAYBE_UNUSED struct wl_output* output, uint32_t flags, int32_t width, int32_t height, int32_t refreshRate) diff --git a/src/detection/displayserver/linux/wayland/kde-output.c b/src/detection/displayserver/linux/wayland/kde-output.c index c541e4ed8..afdfcf193 100644 --- a/src/detection/displayserver/linux/wayland/kde-output.c +++ b/src/detection/displayserver/linux/wayland/kde-output.c @@ -3,8 +3,8 @@ #include "wayland.h" #include "kde-output-device-v2-client-protocol.h" #include "kde-output-order-v1-client-protocol.h" -#include "util/edidHelper.h" -#include "util/base64.h" +#include "common/edidHelper.h" +#include "common/base64.h" typedef struct WaylandKdeMode { diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index 1938ca49f..15198067d 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -1,7 +1,7 @@ #include "../displayserver_linux.h" -#include "util/io.h" -#include "util/edidHelper.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/edidHelper.h" +#include "common/stringUtils.h" #include #include @@ -10,7 +10,7 @@ #include -#include "util/properties.h" +#include "common/properties.h" #include "wayland.h" #include "wlr-output-management-unstable-v1-client-protocol.h" diff --git a/src/detection/displayserver/linux/wayland/wayland.h b/src/detection/displayserver/linux/wayland/wayland.h index 79ed73a53..8d87f230a 100644 --- a/src/detection/displayserver/linux/wayland/wayland.h +++ b/src/detection/displayserver/linux/wayland/wayland.h @@ -2,8 +2,8 @@ #ifdef FF_HAVE_WAYLAND -#include "util/library.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index f7dae2f95..58c66fba9 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -1,8 +1,8 @@ #include "displayserver_linux.h" -#include "util/io.h" -#include "util/properties.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/properties.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c index 81f0e76d8..3cc8a9953 100644 --- a/src/detection/displayserver/linux/xcb.c +++ b/src/detection/displayserver/linux/xcb.c @@ -2,11 +2,11 @@ #ifdef FF_HAVE_XCB_RANDR -#include "util/library.h" -#include "util/properties.h" -#include "util/edidHelper.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/properties.h" +#include "common/edidHelper.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c index 25fab64d9..6dd06bf17 100644 --- a/src/detection/displayserver/linux/xlib.c +++ b/src/detection/displayserver/linux/xlib.c @@ -2,10 +2,10 @@ #ifdef FF_HAVE_XRANDR -#include "util/library.h" -#include "util/properties.h" -#include "util/edidHelper.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/properties.h" +#include "common/edidHelper.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c index a0831deef..5b717edd2 100644 --- a/src/detection/dns/dns_apple.c +++ b/src/detection/dns/dns_apple.c @@ -1,10 +1,10 @@ #include "detection/dns/dns.h" -#include "util/io.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" -#include "util/apple/cf_helpers.h" -#include "util/debug.h" +#include "common/io.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" +#include "common/apple/cf_helpers.h" +#include "common/debug.h" #include diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c index 51c36370c..b4c205cf6 100644 --- a/src/detection/dns/dns_linux.c +++ b/src/detection/dns/dns_linux.c @@ -1,9 +1,9 @@ #include "detection/dns/dns.h" -#include "util/io.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" -#include "util/debug.h" +#include "common/io.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" +#include "common/debug.h" #ifdef __HAIKU__ #define RESOLV_CONF "/system/settings/network/resolv.conf" diff --git a/src/detection/dns/dns_windows.c b/src/detection/dns/dns_windows.c index 9b96b3700..2bcc240dd 100644 --- a/src/detection/dns/dns_windows.c +++ b/src/detection/dns/dns_windows.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "util/netif.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/editor/editor.c b/src/detection/editor/editor.c index bdae1d1e3..d8221f42f 100644 --- a/src/detection/editor/editor.c +++ b/src/detection/editor/editor.c @@ -1,9 +1,9 @@ #include "editor.h" -#include "util/processing.h" -#include "util/library.h" -#include "util/stringUtils.h" -#include "util/path.h" -#include "util/binary.h" +#include "common/processing.h" +#include "common/library.h" +#include "common/stringUtils.h" +#include "common/path.h" +#include "common/binary.h" #include diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m index 533afb940..e8aff3c5f 100644 --- a/src/detection/font/font_apple.m +++ b/src/detection/font/font_apple.m @@ -1,5 +1,5 @@ -#include "util/font.h" -#include "util/io.h" +#include "common/font.h" +#include "common/io.h" #include "font.h" #import diff --git a/src/detection/font/font_linux.c b/src/detection/font/font_linux.c index f823b226d..e3253379c 100644 --- a/src/detection/font/font_linux.c +++ b/src/detection/font/font_linux.c @@ -1,5 +1,5 @@ -#include "util/font.h" -#include "util/parsing.h" +#include "common/font.h" +#include "common/parsing.h" #include "detection/displayserver/displayserver.h" #include "detection/gtk_qt/gtk_qt.h" #include "font.h" diff --git a/src/detection/font/font_windows.c b/src/detection/font/font_windows.c index eb5446006..765dbc30e 100644 --- a/src/detection/font/font_windows.c +++ b/src/detection/font/font_windows.c @@ -1,5 +1,5 @@ #include "font.h" -#include "util/windows/unicode.h" +#include "common/windows/unicode.h" #include diff --git a/src/detection/gamepad/gamepad_apple.c b/src/detection/gamepad/gamepad_apple.c index bfeb65ed0..3651717f4 100644 --- a/src/detection/gamepad/gamepad_apple.c +++ b/src/detection/gamepad/gamepad_apple.c @@ -1,6 +1,6 @@ #include "gamepad.h" -#include "util/apple/cf_helpers.h" -#include "util/mallocHelper.h" +#include "common/apple/cf_helpers.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c index 0a6f760a5..469e49e03 100644 --- a/src/detection/gamepad/gamepad_bsd.c +++ b/src/detection/gamepad/gamepad_bsd.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/gamepad/gamepad_linux.c b/src/detection/gamepad/gamepad_linux.c index 0d211b46d..1fd44e89b 100644 --- a/src/detection/gamepad/gamepad_linux.c +++ b/src/detection/gamepad/gamepad_linux.c @@ -1,6 +1,6 @@ #include "gamepad.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path) { diff --git a/src/detection/gamepad/gamepad_windows.c b/src/detection/gamepad/gamepad_windows.c index 8bbc3cd03..68d5c01d7 100644 --- a/src/detection/gamepad/gamepad_windows.c +++ b/src/detection/gamepad/gamepad_windows.c @@ -1,7 +1,7 @@ #include "gamepad.h" -#include "util/io.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" +#include "common/io.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/gpu/gpu_amd.c b/src/detection/gpu/gpu_amd.c index 8ad5eb94d..428367944 100644 --- a/src/detection/gpu/gpu_amd.c +++ b/src/detection/gpu/gpu_amd.c @@ -1,9 +1,9 @@ #include "gpu_driver_specific.h" #include "adl.h" -#include "util/library.h" -#include "util/mallocHelper.h" -#include "util/debug.h" +#include "common/library.h" +#include "common/mallocHelper.h" +#include "common/debug.h" // Helper function to convert ADL status code to string FF_MAYBE_UNUSED static const char* ffAdlStatusToString(int status) { diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c index 1537fa5c1..029649f44 100644 --- a/src/detection/gpu/gpu_android.c +++ b/src/detection/gpu/gpu_android.c @@ -1,6 +1,6 @@ #include "gpu.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_apple.c b/src/detection/gpu/gpu_apple.c index 32d00cc49..24bba84e2 100644 --- a/src/detection/gpu/gpu_apple.c +++ b/src/detection/gpu/gpu_apple.c @@ -1,6 +1,6 @@ #include "gpu.h" -#include "util/apple/cf_helpers.h" -#include "util/apple/smc_temps.h" +#include "common/apple/cf_helpers.h" +#include "common/apple/smc_temps.h" #include @@ -38,7 +38,7 @@ static double detectGpuTemp(const FFstrbuf* gpuName) } #ifdef __aarch64__ -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c index c7f534ab0..99737cac1 100644 --- a/src/detection/gpu/gpu_bsd.c +++ b/src/detection/gpu/gpu_bsd.c @@ -1,7 +1,7 @@ #include "gpu_driver_specific.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include #include @@ -36,8 +36,8 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu) } #if FF_HAVE_DRM -#include "util/library.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c index c80e818d1..4e0477440 100644 --- a/src/detection/gpu/gpu_drm.c +++ b/src/detection/gpu/gpu_drm.c @@ -5,10 +5,10 @@ #include #include -#include "util/io.h" -#include "util/library.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/library.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" #include "intel_drm.h" #include "asahi_drm.h" diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c index 8ed7d5175..6fcb6829b 100644 --- a/src/detection/gpu/gpu_general.c +++ b/src/detection/gpu/gpu_general.c @@ -2,8 +2,8 @@ #ifdef FF_HAVE_PCIACCESS -#include "util/io.h" -#include "util/library.h" +#include "common/io.h" +#include "common/library.h" #include diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c index 86f029016..dd7a449c9 100644 --- a/src/detection/gpu/gpu_haiku.c +++ b/src/detection/gpu/gpu_haiku.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io.h" +#include "common/io.h" #include diff --git a/src/detection/gpu/gpu_intel.c b/src/detection/gpu/gpu_intel.c index 334ad58ea..a255a160c 100644 --- a/src/detection/gpu/gpu_intel.c +++ b/src/detection/gpu/gpu_intel.c @@ -1,7 +1,7 @@ #include "gpu_driver_specific.h" -#include "util/library.h" -#include "util/mallocHelper.h" +#include "common/library.h" +#include "common/mallocHelper.h" #include "igcl.h" struct FFIgclData { diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c index f116ff4be..26a6529a7 100644 --- a/src/detection/gpu/gpu_linux.c +++ b/src/detection/gpu/gpu_linux.c @@ -2,11 +2,11 @@ #include "detection/vulkan/vulkan.h" #include "detection/cpu/cpu.h" #include "detection/gpu/gpu_driver_specific.h" -#include "util/io.h" -#include "util/library.h" -#include "util/FFstrbuf.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/library.h" +#include "common/FFstrbuf.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include "modules/gpu/option.h" #include diff --git a/src/detection/gpu/gpu_mthreads.c b/src/detection/gpu/gpu_mthreads.c index 7ae7a622d..ff1347851 100644 --- a/src/detection/gpu/gpu_mthreads.c +++ b/src/detection/gpu/gpu_mthreads.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "util/library.h" +#include "common/library.h" #include "mtml.h" struct FFMtmlData diff --git a/src/detection/gpu/gpu_nbsd.c b/src/detection/gpu/gpu_nbsd.c index 7e42f67bb..aed284925 100644 --- a/src/detection/gpu/gpu_nbsd.c +++ b/src/detection/gpu/gpu_nbsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/gpu/gpu_nvidia.c b/src/detection/gpu/gpu_nvidia.c index 3e8e85fed..983fb326c 100644 --- a/src/detection/gpu/gpu_nvidia.c +++ b/src/detection/gpu/gpu_nvidia.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "util/library.h" +#include "common/library.h" #include "nvml.h" struct FFNvmlData { diff --git a/src/detection/gpu/gpu_obsd.c b/src/detection/gpu/gpu_obsd.c index 50b9a8743..95e1dff31 100644 --- a/src/detection/gpu/gpu_obsd.c +++ b/src/detection/gpu/gpu_obsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c index 3116790a9..02923a286 100644 --- a/src/detection/gpu/gpu_pci.c +++ b/src/detection/gpu/gpu_pci.c @@ -1,6 +1,6 @@ #include "gpu.h" -#include "util/io.h" -#include "util/properties.h" +#include "common/io.h" +#include "common/properties.h" #include #ifdef __FreeBSD__ diff --git a/src/detection/gpu/gpu_sunos.c b/src/detection/gpu/gpu_sunos.c index 6802ee099..da2bcd0ba 100644 --- a/src/detection/gpu/gpu_sunos.c +++ b/src/detection/gpu/gpu_sunos.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index 1f562031c..abaf843c7 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -1,11 +1,11 @@ #include "gpu.h" #include "detection/gpu/gpu_driver_specific.h" -#include "util/library.h" -#include "util/windows/unicode.h" -#include "util/windows/registry.h" -#include "util/mallocHelper.h" -#include "util/debug.h" -#include "util/windows/nt.h" +#include "common/library.h" +#include "common/windows/unicode.h" +#include "common/windows/registry.h" +#include "common/mallocHelper.h" +#include "common/debug.h" +#include "common/windows/nt.h" #include diff --git a/src/detection/gpu/gpu_wsl.cpp b/src/detection/gpu/gpu_wsl.cpp index 6ed6dec7c..f2351a9e0 100644 --- a/src/detection/gpu/gpu_wsl.cpp +++ b/src/detection/gpu/gpu_wsl.cpp @@ -2,7 +2,7 @@ #define INITGUID extern "C" { -#include "util/library.h" +#include "common/library.h" #include "detection/gpu/gpu.h" #include "detection/gpu/gpu_driver_specific.h" } diff --git a/src/detection/gtk_qt/gtk.c b/src/detection/gtk_qt/gtk.c index c0e49d14a..0f5e344cc 100644 --- a/src/detection/gtk_qt/gtk.c +++ b/src/detection/gtk_qt/gtk.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "util/properties.h" -#include "util/thread.h" -#include "util/settings.h" +#include "common/properties.h" +#include "common/thread.h" +#include "common/settings.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/gtk_qt/qt.c b/src/detection/gtk_qt/qt.c index 29854f62b..3683b534b 100644 --- a/src/detection/gtk_qt/qt.c +++ b/src/detection/gtk_qt/qt.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "util/properties.h" -#include "util/thread.h" -#include "util/stringUtils.h" +#include "common/properties.h" +#include "common/thread.h" +#include "common/stringUtils.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/host/host_android.c b/src/detection/host/host_android.c index f0f476a04..186d467e4 100644 --- a/src/detection/host/host_android.c +++ b/src/detection/host/host_android.c @@ -1,5 +1,5 @@ #include "host.h" -#include "util/settings.h" +#include "common/settings.h" #include diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c index 32db81c85..a340ab35f 100644 --- a/src/detection/host/host_apple.c +++ b/src/detection/host/host_apple.c @@ -1,6 +1,6 @@ #include "host.h" -#include "util/sysctl.h" -#include "util/apple/cf_helpers.h" +#include "common/sysctl.h" +#include "common/apple/cf_helpers.h" #include diff --git a/src/detection/host/host_bsd.c b/src/detection/host/host_bsd.c index 6c0b72f4b..86ca7664f 100644 --- a/src/detection/host/host_bsd.c +++ b/src/detection/host/host_bsd.c @@ -1,6 +1,6 @@ #include "host.h" -#include "util/settings.h" -#include "util/smbiosHelper.h" +#include "common/settings.h" +#include "common/smbiosHelper.h" const char* ffDetectHost(FFHostResult* host) { diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c index 90536e746..1ce20ccee 100644 --- a/src/detection/host/host_linux.c +++ b/src/detection/host/host_linux.c @@ -1,7 +1,7 @@ #include "host.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/smbiosHelper.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/smbiosHelper.h" #include diff --git a/src/detection/host/host_mac.c b/src/detection/host/host_mac.c index a2c8d3e73..7851c6d9e 100644 --- a/src/detection/host/host_mac.c +++ b/src/detection/host/host_mac.c @@ -1,5 +1,5 @@ #include "host.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel) { diff --git a/src/detection/host/host_nbsd.c b/src/detection/host/host_nbsd.c index b9bea191f..6a1de3216 100644 --- a/src/detection/host/host_nbsd.c +++ b/src/detection/host/host_nbsd.c @@ -1,6 +1,6 @@ #include "host.h" -#include "util/sysctl.h" -#include "util/smbiosHelper.h" +#include "common/sysctl.h" +#include "common/smbiosHelper.h" const char* ffDetectHost(FFHostResult* host) { diff --git a/src/detection/host/host_obsd.c b/src/detection/host/host_obsd.c index f5eb28d65..79ef15b62 100644 --- a/src/detection/host/host_obsd.c +++ b/src/detection/host/host_obsd.c @@ -1,6 +1,6 @@ #include "host.h" -#include "util/sysctl.h" -#include "util/smbiosHelper.h" +#include "common/sysctl.h" +#include "common/smbiosHelper.h" const char* ffDetectHost(FFHostResult* host) { diff --git a/src/detection/host/host_windows.c b/src/detection/host/host_windows.c index 05db2a041..3fa07fd75 100644 --- a/src/detection/host/host_windows.c +++ b/src/detection/host/host_windows.c @@ -1,5 +1,5 @@ #include "host.h" -#include "util/smbiosHelper.h" +#include "common/smbiosHelper.h" typedef struct FFSmbiosSystemInfo { diff --git a/src/detection/icons/icons_linux.c b/src/detection/icons/icons_linux.c index 05968465b..e5727b195 100644 --- a/src/detection/icons/icons_linux.c +++ b/src/detection/icons/icons_linux.c @@ -1,5 +1,5 @@ #include "icons.h" -#include "util/parsing.h" +#include "common/parsing.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/icons/icons_windows.c b/src/detection/icons/icons_windows.c index d7d9684e2..44c8b9630 100644 --- a/src/detection/icons/icons_windows.c +++ b/src/detection/icons/icons_windows.c @@ -1,5 +1,5 @@ #include "icons.h" -#include "util/windows/registry.h" +#include "common/windows/registry.h" const char* ffDetectIcons(FFIconsResult* result) { diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c index 1206b7927..f3f367c09 100644 --- a/src/detection/initsystem/initsystem_haiku.c +++ b/src/detection/initsystem/initsystem_haiku.c @@ -1,7 +1,7 @@ #include "initsystem.h" -#include "util/stringUtils.h" -#include "util/haiku/version.h" -#include "util/io.h" +#include "common/stringUtils.h" +#include "common/haiku/version.h" +#include "common/io.h" #include #include diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c index 6ec5d942a..408becbcf 100644 --- a/src/detection/initsystem/initsystem_linux.c +++ b/src/detection/initsystem/initsystem_linux.c @@ -1,7 +1,7 @@ #include "initsystem.h" -#include "util/processing.h" -#include "util/binary.h" -#include "util/stringUtils.h" +#include "common/processing.h" +#include "common/binary.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/keyboard/keyboard_apple.c b/src/detection/keyboard/keyboard_apple.c index 46278c5aa..152fc18e2 100644 --- a/src/detection/keyboard/keyboard_apple.c +++ b/src/detection/keyboard/keyboard_apple.c @@ -1,6 +1,6 @@ #include "keyboard.h" -#include "util/apple/cf_helpers.h" -#include "util/mallocHelper.h" +#include "common/apple/cf_helpers.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/keyboard/keyboard_bsd.c b/src/detection/keyboard/keyboard_bsd.c index e77534ba6..4e792b672 100644 --- a/src/detection/keyboard/keyboard_bsd.c +++ b/src/detection/keyboard/keyboard_bsd.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c index d339360b2..8d1c9ed20 100644 --- a/src/detection/keyboard/keyboard_linux.c +++ b/src/detection/keyboard/keyboard_linux.c @@ -1,6 +1,6 @@ #include "keyboard.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */) { diff --git a/src/detection/keyboard/keyboard_windows.c b/src/detection/keyboard/keyboard_windows.c index 777b64bf5..c02d1f5a1 100644 --- a/src/detection/keyboard/keyboard_windows.c +++ b/src/detection/keyboard/keyboard_windows.c @@ -1,9 +1,9 @@ #define INITGUID #include "keyboard.h" -#include "util/io.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" +#include "common/io.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/lm/lm_linux.c b/src/detection/lm/lm_linux.c index 0e270ad17..c336e5796 100644 --- a/src/detection/lm/lm_linux.c +++ b/src/detection/lm/lm_linux.c @@ -1,7 +1,7 @@ #include "lm.h" -#include "util/properties.h" -#include "util/dbus.h" -#include "util/processing.h" +#include "common/properties.h" +#include "common/dbus.h" +#include "common/processing.h" #include "detection/displayserver/displayserver.h" #include @@ -48,7 +48,7 @@ static const char* getSshdVersion(FFstrbuf* version) } #ifdef FF_HAVE_ZLIB -#include "util/library.h" +#include "common/library.h" #include #include diff --git a/src/detection/loadavg/loadavg_linux.c b/src/detection/loadavg/loadavg_linux.c index 8e8c9a7c4..556a87bbe 100644 --- a/src/detection/loadavg/loadavg_linux.c +++ b/src/detection/loadavg/loadavg_linux.c @@ -1,5 +1,5 @@ #include "detection/loadavg/loadavg.h" -#include "util/io.h" +#include "common/io.h" #include diff --git a/src/detection/locale/locale_windows.c b/src/detection/locale/locale_windows.c index c14732ffb..410aaf3f8 100644 --- a/src/detection/locale/locale_windows.c +++ b/src/detection/locale/locale_windows.c @@ -1,5 +1,5 @@ #include "detection/locale/locale.h" -#include "util/windows/unicode.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index 18251b89e..07138a4d6 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -1,8 +1,8 @@ #include "localip.h" -#include "util/io.h" -#include "util/netif.h" -#include "util/stringUtils.h" -#include "util/debug.h" +#include "common/io.h" +#include "common/netif.h" +#include "common/stringUtils.h" +#include "common/debug.h" #include #include diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c index 399129410..35e502bbc 100644 --- a/src/detection/localip/localip_windows.c +++ b/src/detection/localip/localip_windows.c @@ -1,10 +1,10 @@ #include #include -#include "util/netif.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" -#include "util/debug.h" +#include "common/netif.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" +#include "common/debug.h" #include "localip.h" #define FF_LOCALIP_NIFLAG(name) { IP_ADAPTER_##name, #name } diff --git a/src/detection/media/media.c b/src/detection/media/media.c index cb98ef51c..3a6e4ed22 100644 --- a/src/detection/media/media.c +++ b/src/detection/media/media.c @@ -1,5 +1,5 @@ #include "media.h" -#include "util/io.h" +#include "common/io.h" void ffDetectMediaImpl(FFMediaResult* media, bool saveCover); diff --git a/src/detection/media/media_apple.m b/src/detection/media/media_apple.m index b69e4f92d..93144a5b7 100644 --- a/src/detection/media/media_apple.m +++ b/src/detection/media/media_apple.m @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "util/processing.h" -#include "util/apple/cf_helpers.h" +#include "common/processing.h" +#include "common/apple/cf_helpers.h" #include "detection/media/media.h" #import diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c index c965b154f..e46d77e87 100644 --- a/src/detection/media/media_linux.c +++ b/src/detection/media/media_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include "detection/media/media.h" #include @@ -8,7 +8,7 @@ #define FF_DBUS_MPRIS_PREFIX "org.mpris.MediaPlayer2." #ifdef FF_HAVE_DBUS -#include "util/dbus.h" +#include "common/dbus.h" #define FF_DBUS_ITER_CONTINUE(dbus, iterator) \ { \ diff --git a/src/detection/media/media_windows.c b/src/detection/media/media_windows.c index 52846607c..eb165177b 100644 --- a/src/detection/media/media_windows.c +++ b/src/detection/media/media_windows.c @@ -1,5 +1,5 @@ -#include "util/library.h" -#include "util/windows/unicode.h" +#include "common/library.h" +#include "common/windows/unicode.h" #include "media.h" #include "media_windows.dll.h" diff --git a/src/detection/memory/memory_bsd.c b/src/detection/memory/memory_bsd.c index 699d22416..0db20527a 100644 --- a/src/detection/memory/memory_bsd.c +++ b/src/detection/memory/memory_bsd.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "util/sysctl.h" +#include "common/sysctl.h" const char* ffDetectMemory(FFMemoryResult* ram) { diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c index f2f80581f..66a679d10 100644 --- a/src/detection/memory/memory_linux.c +++ b/src/detection/memory/memory_linux.c @@ -1,6 +1,6 @@ #include "memory.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include diff --git a/src/detection/memory/memory_nbsd.c b/src/detection/memory/memory_nbsd.c index 112d9c16b..651058686 100644 --- a/src/detection/memory/memory_nbsd.c +++ b/src/detection/memory/memory_nbsd.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "util/sysctl.h" +#include "common/sysctl.h" #include #include diff --git a/src/detection/memory/memory_obsd.c b/src/detection/memory/memory_obsd.c index 2ca8b1ca4..e58bf0d37 100644 --- a/src/detection/memory/memory_obsd.c +++ b/src/detection/memory/memory_obsd.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "util/sysctl.h" +#include "common/sysctl.h" #include #include diff --git a/src/detection/mouse/mouse_apple.c b/src/detection/mouse/mouse_apple.c index feadff649..f7377d364 100644 --- a/src/detection/mouse/mouse_apple.c +++ b/src/detection/mouse/mouse_apple.c @@ -1,6 +1,6 @@ #include "mouse.h" -#include "util/apple/cf_helpers.h" -#include "util/mallocHelper.h" +#include "common/apple/cf_helpers.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/mouse/mouse_bsd.c b/src/detection/mouse/mouse_bsd.c index e7ef78c3b..3a2977b40 100644 --- a/src/detection/mouse/mouse_bsd.c +++ b/src/detection/mouse/mouse_bsd.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/mouse/mouse_linux.c b/src/detection/mouse/mouse_linux.c index a55fdc3d9..3b2291853 100644 --- a/src/detection/mouse/mouse_linux.c +++ b/src/detection/mouse/mouse_linux.c @@ -1,6 +1,6 @@ #include "mouse.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */) { diff --git a/src/detection/mouse/mouse_windows.c b/src/detection/mouse/mouse_windows.c index 6d4105f7f..73c6c7955 100644 --- a/src/detection/mouse/mouse_windows.c +++ b/src/detection/mouse/mouse_windows.c @@ -1,9 +1,9 @@ #define INITGUID #include "mouse.h" -#include "util/io.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" +#include "common/io.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/netio/netio.c b/src/detection/netio/netio.c index 7ffa73783..666321c99 100644 --- a/src/detection/netio/netio.c +++ b/src/detection/netio/netio.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/time.h" +#include "common/time.h" static FFlist ioCounters1; static uint64_t time1; diff --git a/src/detection/netio/netio_apple.c b/src/detection/netio/netio_apple.c index d9bf8e7eb..4be331815 100644 --- a/src/detection/netio/netio_apple.c +++ b/src/detection/netio/netio_apple.c @@ -1,7 +1,7 @@ #include "netio.h" -#include "util/netif.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c index 58234a1ea..acea26b72 100644 --- a/src/detection/netio/netio_bsd.c +++ b/src/detection/netio/netio_bsd.c @@ -1,7 +1,7 @@ #include "netio.h" -#include "util/netif.h" -#include "util/mallocHelper.h" +#include "common/netif.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp index 824652050..e415a9b21 100644 --- a/src/detection/netio/netio_haiku.cpp +++ b/src/detection/netio/netio_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "netio.h" -#include "util/netif.h" +#include "common/netif.h" } #include diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c index 48631d54a..60a2f6993 100644 --- a/src/detection/netio/netio_linux.c +++ b/src/detection/netio/netio_linux.c @@ -1,8 +1,8 @@ #include "netio.h" -#include "util/io.h" -#include "util/netif.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/netif.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c index ca41b8e79..461e69c2e 100644 --- a/src/detection/netio/netio_sunos.c +++ b/src/detection/netio/netio_sunos.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif.h" -#include "util/stringUtils.h" +#include "common/netif.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/netio/netio_windows.c b/src/detection/netio/netio_windows.c index 196c6a086..ff592a90f 100644 --- a/src/detection/netio/netio_windows.c +++ b/src/detection/netio/netio_windows.c @@ -1,8 +1,8 @@ #include "netio.h" -#include "util/netif.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" +#include "common/netif.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/opencl/opencl.c b/src/detection/opencl/opencl.c index 5ebc92190..da67587d5 100644 --- a/src/detection/opencl/opencl.c +++ b/src/detection/opencl/opencl.c @@ -7,9 +7,9 @@ #ifdef FF_HAVE_OPENCL -#include "util/library.h" -#include "util/parsing.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/parsing.h" +#include "common/stringUtils.h" #include #define CL_TARGET_OPENCL_VERSION 110 diff --git a/src/detection/opengl/opengl_haiku.cpp b/src/detection/opengl/opengl_haiku.cpp index 679993d42..c7301786f 100644 --- a/src/detection/opengl/opengl_haiku.cpp +++ b/src/detection/opengl/opengl_haiku.cpp @@ -2,7 +2,7 @@ extern "C" { #include "opengl.h" -#include "util/io.h" +#include "common/io.h" #if FF_HAVE_EGL const char* ffOpenGLDetectByEGL(FFOpenGLResult* result); #endif diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c index 0e7a10631..8222a8034 100644 --- a/src/detection/opengl/opengl_linux.c +++ b/src/detection/opengl/opengl_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "opengl.h" -#include "util/io.h" +#include "common/io.h" #include @@ -14,7 +14,7 @@ #if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX) #define FF_HAVE_GL 1 -#include "util/library.h" +#include "common/library.h" #include diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c index b5f4c7703..db72fb80d 100644 --- a/src/detection/opengl/opengl_shared.c +++ b/src/detection/opengl/opengl_shared.c @@ -1,5 +1,5 @@ #include "opengl.h" -#include "util/library.h" +#include "common/library.h" #if __has_include() #include @@ -25,7 +25,7 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG } #if defined(FF_HAVE_EGL) || __has_include() -#include "util/io.h" +#include "common/io.h" #define EGL_EGL_PROTOTYPES 1 #define EGL_EGLEXT_PROTOTYPES 1 diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c index b75acc4d0..50e0e88da 100644 --- a/src/detection/opengl/opengl_windows.c +++ b/src/detection/opengl/opengl_windows.c @@ -1,6 +1,6 @@ #include "opengl.h" -#include "util/library.h" -#include "util/printing.h" +#include "common/library.h" +#include "common/printing.h" #include #include diff --git a/src/detection/os/os_android.c b/src/detection/os/os_android.c index 986ce6da2..7d39954d6 100644 --- a/src/detection/os/os_android.c +++ b/src/detection/os/os_android.c @@ -1,5 +1,5 @@ #include "os.h" -#include "util/settings.h" +#include "common/settings.h" void ffDetectOSImpl(FFOSResult* os) { diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m index b73d1cdef..e3201908c 100644 --- a/src/detection/os/os_apple.m +++ b/src/detection/os/os_apple.m @@ -1,8 +1,8 @@ #include "os.h" -#include "util/io.h" -#include "util/sysctl.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/sysctl.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c index 20e3d9789..3377ec2a1 100644 --- a/src/detection/os/os_linux.c +++ b/src/detection/os/os_linux.c @@ -1,9 +1,9 @@ #include "os.h" -#include "util/properties.h" -#include "util/parsing.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/stringUtils.h" +#include "common/properties.h" +#include "common/parsing.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/os/os_sunos.c b/src/detection/os/os_sunos.c index d81101b28..1708e2f14 100644 --- a/src/detection/os/os_sunos.c +++ b/src/detection/os/os_sunos.c @@ -1,5 +1,5 @@ #include "os.h" -#include "util/io.h" +#include "common/io.h" void ffDetectOSImpl(FFOSResult* os) { diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp index 14025ec8e..71b1163ae 100644 --- a/src/detection/os/os_windows.cpp +++ b/src/detection/os/os_windows.cpp @@ -1,11 +1,11 @@ extern "C" { #include "os.h" -#include "util/library.h" -#include "util/stringUtils.h" -#include "util/windows/registry.h" +#include "common/library.h" +#include "common/stringUtils.h" +#include "common/windows/registry.h" } -#include "util/windows/unicode.hpp" -#include "util/windows/wmi.hpp" +#include "common/windows/unicode.hpp" +#include "common/windows/wmi.hpp" static const char* getOsNameByWmi(FFstrbuf* osName) { diff --git a/src/detection/packages/packages.c b/src/detection/packages/packages.c index e358e89d4..4e58b506d 100644 --- a/src/detection/packages/packages.c +++ b/src/detection/packages/packages.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c index 141c46bc2..245b3d6b7 100644 --- a/src/detection/packages/packages_apple.c +++ b/src/detection/packages/packages_apple.c @@ -1,8 +1,8 @@ #include "packages.h" -#include "util/io.h" -#include "util/parsing.h" -#include "util/processing.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/parsing.h" +#include "common/processing.h" +#include "common/stringUtils.h" static void countBrewPackages(FFstrbuf* baseDir, FFPackagesResult* result) { diff --git a/src/detection/packages/packages_bsd.c b/src/detection/packages/packages_bsd.c index 23096e638..4ad2d8b49 100644 --- a/src/detection/packages/packages_bsd.c +++ b/src/detection/packages/packages_bsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/settings.h" +#include "common/settings.h" static uint32_t getSQLite3Int(const char* dbPath, const char* query, const char* packageId) { diff --git a/src/detection/packages/packages_haiku.c b/src/detection/packages/packages_haiku.c index 1cf739bd9..45770589d 100644 --- a/src/detection/packages/packages_haiku.c +++ b/src/detection/packages/packages_haiku.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io.h" +#include "common/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 66560c267..8203f89c4 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -1,9 +1,9 @@ #include "packages.h" -#include "util/io.h" -#include "util/parsing.h" -#include "util/properties.h" -#include "util/settings.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/parsing.h" +#include "common/properties.h" +#include "common/settings.h" +#include "common/stringUtils.h" #include "detection/os/os.h" static uint32_t getNumElements(FFstrbuf* baseDir, const char* dirname, bool isdir) @@ -168,7 +168,7 @@ static uint32_t getSnap(FFstrbuf* baseDir) } #ifdef FF_HAVE_RPM -#include "util/library.h" +#include "common/library.h" #include #include #include diff --git a/src/detection/packages/packages_nbsd.c b/src/detection/packages/packages_nbsd.c index 19c35e82e..a713a2b07 100644 --- a/src/detection/packages/packages_nbsd.c +++ b/src/detection/packages/packages_nbsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io.h" +#include "common/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c index b2fc99640..1d9a21df7 100644 --- a/src/detection/packages/packages_nix.c +++ b/src/detection/packages/packages_nix.c @@ -1,7 +1,7 @@ #include "packages.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/stringUtils.h" static bool isValidNixPkg(FFstrbuf* pkg) { diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c index 07c2769f4..2ff2cc737 100644 --- a/src/detection/packages/packages_obsd.c +++ b/src/detection/packages/packages_obsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io.h" +#include "common/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c index 40ee6227c..e981f50ae 100644 --- a/src/detection/packages/packages_windows.c +++ b/src/detection/packages/packages_windows.c @@ -1,13 +1,13 @@ #include "packages.h" -#include "util/processing.h" -#include "util/stringUtils.h" -#include "util/path.h" -#include "util/windows/unicode.h" -#include "util/mallocHelper.h" -#include "util/io.h" +#include "common/processing.h" +#include "common/stringUtils.h" +#include "common/path.h" +#include "common/windows/unicode.h" +#include "common/mallocHelper.h" +#include "common/io.h" #include -#include "util/windows/nt.h" +#include "common/windows/nt.h" #include static uint32_t getNumElements(const char* searchPath, DWORD type, const wchar_t* ignore) diff --git a/src/detection/physicaldisk/physicaldisk_apple.c b/src/detection/physicaldisk/physicaldisk_apple.c index ce125533d..860d33999 100644 --- a/src/detection/physicaldisk/physicaldisk_apple.c +++ b/src/detection/physicaldisk/physicaldisk_apple.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include #include diff --git a/src/detection/physicaldisk/physicaldisk_bsd.c b/src/detection/physicaldisk/physicaldisk_bsd.c index 9bb4669dd..4878d7805 100644 --- a/src/detection/physicaldisk/physicaldisk_bsd.c +++ b/src/detection/physicaldisk/physicaldisk_bsd.c @@ -2,7 +2,7 @@ #if __has_include() -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c index 2c024d72a..deed69653 100644 --- a/src/detection/physicaldisk/physicaldisk_haiku.c +++ b/src/detection/physicaldisk/physicaldisk_haiku.c @@ -1,7 +1,7 @@ #include "physicaldisk.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c index e0d4bc532..33019d7bc 100644 --- a/src/detection/physicaldisk/physicaldisk_linux.c +++ b/src/detection/physicaldisk/physicaldisk_linux.c @@ -1,7 +1,7 @@ #include "physicaldisk.h" -#include "util/io.h" -#include "util/properties.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/properties.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/physicaldisk/physicaldisk_sunos.c b/src/detection/physicaldisk/physicaldisk_sunos.c index fb14c889e..aeb5ff27e 100644 --- a/src/detection/physicaldisk/physicaldisk_sunos.c +++ b/src/detection/physicaldisk/physicaldisk_sunos.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include "sys/scsi/generic/inquiry.h" #include diff --git a/src/detection/physicaldisk/physicaldisk_windows.c b/src/detection/physicaldisk/physicaldisk_windows.c index ed56b4a0f..8d90f01ea 100644 --- a/src/detection/physicaldisk/physicaldisk_windows.c +++ b/src/detection/physicaldisk/physicaldisk_windows.c @@ -1,6 +1,6 @@ #include "physicaldisk.h" -#include "util/io.h" -#include "util/windows/unicode.h" +#include "common/io.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m index 550d94c74..2812f7707 100644 --- a/src/detection/physicalmemory/physicalmemory_apple.m +++ b/src/detection/physicalmemory/physicalmemory_apple.m @@ -1,8 +1,8 @@ #include "physicalmemory.h" -#include "util/processing.h" -#include "util/smbiosHelper.h" -#include "util/stringUtils.h" -#include "util/apple/cf_helpers.h" +#include "common/processing.h" +#include "common/smbiosHelper.h" +#include "common/stringUtils.h" +#include "common/apple/cf_helpers.h" #import diff --git a/src/detection/physicalmemory/physicalmemory_linux.c b/src/detection/physicalmemory/physicalmemory_linux.c index 8fdea2812..8d09fb87a 100644 --- a/src/detection/physicalmemory/physicalmemory_linux.c +++ b/src/detection/physicalmemory/physicalmemory_linux.c @@ -1,5 +1,5 @@ #include "physicalmemory.h" -#include "util/smbiosHelper.h" +#include "common/smbiosHelper.h" // 7.18 typedef struct FFSmbiosMemoryDevice diff --git a/src/detection/poweradapter/poweradapter_apple.c b/src/detection/poweradapter/poweradapter_apple.c index 35cba4d5a..bee95e967 100644 --- a/src/detection/poweradapter/poweradapter_apple.c +++ b/src/detection/poweradapter/poweradapter_apple.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "poweradapter.h" -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include #include diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c index 28cffe315..4e0576490 100644 --- a/src/detection/poweradapter/poweradapter_linux.c +++ b/src/detection/poweradapter/poweradapter_linux.c @@ -1,6 +1,6 @@ #include "poweradapter.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c index e8e69ad36..397961e11 100644 --- a/src/detection/processes/processes_linux.c +++ b/src/detection/processes/processes_linux.c @@ -1,7 +1,7 @@ #include "processes.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" const char* ffDetectProcesses(uint32_t* result) { diff --git a/src/detection/processes/processes_windows.c b/src/detection/processes/processes_windows.c index fb29cd210..3267cff38 100644 --- a/src/detection/processes/processes_windows.c +++ b/src/detection/processes/processes_windows.c @@ -1,5 +1,5 @@ #include "processes.h" -#include "util/mallocHelper.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c index 27070bfa4..5aa9c1c90 100644 --- a/src/detection/publicip/publicip.c +++ b/src/detection/publicip/publicip.c @@ -1,5 +1,5 @@ #include "publicip.h" -#include "util/networking.h" +#include "common/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState states[2]; diff --git a/src/detection/sound/sound_apple.c b/src/detection/sound/sound_apple.c index cd21912c0..7f800b372 100644 --- a/src/detection/sound/sound_apple.c +++ b/src/detection/sound/sound_apple.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/apple/cf_helpers.h" +#include "common/apple/cf_helpers.h" #include #include diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c index bc5abdf4d..68404fa85 100644 --- a/src/detection/sound/sound_bsd.c +++ b/src/detection/sound/sound_bsd.c @@ -1,6 +1,6 @@ #include "sound.h" -#include "util/io.h" -#include "util/sysctl.h" +#include "common/io.h" +#include "common/sysctl.h" #include #include diff --git a/src/detection/sound/sound_haiku.cpp b/src/detection/sound/sound_haiku.cpp index ba2dd7aeb..9471909e2 100644 --- a/src/detection/sound/sound_haiku.cpp +++ b/src/detection/sound/sound_haiku.cpp @@ -1,7 +1,7 @@ extern "C" { #include "sound.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" } #include #include diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c index ecd074367..ace1d0b08 100644 --- a/src/detection/sound/sound_linux.c +++ b/src/detection/sound/sound_linux.c @@ -1,7 +1,7 @@ #include "sound.h" #ifdef FF_HAVE_PULSE -#include "util/library.h" +#include "common/library.h" #include static void paSinkInfoCallback(pa_context *c, const pa_sink_info *i, int eol, void *userdata) diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c index 06240dede..396ce4b66 100644 --- a/src/detection/sound/sound_nbsd.c +++ b/src/detection/sound/sound_nbsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/sound/sound_obsd.c b/src/detection/sound/sound_obsd.c index 5b83f9578..7e7554f5d 100644 --- a/src/detection/sound/sound_obsd.c +++ b/src/detection/sound/sound_obsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/stringUtils.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c index 760d1c7fd..dc185c618 100644 --- a/src/detection/sound/sound_sunos.c +++ b/src/detection/sound/sound_sunos.c @@ -1,6 +1,6 @@ #include "sound.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/sound/sound_windows.cpp b/src/detection/sound/sound_windows.cpp index 4845cac5f..c0cb58d5a 100644 --- a/src/detection/sound/sound_windows.cpp +++ b/src/detection/sound/sound_windows.cpp @@ -1,8 +1,8 @@ extern "C" { #include "sound.h" - #include "util/windows/unicode.h" + #include "common/windows/unicode.h" } -#include "util/windows/com.hpp" +#include "common/windows/com.hpp" #include #include diff --git a/src/detection/swap/swap_bsd.c b/src/detection/swap/swap_bsd.c index 9fb40d1a6..c3e40b3df 100644 --- a/src/detection/swap/swap_bsd.c +++ b/src/detection/swap/swap_bsd.c @@ -1,5 +1,5 @@ #include "swap.h" -#include "util/sysctl.h" +#include "common/sysctl.h" #include #include diff --git a/src/detection/swap/swap_linux.c b/src/detection/swap/swap_linux.c index 5508c2889..da6b2744f 100644 --- a/src/detection/swap/swap_linux.c +++ b/src/detection/swap/swap_linux.c @@ -1,7 +1,7 @@ #include "swap.h" -#include "util/io.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/mallocHelper.h" #include diff --git a/src/detection/swap/swap_obsd.c b/src/detection/swap/swap_obsd.c index fff233ae3..e262e4c61 100644 --- a/src/detection/swap/swap_obsd.c +++ b/src/detection/swap/swap_obsd.c @@ -1,6 +1,6 @@ #include "swap.h" -#include "util/FFlist.h" -#include "util/mallocHelper.h" +#include "common/FFlist.h" +#include "common/mallocHelper.h" #include #include diff --git a/src/detection/swap/swap_windows.c b/src/detection/swap/swap_windows.c index 1bbb8098c..833293b11 100644 --- a/src/detection/swap/swap_windows.c +++ b/src/detection/swap/swap_windows.c @@ -1,6 +1,6 @@ #include "swap.h" -#include "util/mallocHelper.h" -#include "util/windows/unicode.h" +#include "common/mallocHelper.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c index 5f320b5a4..0793236c5 100644 --- a/src/detection/terminalfont/terminalfont.c +++ b/src/detection/terminalfont/terminalfont.c @@ -1,9 +1,9 @@ #include "terminalfont.h" -#include "util/io.h" -#include "util/properties.h" -#include "util/processing.h" -#include "util/debug.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/properties.h" +#include "common/processing.h" +#include "common/debug.h" +#include "common/stringUtils.h" #include "detection/terminalshell/terminalshell.h" static void detectAlacritty(FFTerminalFontResult* terminalFont) diff --git a/src/detection/terminalfont/terminalfont.h b/src/detection/terminalfont/terminalfont.h index b0b468f2d..03ddad99e 100644 --- a/src/detection/terminalfont/terminalfont.h +++ b/src/detection/terminalfont/terminalfont.h @@ -1,7 +1,7 @@ #pragma once #include "fastfetch.h" -#include "util/font.h" +#include "common/font.h" #include "modules/font/option.h" typedef struct FFTerminalFontResult diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c index 14974080f..ef2ef39ef 100644 --- a/src/detection/terminalfont/terminalfont_android.c +++ b/src/detection/terminalfont/terminalfont_android.c @@ -1,10 +1,10 @@ #include "fastfetch.h" #include "terminalfont.h" #include "detection/terminalshell/terminalshell.h" -#include "util/io.h" +#include "common/io.h" #ifdef FF_HAVE_FREETYPE - #include "util/library.h" + #include "common/library.h" #include #include FT_FREETYPE_H #endif diff --git a/src/detection/terminalfont/terminalfont_apple.m b/src/detection/terminalfont/terminalfont_apple.m index f9da1fbef..126235f41 100644 --- a/src/detection/terminalfont/terminalfont_apple.m +++ b/src/detection/terminalfont/terminalfont_apple.m @@ -1,7 +1,7 @@ #include "terminalfont.h" -#include "util/font.h" +#include "common/font.h" #include "detection/terminalshell/terminalshell.h" -#include "util/apple/osascript.h" +#include "common/apple/osascript.h" #include #include diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 59ecdd2ce..a8c0ddac9 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -1,13 +1,13 @@ -#include "util/font.h" +#include "common/font.h" #include "terminalfont.h" -#include "util/settings.h" -#include "util/properties.h" -#include "util/parsing.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" -#include "util/binary.h" +#include "common/settings.h" +#include "common/properties.h" +#include "common/parsing.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" +#include "common/binary.h" #include "detection/terminalshell/terminalshell.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c index a24df94a3..9cf994571 100644 --- a/src/detection/terminalfont/terminalfont_windows.c +++ b/src/detection/terminalfont/terminalfont_windows.c @@ -1,10 +1,10 @@ -#include "util/library.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/properties.h" -#include "util/windows/unicode.h" -#include "util/windows/registry.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/properties.h" +#include "common/windows/unicode.h" +#include "common/windows/registry.h" +#include "common/stringUtils.h" #include "detection/terminalshell/terminalshell.h" #include "terminalfont.h" diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index 96e04fa34..dce77020e 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -1,10 +1,10 @@ #include "fastfetch.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/properties.h" -#include "util/path.h" -#include "util/stringUtils.h" -#include "util/binary.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/properties.h" +#include "common/path.h" +#include "common/stringUtils.h" +#include "common/binary.h" #include #include @@ -19,7 +19,7 @@ #define _PATH_LOCALBASE "/usr/pkg" #elif _WIN32 -#include "util/windows/version.h" +#include "common/windows/version.h" #include static bool getFileVersion(const FFstrbuf* exePath, const wchar_t* stringName, FFstrbuf* version) @@ -33,7 +33,7 @@ static bool getFileVersion(const FFstrbuf* exePath, const wchar_t* stringName, F } #elif __HAIKU__ - #include "util/haiku/version.h" + #include "common/haiku/version.h" #endif static bool getExeVersionRaw(FFstrbuf* exe, FFstrbuf* version) diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 7912dbb79..79fbbc6e9 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -1,9 +1,9 @@ #include "terminalshell.h" -#include "util/io.h" -#include "util/parsing.h" -#include "util/processing.h" -#include "util/thread.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/parsing.h" +#include "common/processing.h" +#include "common/thread.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index fe2709785..7dff190e3 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -1,12 +1,12 @@ #include "terminalshell.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/thread.h" -#include "util/mallocHelper.h" -#include "util/windows/registry.h" -#include "util/windows/unicode.h" -#include "util/windows/version.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/thread.h" +#include "common/mallocHelper.h" +#include "common/windows/registry.h" +#include "common/windows/unicode.h" +#include "common/windows/version.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/terminalsize/terminalsize_linux.c b/src/detection/terminalsize/terminalsize_linux.c index 183b61875..fce2d5d33 100644 --- a/src/detection/terminalsize/terminalsize_linux.c +++ b/src/detection/terminalsize/terminalsize_linux.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "util/io.h" +#include "common/io.h" #include #include diff --git a/src/detection/terminalsize/terminalsize_windows.c b/src/detection/terminalsize/terminalsize_windows.c index f884499be..14c0a0af2 100644 --- a/src/detection/terminalsize/terminalsize_windows.c +++ b/src/detection/terminalsize/terminalsize_windows.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "util/io.h" +#include "common/io.h" #include diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c index 80b62be3f..552560a1f 100644 --- a/src/detection/terminaltheme/terminaltheme.c +++ b/src/detection/terminaltheme/terminaltheme.c @@ -1,6 +1,6 @@ #include "terminaltheme.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include diff --git a/src/detection/theme/theme_linux.c b/src/detection/theme/theme_linux.c index 1e9496823..650130775 100644 --- a/src/detection/theme/theme_linux.c +++ b/src/detection/theme/theme_linux.c @@ -1,5 +1,5 @@ #include "theme.h" -#include "util/parsing.h" +#include "common/parsing.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/tpm/tpm_apple.c b/src/detection/tpm/tpm_apple.c index daef285e9..d95679c55 100644 --- a/src/detection/tpm/tpm_apple.c +++ b/src/detection/tpm/tpm_apple.c @@ -1,7 +1,7 @@ #include "tpm.h" #ifndef __aarch64__ - #include "util/apple/cf_helpers.h" + #include "common/apple/cf_helpers.h" #include #endif diff --git a/src/detection/tpm/tpm_bsd.c b/src/detection/tpm/tpm_bsd.c index 251f13b31..55c1e211c 100644 --- a/src/detection/tpm/tpm_bsd.c +++ b/src/detection/tpm/tpm_bsd.c @@ -1,6 +1,6 @@ #include "tpm.h" -#include "util/sysctl.h" -#include "util/kmod.h" +#include "common/sysctl.h" +#include "common/kmod.h" const char* ffDetectTPM(FFTPMResult* result) { diff --git a/src/detection/tpm/tpm_linux.c b/src/detection/tpm/tpm_linux.c index 4bd8b32c1..b7c6ab412 100644 --- a/src/detection/tpm/tpm_linux.c +++ b/src/detection/tpm/tpm_linux.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "util/io.h" +#include "common/io.h" const char* ffDetectTPM(FFTPMResult* result) { diff --git a/src/detection/tpm/tpm_windows.c b/src/detection/tpm/tpm_windows.c index 1d663238c..32ec92da9 100644 --- a/src/detection/tpm/tpm_windows.c +++ b/src/detection/tpm/tpm_windows.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "util/library.h" +#include "common/library.h" #include #include diff --git a/src/detection/uptime/uptime_bsd.c b/src/detection/uptime/uptime_bsd.c index 3cd4dc56e..57a17b0d7 100644 --- a/src/detection/uptime/uptime_bsd.c +++ b/src/detection/uptime/uptime_bsd.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "util/time.h" +#include "common/time.h" #include #include diff --git a/src/detection/uptime/uptime_haiku.c b/src/detection/uptime/uptime_haiku.c index 7b2395406..a2c48a5ec 100644 --- a/src/detection/uptime/uptime_haiku.c +++ b/src/detection/uptime/uptime_haiku.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "util/time.h" +#include "common/time.h" const char* ffDetectUptime(FFUptimeResult* result) { diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c index 19def70c3..a69d85a27 100644 --- a/src/detection/uptime/uptime_linux.c +++ b/src/detection/uptime/uptime_linux.c @@ -1,6 +1,6 @@ #include "uptime.h" -#include "util/time.h" -#include "util/io.h" +#include "common/time.h" +#include "common/io.h" #include diff --git a/src/detection/uptime/uptime_sunos.c b/src/detection/uptime/uptime_sunos.c index b0a34f2ef..74ce8b8a7 100644 --- a/src/detection/uptime/uptime_sunos.c +++ b/src/detection/uptime/uptime_sunos.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "util/time.h" +#include "common/time.h" #include diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c index b75187c1d..6978a1163 100644 --- a/src/detection/uptime/uptime_windows.c +++ b/src/detection/uptime/uptime_windows.c @@ -1,5 +1,5 @@ #include "uptime.h" -#include "util/time.h" +#include "common/time.h" #include diff --git a/src/detection/users/users_linux.c b/src/detection/users/users_linux.c index 98e506d33..46d8a02e5 100644 --- a/src/detection/users/users_linux.c +++ b/src/detection/users/users_linux.c @@ -1,5 +1,5 @@ -#include "util/io.h" -#include "util/properties.h" +#include "common/io.h" +#include "common/properties.h" #include "fastfetch.h" #include "users.h" diff --git a/src/detection/users/users_obsd.c b/src/detection/users/users_obsd.c index 6d67afeff..61370392d 100644 --- a/src/detection/users/users_obsd.c +++ b/src/detection/users/users_obsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "users.h" -#include "util/io.h" +#include "common/io.h" #include diff --git a/src/detection/users/users_windows.c b/src/detection/users/users_windows.c index c2dd961ec..f8b117b3d 100644 --- a/src/detection/users/users_windows.c +++ b/src/detection/users/users_windows.c @@ -1,5 +1,5 @@ #include "users.h" -#include "util/windows/unicode.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 7e63a970d..085c7cb64 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -3,10 +3,10 @@ #include "detection/vulkan/vulkan.h" #ifdef FF_HAVE_VULKAN -#include "util/library.h" -#include "util/io.h" -#include "util/parsing.h" -#include "util/stringUtils.h" +#include "common/library.h" +#include "common/io.h" +#include "common/parsing.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/wallpaper/wallpaper_apple.m b/src/detection/wallpaper/wallpaper_apple.m index 33fe54488..800aee9ce 100644 --- a/src/detection/wallpaper/wallpaper_apple.m +++ b/src/detection/wallpaper/wallpaper_apple.m @@ -1,6 +1,6 @@ #include "wallpaper.h" -#include "util/settings.h" -#include "util/apple/osascript.h" +#include "common/settings.h" +#include "common/apple/osascript.h" #import diff --git a/src/detection/wallpaper/wallpaper_linux.c b/src/detection/wallpaper/wallpaper_linux.c index 76b4274f3..d2aa65b6c 100644 --- a/src/detection/wallpaper/wallpaper_linux.c +++ b/src/detection/wallpaper/wallpaper_linux.c @@ -1,5 +1,5 @@ #include "wallpaper.h" -#include "util/settings.h" +#include "common/settings.h" #include "detection/gtk_qt/gtk_qt.h" const char* ffDetectWallpaper(FFstrbuf* result) diff --git a/src/detection/wallpaper/wallpaper_windows.c b/src/detection/wallpaper/wallpaper_windows.c index 7a099cb40..f713e0172 100644 --- a/src/detection/wallpaper/wallpaper_windows.c +++ b/src/detection/wallpaper/wallpaper_windows.c @@ -1,14 +1,14 @@ -#include "wallpaper.h" -#include "util/windows/registry.h" - -const char* ffDetectWallpaper(FFstrbuf* result) -{ - FF_HKEY_AUTO_DESTROY hKey = NULL; - if(!ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Control Panel\\Desktop", &hKey, NULL)) - return "ffRegOpenKeyForRead(Control Panel\\Desktop) failed"; - - if(!ffRegReadStrbuf(hKey, L"WallPaper", result, NULL)) - return "ffRegReadStrbuf(WallPaper) failed"; - - return NULL; -} +#include "wallpaper.h" +#include "common/windows/registry.h" + +const char* ffDetectWallpaper(FFstrbuf* result) +{ + FF_HKEY_AUTO_DESTROY hKey = NULL; + if(!ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Control Panel\\Desktop", &hKey, NULL)) + return "ffRegOpenKeyForRead(Control Panel\\Desktop) failed"; + + if(!ffRegReadStrbuf(hKey, L"WallPaper", result, NULL)) + return "ffRegReadStrbuf(WallPaper) failed"; + + return NULL; +} diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c index 128597f48..150c9e36f 100644 --- a/src/detection/weather/weather.c +++ b/src/detection/weather/weather.c @@ -1,5 +1,5 @@ #include "weather.h" -#include "util/networking.h" +#include "common/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState state; diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index 6503285e7..e74a96b37 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -1,7 +1,7 @@ #include "wifi.h" -#include "util/processing.h" -#include "util/properties.h" +#include "common/processing.h" +#include "common/properties.h" #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" #define FF_TERMUX_API_PARAM "WifiConnectionInfo" diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m index 2c208e17d..5a2cf1353 100644 --- a/src/detection/wifi/wifi_apple.m +++ b/src/detection/wifi/wifi_apple.m @@ -1,6 +1,6 @@ #include "wifi.h" -#include "util/processing.h" -#include "util/stringUtils.h" +#include "common/processing.h" +#include "common/stringUtils.h" #import diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c index 6a0af8b4c..efe05cc95 100644 --- a/src/detection/wifi/wifi_bsd.c +++ b/src/detection/wifi/wifi_bsd.c @@ -1,6 +1,6 @@ #include "wifi.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c index 953233809..62fd01771 100644 --- a/src/detection/wifi/wifi_linux.c +++ b/src/detection/wifi/wifi_linux.c @@ -1,10 +1,10 @@ #include "wifi.h" -#include "util/dbus.h" -#include "util/io.h" -#include "util/processing.h" -#include "util/properties.h" -#include "util/stringUtils.h" -#include "util/debug.h" +#include "common/dbus.h" +#include "common/io.h" +#include "common/processing.h" +#include "common/properties.h" +#include "common/stringUtils.h" +#include "common/debug.h" #include diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c index e29ebfef0..acab018c9 100644 --- a/src/detection/wifi/wifi_nbsd.c +++ b/src/detection/wifi/wifi_nbsd.c @@ -1,6 +1,6 @@ #include "wifi.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #define COMPAT_FREEBSD_NET80211 1 #include diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c index 46ee270bf..67c250e28 100644 --- a/src/detection/wifi/wifi_obsd.c +++ b/src/detection/wifi/wifi_obsd.c @@ -1,6 +1,6 @@ #include "wifi.h" -#include "util/io.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/stringUtils.h" #include #include diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c index 98c40b683..99673b626 100644 --- a/src/detection/wifi/wifi_windows.c +++ b/src/detection/wifi/wifi_windows.c @@ -1,6 +1,6 @@ #include "wifi.h" -#include "util/library.h" -#include "util/windows/unicode.h" +#include "common/library.h" +#include "common/windows/unicode.h" #include #include diff --git a/src/detection/wm/wm_apple.m b/src/detection/wm/wm_apple.m index 1289cb58c..6f595e467 100644 --- a/src/detection/wm/wm_apple.m +++ b/src/detection/wm/wm_apple.m @@ -1,8 +1,8 @@ #include "wm.h" -#include "util/sysctl.h" -#include "util/mallocHelper.h" -#include "util/stringUtils.h" +#include "common/sysctl.h" +#include "common/mallocHelper.h" +#include "common/stringUtils.h" #include #import diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c index 147f31321..56d8926e8 100644 --- a/src/detection/wm/wm_linux.c +++ b/src/detection/wm/wm_linux.c @@ -1,11 +1,11 @@ #include "wm.h" -#include "util/processing.h" -#include "util/io.h" -#include "util/binary.h" -#include "util/path.h" -#include "util/stringUtils.h" -#include "util/debug.h" +#include "common/processing.h" +#include "common/io.h" +#include "common/binary.h" +#include "common/path.h" +#include "common/stringUtils.h" +#include "common/debug.h" #include "detection/displayserver/displayserver.h" const char* ffDetectWMPlugin(FF_MAYBE_UNUSED FFstrbuf* pluginName) diff --git a/src/detection/wm/wm_windows.cpp b/src/detection/wm/wm_windows.cpp index 0d9c3335d..793d57d51 100644 --- a/src/detection/wm/wm_windows.cpp +++ b/src/detection/wm/wm_windows.cpp @@ -1,12 +1,12 @@ extern "C" { #include "wm.h" -#include "util/io.h" -#include "util/windows/version.h" +#include "common/io.h" +#include "common/windows/version.h" #include "detection/terminalshell/terminalshell.h" } -#include "util/windows/com.hpp" +#include "common/windows/com.hpp" #include #include diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c index 738ed9c01..d36bfbaca 100644 --- a/src/detection/wmtheme/wmtheme_linux.c +++ b/src/detection/wmtheme/wmtheme_linux.c @@ -1,10 +1,10 @@ #include "wmtheme.h" -#include "util/io.h" -#include "util/properties.h" -#include "util/parsing.h" -#include "util/settings.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/io.h" +#include "common/properties.h" +#include "common/parsing.h" +#include "common/settings.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include "detection/gtk_qt/gtk_qt.h" #include "detection/displayserver/displayserver.h" diff --git a/src/detection/wmtheme/wmtheme_windows.c b/src/detection/wmtheme/wmtheme_windows.c index 5e5cc26e1..5584af3e9 100644 --- a/src/detection/wmtheme/wmtheme_windows.c +++ b/src/detection/wmtheme/wmtheme_windows.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "wmtheme.h" -#include "util/windows/registry.h" +#include "common/windows/registry.h" const char* colorHexToString(DWORD hex) { diff --git a/src/detection/zpool/zpool.c b/src/detection/zpool/zpool.c index 83c5609fa..ca2c31a28 100644 --- a/src/detection/zpool/zpool.c +++ b/src/detection/zpool/zpool.c @@ -2,7 +2,7 @@ #if FF_HAVE_LIBZFS -#include "util/kmod.h" +#include "common/kmod.h" #ifdef __sun #include @@ -10,7 +10,7 @@ #include "libzfs_simplified.h" #endif -#include "util/library.h" +#include "common/library.h" typedef struct FFZfsData { diff --git a/src/fastfetch.c b/src/fastfetch.c index 59f66b33d..2891010e0 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -1,13 +1,13 @@ #include "fastfetch.h" #include "detection/version/version.h" #include "logo/logo.h" -#include "util/commandoption.h" -#include "util/init.h" -#include "util/io.h" -#include "util/jsonconfig.h" -#include "util/time.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" +#include "common/commandoption.h" +#include "common/init.h" +#include "common/io.h" +#include "common/jsonconfig.h" +#include "common/time.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" #include "fastfetch_datatext.h" #include @@ -15,7 +15,7 @@ #include #ifdef _WIN32 - #include "util/windows/getline.h" + #include "common/windows/getline.h" #endif static void printCommandFormatHelpJson(void) diff --git a/src/fastfetch.h b/src/fastfetch.h index eaecdbbc7..612799463 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -15,11 +15,11 @@ #define __attribute__(x) #endif -#include "util/arrayUtils.h" -#include "util/FFstrbuf.h" -#include "util/FFlist.h" -#include "util/FFPlatform.h" -#include "util/unused.h" +#include "common/arrayUtils.h" +#include "common/FFstrbuf.h" +#include "common/FFlist.h" +#include "common/FFPlatform.h" +#include "common/unused.h" #include "options/logo.h" #include "options/display.h" diff --git a/src/flashfetch.c b/src/flashfetch.c index 100d30b48..e4815686c 100644 --- a/src/flashfetch.c +++ b/src/flashfetch.c @@ -1,6 +1,6 @@ #include "fastfetch.h" -#include "util/init.h" +#include "common/init.h" #include "logo/logo.h" #include "modules/modules.h" diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 53f526b6a..b646e3d46 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -1,6 +1,6 @@ #include "logo.h" #include "logo_builtin.h" -#include "util/color.h" +#include "common/color.h" const FFlogo ffLogoUnknown = { .names = {"unknown"}, diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c index 3243f847b..4893eeaad 100644 --- a/src/logo/image/im6.c +++ b/src/logo/image/im6.c @@ -1,7 +1,7 @@ #ifdef FF_HAVE_IMAGEMAGICK6 #include "image.h" -#include "util/library.h" +#include "common/library.h" #include diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c index 8ed0e0c65..b33c0ccf9 100644 --- a/src/logo/image/im7.c +++ b/src/logo/image/im7.c @@ -1,7 +1,7 @@ #ifdef FF_HAVE_IMAGEMAGICK7 #include "image.h" -#include "util/library.h" +#include "common/library.h" #include diff --git a/src/logo/image/image.c b/src/logo/image/image.c index f8b031ae0..2ead988d7 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -1,9 +1,9 @@ #include "image.h" -#include "util/io.h" -#include "util/printing.h" -#include "util/processing.h" -#include "util/stringUtils.h" -#include "util/base64.h" +#include "common/io.h" +#include "common/printing.h" +#include "common/processing.h" +#include "common/stringUtils.h" +#include "common/base64.h" #include "detection/terminalsize/terminalsize.h" #include @@ -421,7 +421,7 @@ static inline char* realpath(const char* restrict file_name, char* restrict reso #endif #ifdef FF_HAVE_ZLIB -#include "util/library.h" +#include "common/library.h" #include #include diff --git a/src/logo/logo.c b/src/logo/logo.c index c24311124..0e88d0229 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -1,9 +1,9 @@ #include "logo/logo.h" -#include "util/io.h" -#include "util/printing.h" -#include "util/processing.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" +#include "common/io.h" +#include "common/printing.h" +#include "common/processing.h" +#include "common/textModifier.h" +#include "common/stringUtils.h" #include "detection/media/media.h" #include "detection/os/os.h" #include "detection/terminalshell/terminalshell.h" diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index fb22003cb..0da4f12d7 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -1,9 +1,9 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/duration.h" -#include "util/temps.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/duration.h" +#include "common/temps.h" +#include "common/stringUtils.h" #include "detection/battery/battery.h" #include "modules/battery/battery.h" diff --git a/src/modules/battery/option.h b/src/modules/battery/option.h index 93ef0d50f..1ac5b97be 100644 --- a/src/modules/battery/option.h +++ b/src/modules/battery/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFBatteryOptions { diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index 15234f3cd..60472c8a3 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/bios/bios.h" #include "modules/bios/bios.h" diff --git a/src/modules/bios/option.h b/src/modules/bios/option.h index 350afdcc6..000803569 100644 --- a/src/modules/bios/option.h +++ b/src/modules/bios/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFBiosOptions { diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index d26dbe5c7..810a62523 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/bluetooth/bluetooth.h" #include "modules/bluetooth/bluetooth.h" diff --git a/src/modules/bluetooth/option.h b/src/modules/bluetooth/option.h index 7453a1ebd..516c0d8b4 100644 --- a/src/modules/bluetooth/option.h +++ b/src/modules/bluetooth/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFBluetoothOptions { diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index 8adf8e069..37a7e12d2 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/bluetoothradio/bluetoothradio.h" #include "modules/bluetoothradio/bluetoothradio.h" diff --git a/src/modules/bluetoothradio/option.h b/src/modules/bluetoothradio/option.h index 55c3090e3..1b718b834 100644 --- a/src/modules/bluetoothradio/option.h +++ b/src/modules/bluetoothradio/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFBluetoothRadioOptions { diff --git a/src/modules/board/board.c b/src/modules/board/board.c index ef4174b2c..98f2a6a0d 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/board/board.h" #include "modules/board/board.h" diff --git a/src/modules/board/option.h b/src/modules/board/option.h index 79bcd9c52..bcc69adf3 100644 --- a/src/modules/board/option.h +++ b/src/modules/board/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFBoardOptions { diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index 4c0d80305..a0f0b19c0 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/bootmgr/bootmgr.h" #include "modules/bootmgr/bootmgr.h" diff --git a/src/modules/bootmgr/option.h b/src/modules/bootmgr/option.h index b5a62dbbe..e27e71efd 100644 --- a/src/modules/bootmgr/option.h +++ b/src/modules/bootmgr/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFBootmgrOptions { diff --git a/src/modules/break/break.c b/src/modules/break/break.c index 8f68af87d..e3b958782 100644 --- a/src/modules/break/break.c +++ b/src/modules/break/break.c @@ -1,4 +1,4 @@ -#include "util/printing.h" +#include "common/printing.h" #include "logo/logo.h" #include "modules/break/break.h" diff --git a/src/modules/break/option.h b/src/modules/break/option.h index b768196ee..e5acbf20d 100644 --- a/src/modules/break/option.h +++ b/src/modules/break/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFBreakOptions { diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 52bd00d80..054ef6e62 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/brightness/brightness.h" #include "modules/brightness/brightness.h" diff --git a/src/modules/brightness/option.h b/src/modules/brightness/option.h index 41bb5e202..4ff3843e7 100644 --- a/src/modules/brightness/option.h +++ b/src/modules/brightness/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFBrightnessOptions { diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index fed42af5c..115828b27 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/btrfs/btrfs.h" #include "modules/btrfs/btrfs.h" diff --git a/src/modules/btrfs/option.h b/src/modules/btrfs/option.h index 052b5a783..019eacb19 100644 --- a/src/modules/btrfs/option.h +++ b/src/modules/btrfs/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFBtrfsOptions { diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index b40fc71ac..108387ef6 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/libc/libc.h" #include "detection/camera/camera.h" #include "modules/camera/camera.h" diff --git a/src/modules/camera/option.h b/src/modules/camera/option.h index 7b99bfc42..6a2481fe8 100644 --- a/src/modules/camera/option.h +++ b/src/modules/camera/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFCameraOptions { diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index a9111cf9e..eafb068c1 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/chassis/chassis.h" #include "modules/chassis/chassis.h" diff --git a/src/modules/chassis/option.h b/src/modules/chassis/option.h index fae05cbed..b3100653f 100644 --- a/src/modules/chassis/option.h +++ b/src/modules/chassis/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFChassisOptions { diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index 9527bbb42..e831920e9 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/textModifier.h" +#include "common/stringUtils.h" #include "logo/logo.h" #include "modules/colors/colors.h" diff --git a/src/modules/colors/option.h b/src/modules/colors/option.h index 12d77a7e4..6a0bbb0d4 100644 --- a/src/modules/colors/option.h +++ b/src/modules/colors/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFColorsSymbol { diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 0f8b7e430..84ecba557 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -1,5 +1,5 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" +#include "common/printing.h" +#include "common/jsonconfig.h" #include "modules/command/command.h" #include "detection/command/command.h" diff --git a/src/modules/command/option.h b/src/modules/command/option.h index 2b3a13545..06f3b05b3 100644 --- a/src/modules/command/option.h +++ b/src/modules/command/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFCommandOptions { diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 65252a899..1e2e75378 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/parsing.h" -#include "util/temps.h" -#include "util/frequency.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/parsing.h" +#include "common/temps.h" +#include "common/frequency.h" #include "detection/cpu/cpu.h" #include "modules/cpu/cpu.h" diff --git a/src/modules/cpu/option.h b/src/modules/cpu/option.h index 9dae8e4f8..428b40a6b 100644 --- a/src/modules/cpu/option.h +++ b/src/modules/cpu/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFCPUOptions { diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index e9d4df261..e3b801c30 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/cpucache/cpucache.h" #include "modules/cpucache/cpucache.h" diff --git a/src/modules/cpucache/option.h b/src/modules/cpucache/option.h index 3ac2c5e04..f53acf691 100644 --- a/src/modules/cpucache/option.h +++ b/src/modules/cpucache/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFCPUCacheOptions { diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index eb04341f1..39854b4e4 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/stringUtils.h" #include "detection/cpuusage/cpuusage.h" #include "modules/cpuusage/cpuusage.h" diff --git a/src/modules/cpuusage/option.h b/src/modules/cpuusage/option.h index 32ed6d0bc..dc19fbe76 100644 --- a/src/modules/cpuusage/option.h +++ b/src/modules/cpuusage/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFCPUUsageOptions { diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index e2cd83cef..29bc1b51a 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/cursor/cursor.h" #include "modules/cursor/cursor.h" diff --git a/src/modules/cursor/option.h b/src/modules/cursor/option.h index 5df94b8e0..3f02c567c 100644 --- a/src/modules/cursor/option.h +++ b/src/modules/cursor/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFCursorOptions { diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index cee7f9874..95a9bd5c0 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/textModifier.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/textModifier.h" +#include "common/stringUtils.h" #include "modules/custom/custom.h" bool ffPrintCustom(FFCustomOptions* options) diff --git a/src/modules/custom/option.h b/src/modules/custom/option.h index 89a6044d0..c66ccee7d 100644 --- a/src/modules/custom/option.h +++ b/src/modules/custom/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFCustomOptions { diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index d65458837..4222ec2a4 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -1,7 +1,7 @@ -#include "util/time.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/time.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "modules/datetime/datetime.h" #include diff --git a/src/modules/datetime/option.h b/src/modules/datetime/option.h index ef6da988d..fffd5dc51 100644 --- a/src/modules/datetime/option.h +++ b/src/modules/datetime/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFDateTimeOptions { diff --git a/src/modules/de/de.c b/src/modules/de/de.c index eac9cc524..04f954464 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "detection/de/de.h" #include "modules/de/de.h" diff --git a/src/modules/de/option.h b/src/modules/de/option.h index b442cb2cb..c587a0c96 100644 --- a/src/modules/de/option.h +++ b/src/modules/de/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFDEOptions { diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index f3656483c..947f7482f 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/size.h" -#include "util/time.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/size.h" +#include "common/time.h" #include "detection/disk/disk.h" #include "modules/disk/disk.h" diff --git a/src/modules/disk/option.h b/src/modules/disk/option.h index 76445ecff..f4ec16f93 100644 --- a/src/modules/disk/option.h +++ b/src/modules/disk/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef enum __attribute__((__packed__)) FFDiskVolumeType { diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index de15f18fa..f9e113ccf 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/diskio/diskio.h" #include "modules/diskio/diskio.h" diff --git a/src/modules/diskio/option.h b/src/modules/diskio/option.h index c32db7e75..5de458fa3 100644 --- a/src/modules/diskio/option.h +++ b/src/modules/diskio/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFDiskIOOptions { diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 75dd7b424..9a92b361a 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "modules/display/display.h" diff --git a/src/modules/display/option.h b/src/modules/display/option.h index 6735ec319..12ad3c5ec 100644 --- a/src/modules/display/option.h +++ b/src/modules/display/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFDisplayCompactType { diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index 69596473f..4db146543 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/dns/dns.h" #include "modules/dns/dns.h" diff --git a/src/modules/dns/option.h b/src/modules/dns/option.h index b287d0349..bc3bd5690 100644 --- a/src/modules/dns/option.h +++ b/src/modules/dns/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFDNSShowType { FF_DNS_TYPE_IPV4_BIT = 1, diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index 2f0d501af..7fab5145d 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/libc/libc.h" #include "detection/editor/editor.h" #include "modules/editor/editor.h" diff --git a/src/modules/editor/option.h b/src/modules/editor/option.h index 93597d908..f7c545f84 100644 --- a/src/modules/editor/option.h +++ b/src/modules/editor/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFEditorOptions { diff --git a/src/modules/font/font.c b/src/modules/font/font.c index da568a87f..60da087f3 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/font/font.h" #include "modules/font/font.h" diff --git a/src/modules/font/option.h b/src/modules/font/option.h index 83c6e338f..6c942e7dd 100644 --- a/src/modules/font/option.h +++ b/src/modules/font/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFFontOptions { diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index dd213abd0..f1f89e269 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/gamepad/gamepad.h" #include "modules/gamepad/gamepad.h" diff --git a/src/modules/gamepad/option.h b/src/modules/gamepad/option.h index a977cd8b5..6425bf00f 100644 --- a/src/modules/gamepad/option.h +++ b/src/modules/gamepad/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/FFlist.h" +#include "common/option.h" +#include "common/FFlist.h" typedef struct FFGamepadOptions { diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index d84750cbd..a2293a147 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -1,10 +1,10 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/temps.h" -#include "util/size.h" -#include "util/frequency.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/temps.h" +#include "common/size.h" +#include "common/frequency.h" +#include "common/stringUtils.h" #include "detection/host/host.h" #include "detection/gpu/gpu.h" #include "modules/gpu/gpu.h" diff --git a/src/modules/gpu/option.h b/src/modules/gpu/option.h index e732877d8..0d1d0fac8 100644 --- a/src/modules/gpu/option.h +++ b/src/modules/gpu/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef enum __attribute__((__packed__)) FFGPUType { diff --git a/src/modules/host/host.c b/src/modules/host/host.c index d681db453..cb51ed194 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/host/host.h" #include "modules/host/host.h" diff --git a/src/modules/host/option.h b/src/modules/host/option.h index 1fc37b2f5..2516f864c 100644 --- a/src/modules/host/option.h +++ b/src/modules/host/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFHostOptions { diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index e1716edcc..b2c8bbfdf 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/icons/icons.h" #include "modules/icons/icons.h" diff --git a/src/modules/icons/option.h b/src/modules/icons/option.h index 7cc423fad..966bba5f5 100644 --- a/src/modules/icons/option.h +++ b/src/modules/icons/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFIconsOptions { diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index e667c7f59..e64274dab 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/initsystem/initsystem.h" #include "modules/initsystem/initsystem.h" diff --git a/src/modules/initsystem/option.h b/src/modules/initsystem/option.h index 922d8fbfe..54c10158e 100644 --- a/src/modules/initsystem/option.h +++ b/src/modules/initsystem/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFInitSystemOptions { diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 5ef2a3369..97406f58a 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "modules/kernel/kernel.h" bool ffPrintKernel(FFKernelOptions* options) diff --git a/src/modules/kernel/option.h b/src/modules/kernel/option.h index 3f632ba18..2b2b27d7e 100644 --- a/src/modules/kernel/option.h +++ b/src/modules/kernel/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFKernelOptions { diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c index f7749034d..f9a33a1ca 100644 --- a/src/modules/keyboard/keyboard.c +++ b/src/modules/keyboard/keyboard.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/keyboard/keyboard.h" #include "modules/keyboard/keyboard.h" diff --git a/src/modules/keyboard/option.h b/src/modules/keyboard/option.h index 36784a7f0..a454da331 100644 --- a/src/modules/keyboard/option.h +++ b/src/modules/keyboard/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/FFlist.h" +#include "common/option.h" +#include "common/FFlist.h" typedef struct FFKeyboardOptions { diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index ea5ea1781..ad78ae3ef 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/lm/lm.h" #include "modules/lm/lm.h" diff --git a/src/modules/lm/option.h b/src/modules/lm/option.h index c0ccd9147..21a4ad8b7 100644 --- a/src/modules/lm/option.h +++ b/src/modules/lm/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFLMOptions { diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index cb7874e24..4dc996737 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/stringUtils.h" #include "detection/loadavg/loadavg.h" #include "detection/cpu/cpu.h" #include "modules/loadavg/loadavg.h" diff --git a/src/modules/loadavg/option.h b/src/modules/loadavg/option.h index d5b57094f..947b310db 100644 --- a/src/modules/loadavg/option.h +++ b/src/modules/loadavg/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFLoadavgOptions { diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index d2151ed15..e9574773c 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/locale/locale.h" #include "modules/locale/locale.h" diff --git a/src/modules/locale/option.h b/src/modules/locale/option.h index 2f1efd722..236d61ee3 100644 --- a/src/modules/locale/option.h +++ b/src/modules/locale/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFLocaleOptions { diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 344e0a25b..35d0489bd 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/localip/localip.h" #include "modules/localip/localip.h" diff --git a/src/modules/localip/option.h b/src/modules/localip/option.h index 140d7c1f4..18205263c 100644 --- a/src/modules/localip/option.h +++ b/src/modules/localip/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFLocalIpType { diff --git a/src/modules/media/media.c b/src/modules/media/media.c index e667a2ef8..8540a2568 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/media/media.h" #include "modules/media/media.h" diff --git a/src/modules/media/option.h b/src/modules/media/option.h index 6565c94f1..e90ee854f 100644 --- a/src/modules/media/option.h +++ b/src/modules/media/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFMediaOptions { diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 10a21bc3b..e3e911666 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/memory/memory.h" #include "modules/memory/memory.h" diff --git a/src/modules/memory/option.h b/src/modules/memory/option.h index a73399281..243847f5f 100644 --- a/src/modules/memory/option.h +++ b/src/modules/memory/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFMemoryOptions { diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index f6b98d8dc..708441848 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "modules/monitor/monitor.h" diff --git a/src/modules/monitor/option.h b/src/modules/monitor/option.h index 2aff6e649..07905ecba 100644 --- a/src/modules/monitor/option.h +++ b/src/modules/monitor/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFMonitorOptions { diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c index 83d04b115..8495b1f37 100644 --- a/src/modules/mouse/mouse.c +++ b/src/modules/mouse/mouse.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/mouse/mouse.h" #include "modules/mouse/mouse.h" diff --git a/src/modules/mouse/option.h b/src/modules/mouse/option.h index 329e3644a..bea872c40 100644 --- a/src/modules/mouse/option.h +++ b/src/modules/mouse/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/FFlist.h" +#include "common/option.h" +#include "common/FFlist.h" typedef struct FFMouseOptions { diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 668248ba1..393d82013 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/netio/netio.h" #include "modules/netio/netio.h" diff --git a/src/modules/netio/option.h b/src/modules/netio/option.h index ba30d8b08..61ffa37d5 100644 --- a/src/modules/netio/option.h +++ b/src/modules/netio/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFNetIOOptions { diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index 829c98875..19e303cf7 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/opencl/opencl.h" #include "detection/gpu/gpu.h" #include "modules/opencl/opencl.h" diff --git a/src/modules/opencl/option.h b/src/modules/opencl/option.h index 0c020e140..2fd7dff26 100644 --- a/src/modules/opencl/option.h +++ b/src/modules/opencl/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFOpenCLOptions { diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 421ff5ef0..47e055af4 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/opengl/opengl.h" #include "modules/opengl/opengl.h" diff --git a/src/modules/opengl/option.h b/src/modules/opengl/option.h index aabd35262..cc4b6ef46 100644 --- a/src/modules/opengl/option.h +++ b/src/modules/opengl/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFOpenGLLibrary { diff --git a/src/modules/os/option.h b/src/modules/os/option.h index 2fff435ca..c7142b237 100644 --- a/src/modules/os/option.h +++ b/src/modules/os/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFOSOptions { diff --git a/src/modules/os/os.c b/src/modules/os/os.c index 5e6981194..0b3447ffe 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/option.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/option.h" +#include "common/stringUtils.h" #include "detection/os/os.h" #include "modules/os/os.h" diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h index d7a83b2fa..f39541388 100644 --- a/src/modules/packages/option.h +++ b/src/modules/packages/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef enum __attribute__((__packed__)) FFPackagesFlags { diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 59670ec95..c9d3d5580 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/packages/packages.h" #include "modules/packages/packages.h" diff --git a/src/modules/physicaldisk/option.h b/src/modules/physicaldisk/option.h index 8e65494e1..3951f0610 100644 --- a/src/modules/physicaldisk/option.h +++ b/src/modules/physicaldisk/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFPhysicalDiskOptions { diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index 8f66cebee..83de62739 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/temps.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/temps.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/physicaldisk/physicaldisk.h" #include "modules/physicaldisk/physicaldisk.h" diff --git a/src/modules/physicalmemory/option.h b/src/modules/physicalmemory/option.h index df41b4d5f..154354b4a 100644 --- a/src/modules/physicalmemory/option.h +++ b/src/modules/physicalmemory/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFPhysicalMemoryOptions { diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index 4798541ae..7f3e58e79 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/physicalmemory/physicalmemory.h" #include "modules/physicalmemory/physicalmemory.h" diff --git a/src/modules/player/option.h b/src/modules/player/option.h index 152253394..9d55821fd 100644 --- a/src/modules/player/option.h +++ b/src/modules/player/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFPlayerOptions { diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 37eca4d96..b79007a0c 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/media/media.h" #include "modules/player/player.h" diff --git a/src/modules/poweradapter/option.h b/src/modules/poweradapter/option.h index 96d37ded1..303bbba73 100644 --- a/src/modules/poweradapter/option.h +++ b/src/modules/poweradapter/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFPowerAdapterOptions { diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 93117b863..c192f8d06 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/poweradapter/poweradapter.h" #include "modules/poweradapter/poweradapter.h" diff --git a/src/modules/processes/option.h b/src/modules/processes/option.h index 4f11f77f6..0b59f9df3 100644 --- a/src/modules/processes/option.h +++ b/src/modules/processes/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFProcessesOptions { diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index 130bed411..4773f9e24 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/processes/processes.h" #include "modules/processes/processes.h" diff --git a/src/modules/publicip/option.h b/src/modules/publicip/option.h index c02d4450c..e3118cb28 100644 --- a/src/modules/publicip/option.h +++ b/src/modules/publicip/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFPublicIPOptions { diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 3c842c938..7b6691e98 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "modules/publicip/publicip.h" #include "detection/publicip/publicip.h" diff --git a/src/modules/separator/option.h b/src/modules/separator/option.h index b905f90fe..a8b31379d 100644 --- a/src/modules/separator/option.h +++ b/src/modules/separator/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFSeparatorOptions { diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index 1b7a898f6..a04ae8c36 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -1,9 +1,9 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" -#include "util/mallocHelper.h" -#include "util/wcwidth.h" -#include "util/textModifier.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" +#include "common/mallocHelper.h" +#include "common/wcwidth.h" +#include "common/textModifier.h" #include "logo/logo.h" #include "modules/separator/separator.h" diff --git a/src/modules/shell/option.h b/src/modules/shell/option.h index 5567ca970..49ec83f51 100644 --- a/src/modules/shell/option.h +++ b/src/modules/shell/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFShellOptions { diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index 0e6ef540e..388a2578d 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/terminalshell/terminalshell.h" #include "modules/shell/shell.h" diff --git a/src/modules/sound/option.h b/src/modules/sound/option.h index c5f25e5ef..0c9f0fd4f 100644 --- a/src/modules/sound/option.h +++ b/src/modules/sound/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef enum __attribute__((__packed__)) FFSoundType { diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index d5d12e55f..8a92242df 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -1,7 +1,7 @@ -#include "util/percent.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/percent.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/sound/sound.h" #include "modules/sound/sound.h" diff --git a/src/modules/swap/option.h b/src/modules/swap/option.h index 61f82935e..2d9691100 100644 --- a/src/modules/swap/option.h +++ b/src/modules/swap/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFSwapOptions { diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index d6a5d06c6..5ad50ff9d 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -1,8 +1,8 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/size.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/size.h" +#include "common/stringUtils.h" #include "detection/swap/swap.h" #include "modules/swap/swap.h" diff --git a/src/modules/terminal/option.h b/src/modules/terminal/option.h index 744c03a4e..49b005e03 100644 --- a/src/modules/terminal/option.h +++ b/src/modules/terminal/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFTerminalOptions { diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index dd8bbdf00..c9b6b0277 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/terminalshell/terminalshell.h" #include "modules/terminal/terminal.h" diff --git a/src/modules/terminalfont/option.h b/src/modules/terminalfont/option.h index 972341123..db652adce 100644 --- a/src/modules/terminalfont/option.h +++ b/src/modules/terminalfont/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFTerminalFontOptions { diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 4cdf30085..808a35146 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/terminalfont/terminalfont.h" #include "modules/terminalfont/terminalfont.h" diff --git a/src/modules/terminalsize/option.h b/src/modules/terminalsize/option.h index ec9f221ff..518856a8c 100644 --- a/src/modules/terminalsize/option.h +++ b/src/modules/terminalsize/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFTerminalSizeOptions { diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index ed380e7b4..d0e04af93 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/terminalsize/terminalsize.h" #include "modules/terminalsize/terminalsize.h" diff --git a/src/modules/terminaltheme/option.h b/src/modules/terminaltheme/option.h index d2a55bf20..3d8cdc252 100644 --- a/src/modules/terminaltheme/option.h +++ b/src/modules/terminaltheme/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFTerminalThemeOptions { diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index 2ffb37ee9..1272d1267 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/terminaltheme/terminaltheme.h" #include "modules/terminaltheme/terminaltheme.h" diff --git a/src/modules/theme/option.h b/src/modules/theme/option.h index 614c24626..ca232bfb9 100644 --- a/src/modules/theme/option.h +++ b/src/modules/theme/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFThemeOptions { diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 8a31f89b6..470babf22 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/theme/theme.h" #include "modules/theme/theme.h" diff --git a/src/modules/title/option.h b/src/modules/title/option.h index 99b29a2f5..16505d39b 100644 --- a/src/modules/title/option.h +++ b/src/modules/title/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFTitleOptions { diff --git a/src/modules/title/title.c b/src/modules/title/title.c index 04ad37c37..d846b2817 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/textModifier.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/textModifier.h" #include "modules/title/title.h" static void appendText(FFstrbuf* output, const FFstrbuf* text, const FFstrbuf* color) diff --git a/src/modules/tpm/option.h b/src/modules/tpm/option.h index a7c0ca7d2..19fb79029 100644 --- a/src/modules/tpm/option.h +++ b/src/modules/tpm/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFTPMOptions { diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c index 5c5d31960..8ab9e12df 100644 --- a/src/modules/tpm/tpm.c +++ b/src/modules/tpm/tpm.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/tpm/tpm.h" #include "modules/tpm/tpm.h" diff --git a/src/modules/uptime/option.h b/src/modules/uptime/option.h index ae92d600a..4235995c5 100644 --- a/src/modules/uptime/option.h +++ b/src/modules/uptime/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFUptimeOptions { diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index d3184865a..5d4b5d2e3 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -1,8 +1,8 @@ -#include "util/duration.h" -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/time.h" -#include "util/stringUtils.h" +#include "common/duration.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/time.h" +#include "common/stringUtils.h" #include "detection/uptime/uptime.h" #include "modules/uptime/uptime.h" diff --git a/src/modules/users/option.h b/src/modules/users/option.h index 151395209..16ea5e88f 100644 --- a/src/modules/users/option.h +++ b/src/modules/users/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFUsersOptions { diff --git a/src/modules/users/users.c b/src/modules/users/users.c index a089231ab..7169b7bda 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -1,7 +1,7 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/time.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/time.h" +#include "common/stringUtils.h" #include "detection/users/users.h" #include "modules/users/users.h" diff --git a/src/modules/version/option.h b/src/modules/version/option.h index 8f528ea18..f3b68b4f2 100644 --- a/src/modules/version/option.h +++ b/src/modules/version/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFVersionOptions { diff --git a/src/modules/version/version.c b/src/modules/version/version.c index a12e330ba..2e21f8645 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/libc/libc.h" #include "detection/version/version.h" #include "modules/version/version.h" diff --git a/src/modules/vulkan/option.h b/src/modules/vulkan/option.h index faf22440e..38ec20c99 100644 --- a/src/modules/vulkan/option.h +++ b/src/modules/vulkan/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFVulkanOptions { diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index 2f2629a6a..69d1884ba 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/gpu/gpu.h" #include "detection/vulkan/vulkan.h" #include "modules/vulkan/vulkan.h" diff --git a/src/modules/wallpaper/option.h b/src/modules/wallpaper/option.h index b19f06987..621699fa3 100644 --- a/src/modules/wallpaper/option.h +++ b/src/modules/wallpaper/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFWallpaperOptions { diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index e8da5ecfe..76de9577b 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/wallpaper/wallpaper.h" #include "modules/wallpaper/wallpaper.h" diff --git a/src/modules/weather/option.h b/src/modules/weather/option.h index 73089f637..76c3df11b 100644 --- a/src/modules/weather/option.h +++ b/src/modules/weather/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFWeatherOptions { diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 9f4a9b9ca..3321c7dba 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/weather/weather.h" #include "modules/weather/weather.h" diff --git a/src/modules/wifi/option.h b/src/modules/wifi/option.h index 913980c3e..f74579267 100644 --- a/src/modules/wifi/option.h +++ b/src/modules/wifi/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFWifiOptions { diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index c37d75adf..16df168c5 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/wifi/wifi.h" #include "modules/wifi/wifi.h" diff --git a/src/modules/wm/option.h b/src/modules/wm/option.h index 0165280f1..d213c9c3a 100644 --- a/src/modules/wm/option.h +++ b/src/modules/wm/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFWMOptions { diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 49b117fb5..fbfa6c10b 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/displayserver/displayserver.h" #include "detection/wm/wm.h" #include "modules/wm/wm.h" diff --git a/src/modules/wmtheme/option.h b/src/modules/wmtheme/option.h index c1113c26c..b12f9f8b3 100644 --- a/src/modules/wmtheme/option.h +++ b/src/modules/wmtheme/option.h @@ -1,6 +1,6 @@ #pragma once -#include "util/option.h" +#include "common/option.h" typedef struct FFWMThemeOptions { diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index c82a6f30b..0289307dc 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -1,6 +1,6 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" #include "detection/wmtheme/wmtheme.h" #include "modules/wmtheme/wmtheme.h" diff --git a/src/modules/zpool/option.h b/src/modules/zpool/option.h index 00f57fae8..49522b3be 100644 --- a/src/modules/zpool/option.h +++ b/src/modules/zpool/option.h @@ -1,7 +1,7 @@ #pragma once -#include "util/option.h" -#include "util/percent.h" +#include "common/option.h" +#include "common/percent.h" typedef struct FFZpoolOptions { diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index f615695bf..9c02dfabe 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -1,9 +1,9 @@ -#include "util/printing.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/size.h" -#include "util/FFstrbuf.h" -#include "util/stringUtils.h" +#include "common/printing.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/size.h" +#include "common/FFstrbuf.h" +#include "common/stringUtils.h" #include "detection/zpool/zpool.h" #include "modules/zpool/zpool.h" diff --git a/src/options/display.c b/src/options/display.c index fb1533319..ef891a589 100644 --- a/src/options/display.c +++ b/src/options/display.c @@ -1,8 +1,8 @@ #include "fastfetch.h" -#include "util/color.h" -#include "util/jsonconfig.h" -#include "util/percent.h" -#include "util/stringUtils.h" +#include "common/color.h" +#include "common/jsonconfig.h" +#include "common/percent.h" +#include "common/stringUtils.h" #include "options/display.h" #include diff --git a/src/options/display.h b/src/options/display.h index 5a98309d9..655ff1110 100644 --- a/src/options/display.h +++ b/src/options/display.h @@ -1,8 +1,8 @@ #pragma once -#include "util/percent.h" -#include "util/FFstrbuf.h" -#include "util/FFlist.h" +#include "common/percent.h" +#include "common/FFstrbuf.h" +#include "common/FFlist.h" typedef enum __attribute__((__packed__)) FFSizeBinaryPrefixType { diff --git a/src/options/general.c b/src/options/general.c index c1a22e7e1..c6daa4c13 100644 --- a/src/options/general.c +++ b/src/options/general.c @@ -1,7 +1,7 @@ #include "fastfetch.h" -#include "util/jsonconfig.h" -#include "util/processing.h" -#include "util/stringUtils.h" +#include "common/jsonconfig.h" +#include "common/processing.h" +#include "common/stringUtils.h" #include "options/general.h" #include diff --git a/src/options/general.h b/src/options/general.h index 0edcfeb2d..5eda69e9c 100644 --- a/src/options/general.h +++ b/src/options/general.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" typedef enum __attribute__((__packed__)) FFDsForceDrmType { diff --git a/src/options/logo.c b/src/options/logo.c index 5b49e061c..1a5693f29 100644 --- a/src/options/logo.c +++ b/src/options/logo.c @@ -1,7 +1,7 @@ #include "logo/logo.h" -#include "util/jsonconfig.h" -#include "util/stringUtils.h" +#include "common/jsonconfig.h" +#include "common/stringUtils.h" void ffOptionsInitLogo(FFOptionsLogo* options) { diff --git a/src/options/logo.h b/src/options/logo.h index 94dd2a95b..1d85663b3 100644 --- a/src/options/logo.h +++ b/src/options/logo.h @@ -1,6 +1,6 @@ #pragma once -#include "util/FFstrbuf.h" +#include "common/FFstrbuf.h" #define FASTFETCH_LOGO_MAX_NAMES 9 #define FASTFETCH_LOGO_MAX_COLORS 9 //two digits would make parsing much more complicated (index 1 - 9) diff --git a/tests/color.c b/tests/color.c index 430317bb9..d000c2f53 100644 --- a/tests/color.c +++ b/tests/color.c @@ -1,5 +1,5 @@ -#include "util/format.h" -#include "util/textModifier.h" +#include "common/format.h" +#include "common/textModifier.h" #include "fastfetch.h" #include diff --git a/tests/duration.c b/tests/duration.c index 24b3c5fe5..a8f2aacea 100644 --- a/tests/duration.c +++ b/tests/duration.c @@ -1,5 +1,5 @@ -#include "util/duration.h" -#include "util/textModifier.h" +#include "common/duration.h" +#include "common/textModifier.h" #include "fastfetch.h" #include diff --git a/tests/format.c b/tests/format.c index df0b58b4e..1606ba885 100644 --- a/tests/format.c +++ b/tests/format.c @@ -1,5 +1,5 @@ -#include "util/format.h" -#include "util/textModifier.h" +#include "common/format.h" +#include "common/textModifier.h" #include "fastfetch.h" #include diff --git a/tests/list.c b/tests/list.c index c7c1752eb..70a5739b2 100644 --- a/tests/list.c +++ b/tests/list.c @@ -1,5 +1,5 @@ -#include "util/FFlist.h" -#include "util/textModifier.h" +#include "common/FFlist.h" +#include "common/textModifier.h" #include #include diff --git a/tests/strbuf.c b/tests/strbuf.c index 466fb9297..7e8058018 100644 --- a/tests/strbuf.c +++ b/tests/strbuf.c @@ -1,5 +1,5 @@ -#include "util/FFstrbuf.h" -#include "util/textModifier.h" +#include "common/FFstrbuf.h" +#include "common/textModifier.h" #include #include From 6ded0f9bb0523b5d441d34a2f4ec749ba0520f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 6 Jan 2026 10:02:44 +0800 Subject: [PATCH 32/67] CMake: fixes building --- CMakeLists.txt | 26 +++++++++++++------------- src/common/impl/wcwidth.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 028eba917..14a8496e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,7 +342,7 @@ fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE) configure_file(src/fastfetch_config.h.in fastfetch_config.h @ONLY) configure_file(src/fastfetch_datatext.h.in fastfetch_datatext.h @ONLY) if(APPLE) - configure_file(src/common/impl/apple/Info.plist.in Info.plist @ONLY) + configure_file(src/common/apple/Info.plist.in Info.plist @ONLY) endif() #################### @@ -924,11 +924,11 @@ elseif(APPLE) src/common/impl/networking_linux.c src/common/impl/processing_linux.c src/common/impl/sysctl.c - src/common/impl/apple/cf_helpers.c - src/common/impl/apple/osascript.m - src/common/impl/apple/smc_temps.c src/common/impl/FFPlatform_unix.c src/common/impl/binary_apple.c + src/common/apple/cf_helpers.c + src/common/apple/osascript.m + src/common/apple/smc_temps.c src/detection/battery/battery_apple.c src/detection/bios/bios_apple.c src/detection/bluetooth/bluetooth_apple.m @@ -994,15 +994,15 @@ elseif(WIN32) src/common/impl/netif_windows.c src/common/impl/networking_windows.c src/common/impl/processing_windows.c - src/common/impl/windows/getline.c - src/common/impl/windows/com.cpp - src/common/impl/windows/registry.c - src/common/impl/windows/unicode.c - src/common/impl/windows/wmi.cpp - src/common/impl/windows/version.c src/common/impl/FFPlatform_windows.c src/common/impl/binary_windows.c src/common/impl/debug_windows.c + src/common/windows/getline.c + src/common/windows/com.cpp + src/common/windows/registry.c + src/common/windows/unicode.c + src/common/windows/wmi.cpp + src/common/windows/version.c src/detection/battery/battery_windows.c src/detection/bios/bios_windows.c src/detection/bluetooth/bluetooth_windows.c @@ -1151,7 +1151,7 @@ elseif(Haiku) src/common/impl/processing_linux.c src/common/impl/FFPlatform_unix.c src/common/impl/binary_linux.c - src/common/impl/haiku/version.cpp + src/common/haiku/version.cpp src/detection/battery/battery_haiku.c src/detection/bios/bios_windows.c src/detection/board/board_windows.c @@ -1881,7 +1881,7 @@ set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C) if(WIN32) target_sources(fastfetch - PRIVATE src/common/impl/windows/version.rc + PRIVATE src/common/windows/version.rc ) elseif(APPLE) target_link_options(fastfetch @@ -1909,7 +1909,7 @@ if (BUILD_FLASHFETCH) if(WIN32) target_sources(flashfetch - PRIVATE src/common/impl/windows/version.rc + PRIVATE src/common/windows/version.rc ) elseif(APPLE) target_link_options(flashfetch diff --git a/src/common/impl/wcwidth.c b/src/common/impl/wcwidth.c index 38f20099e..5cad57ef6 100644 --- a/src/common/impl/wcwidth.c +++ b/src/common/impl/wcwidth.c @@ -1,4 +1,4 @@ -#include "wcwidth.h" +#include "common/wcwidth.h" #include "3rdparty/widecharwidth/widechar_width_c.h" int mk_wcwidth(uint32_t wc) From 1be90084ab93f47f931f0d153fe7db9f9e19e3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 6 Jan 2026 15:33:12 +0800 Subject: [PATCH 33/67] Networking: fixes some issues and memory leaks --- src/common/impl/networking_common.c | 20 ++++---- src/common/impl/networking_linux.c | 70 ++++++++++++++------------ src/common/impl/networking_windows.c | 75 ++++++++++++++++++++-------- src/common/networking.h | 2 +- 4 files changed, 103 insertions(+), 64 deletions(-) diff --git a/src/common/impl/networking_common.c b/src/common/impl/networking_common.c index 7cb1bc4ad..939f2e627 100644 --- a/src/common/impl/networking_common.c +++ b/src/common/impl/networking_common.c @@ -12,7 +12,6 @@ struct FFZlibLibrary FF_LIBRARY_SYMBOL(inflateInit2_) FF_LIBRARY_SYMBOL(inflate) FF_LIBRARY_SYMBOL(inflateEnd) - FF_LIBRARY_SYMBOL(inflateGetHeader) bool inited; } zlibData; @@ -32,7 +31,6 @@ const char* ffNetworkingLoadZlibLibrary(void) FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(zlib, zlibData, inflateInit2_) FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(zlib, zlibData, inflate) FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(zlib, zlibData, inflateEnd) - FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(zlib, zlibData, inflateGetHeader) zlib = NULL; // don't auto dlclose } return zlibData.ffinflateEnd == NULL ? "Failed to load libz" : NULL; @@ -69,6 +67,8 @@ static uint32_t guessGzipOutputSize(const void* data, uint32_t dataSize) // Decompress gzip content bool ffNetworkingDecompressGzip(FFstrbuf* buffer, char* headerEnd) { + assert(headerEnd != NULL && *headerEnd == '\r'); + // Calculate header size uint32_t headerSize = (uint32_t) (headerEnd - buffer->chars); @@ -86,15 +86,15 @@ bool ffNetworkingDecompressGzip(FFstrbuf* buffer, char* headerEnd) const char* bodyStart = headerEnd + 4; // Skip delimiter - // Calculate compressed content size - uint32_t compressedSize = buffer->length - headerSize - 4; - - if (compressedSize <= 0) { + if (buffer->length <= headerSize + 4) { // No content to decompress FF_DEBUG("Compressed content size is 0, skipping decompression"); return true; } + // Calculate compressed content size + uint32_t compressedSize = buffer->length - headerSize - 4; + // Check if content is actually in gzip format (gzip header magic is 0x1f 0x8b) if (compressedSize < 2 || (uint8_t)bodyStart[0] != 0x1f || (uint8_t)bodyStart[1] != 0x8b) { FF_DEBUG("Content is not valid gzip format, skipping decompression"); @@ -137,7 +137,7 @@ bool ffNetworkingDecompressGzip(FFstrbuf* buffer, char* headerEnd) // Save already decompressed data amount uint32_t alreadyDecompressed = (uint32_t)(availableOut - zs.avail_out); decompressedBuffer.length += alreadyDecompressed; - decompressedBuffer.chars[decompressedBuffer.length] = '\0'; // Ensure null-terminated string + decompressedBuffer.chars[decompressedBuffer.length] = '\0'; ffStrbufEnsureFree(&decompressedBuffer, decompressedBuffer.length / 2); @@ -155,7 +155,7 @@ bool ffNetworkingDecompressGzip(FFstrbuf* buffer, char* headerEnd) // Calculate decompressed size uint32_t decompressedSize = (uint32_t)(availableOut - zs.avail_out); decompressedBuffer.length += decompressedSize; - decompressedBuffer.chars[decompressedSize] = '\0'; // Ensure null-terminated string + decompressedBuffer.chars[decompressedBuffer.length] = '\0'; FF_DEBUG("Successfully decompressed %u bytes compressed data to %u bytes", compressedSize, decompressedBuffer.length); // Modify Content-Length header and remove Content-Encoding header @@ -171,7 +171,7 @@ bool ffNetworkingDecompressGzip(FFstrbuf* buffer, char* headerEnd) } else if (ffStrStartsWithIgnCase(line, "Content-Length:")) { - ffStrbufAppendF(&newBuffer, "Content-Length: %u\r\n", decompressedSize); + ffStrbufAppendF(&newBuffer, "Content-Length: %u\r\n", decompressedBuffer.length); continue; } else if (line[0] == '\r') @@ -181,7 +181,7 @@ bool ffNetworkingDecompressGzip(FFstrbuf* buffer, char* headerEnd) break; } - ffStrbufAppendS(&newBuffer, line); + ffStrbufAppendS(&newBuffer, line); // Including the trailing \r ffStrbufAppendC(&newBuffer, '\n'); } diff --git a/src/common/impl/networking_linux.c b/src/common/impl/networking_linux.c index e90e243d4..4d469e8e1 100644 --- a/src/common/impl/networking_linux.c +++ b/src/common/impl/networking_linux.c @@ -34,11 +34,7 @@ static const char* tryNonThreadingFastPath(FFNetworkingState* state) #ifndef __APPLE__ // On macOS, TCP_FASTOPEN doesn't seem to be needed // Set TCP Fast Open - #if __linux__ || __GNU__ - int flag = 5; // the queue length of pending packets - #else - int flag = 1; // enable TCP Fast Open - #endif + int flag = 1; if (setsockopt(state->sockfd, IPPROTO_TCP, #ifdef __APPLE__ // https://github.com/rust-lang/libc/pull/3135 @@ -186,15 +182,12 @@ static const char* initNetworkingState(FFNetworkingState* state, const char* hos FF_DEBUG("Initializing network connection state: host=%s, path=%s", host, path); // Initialize command and host information - ffStrbufInitA(&state->command, 64); + ffStrbufInitA(&state->command, 128); ffStrbufAppendS(&state->command, "GET "); ffStrbufAppendS(&state->command, path); - ffStrbufAppendS(&state->command, " HTTP/1.0\nHost: "); + ffStrbufAppendS(&state->command, " HTTP/1.0\r\nHost: "); ffStrbufAppendS(&state->command, host); - ffStrbufAppendS(&state->command, "\r\n"); - - // Add extra optimized HTTP headers - ffStrbufAppendS(&state->command, "Connection: close\r\n"); // Explicitly tell the server we don't need to keep the connection + ffStrbufAppendS(&state->command, "\r\nConnection: close\r\n"); // Explicitly tell the server we don't need to keep the connection // If compression needs to be enabled if (state->compression) { @@ -221,9 +214,10 @@ static const char* initNetworkingState(FFNetworkingState* state, const char* hos FF_DEBUG("Resolving address: %s (%s)", host, state->ipv6 ? "IPv6" : "IPv4"); // Use AI_NUMERICSERV flag to indicate the service is a numeric port, reducing parsing time - if(getaddrinfo(host, "80", &hints, &state->addr) != 0) + int gaiRes = getaddrinfo(host, "80", &hints, &state->addr); + if(gaiRes != 0) { - FF_DEBUG("getaddrinfo() failed: %s", gai_strerror(errno)); + FF_DEBUG("getaddrinfo() failed: %s (res=%d)", gai_strerror(gaiRes), gaiRes); ret = "getaddrinfo() failed"; goto error; } @@ -360,6 +354,7 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer) { + assert(buffer->allocated > 0); FF_DEBUG("Preparing to receive HTTP response"); uint32_t timeout = state->timeout; @@ -390,15 +385,25 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf // poll for the socket to be readable. // Because of the non-blocking connectx() call, the connection might not be established yet FF_DEBUG("Using poll() to check if socket is readable"); - if (poll(&(struct pollfd) { - .fd = state->sockfd, - .events = POLLIN - }, 1, timeout > 0 ? (int) timeout : -1) == -1) { - FF_DEBUG("poll() failed: %s (errno=%d)", strerror(errno), errno); - close(state->sockfd); - state->sockfd = -1; - return "poll() failed"; + int pollRes = poll(&(struct pollfd) { + .fd = state->sockfd, + .events = POLLIN + }, 1, timeout > 0 ? (int) timeout : -1); + if (pollRes == 0) + { + FF_DEBUG("poll() timed out after %u ms", timeout); + close(state->sockfd); + state->sockfd = -1; + return "poll() timeout"; + } + else if (pollRes == -1) + { + FF_DEBUG("poll() failed: %s (errno=%d)", strerror(errno), errno); + close(state->sockfd); + state->sockfd = -1; + return "poll() failed"; + } } FF_DEBUG("Socket is readable, proceeding to receive data"); #else @@ -415,12 +420,14 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf FF_DEBUG("Starting data reception"); FF_MAYBE_UNUSED int recvCount = 0; uint32_t contentLength = 0; - char* headerEnd = NULL; + uint32_t headerEnd = 0; do { FF_DEBUG("Data reception loop #%d, current buffer size: %u, available space: %u", ++recvCount, buffer->length, ffStrbufGetFree(buffer)); + // We set `Connection: close`, so the server will close the connection when done. + // Thus we can use MSG_WAITALL to wait until the buffer is full or the connection is closed. ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, ffStrbufGetFree(buffer), MSG_WAITALL); if (received <= 0) { @@ -438,10 +445,11 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf FF_DEBUG("Successfully received %zd bytes of data, total: %u bytes", received, buffer->length); // Check if HTTP header end marker is found - if (headerEnd == NULL) { - headerEnd = memmem(buffer->chars, buffer->length, "\r\n\r\n", 4); - if (headerEnd != NULL) { - FF_DEBUG("Found HTTP header end marker, position: %ld", (long)(headerEnd - buffer->chars)); + if (headerEnd == 0) { + char* pHeaderEnd = memmem(buffer->chars, buffer->length, "\r\n\r\n", 4); + if (pHeaderEnd) { + headerEnd = (uint32_t)(pHeaderEnd - buffer->chars); + FF_DEBUG("Found HTTP header end marker, position: %u", headerEnd); // Check for Content-Length header to pre-allocate enough memory const char* clHeader = strcasestr(buffer->chars, "Content-Length:"); @@ -451,7 +459,7 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf FF_DEBUG("Detected Content-Length: %u, pre-allocating buffer", contentLength); // Ensure buffer is large enough, adding header size and some margin ffStrbufEnsureFree(buffer, contentLength + 16); - FF_DEBUG("Extended receive buffer to %u bytes", buffer->length); + FF_DEBUG("Extended receive buffer to %u bytes", buffer->allocated); } } } @@ -467,12 +475,12 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf return "Empty server response received"; } - if (headerEnd == NULL) { + if (headerEnd == 0) { FF_DEBUG("No HTTP header end marker found"); return "No HTTP header end found"; } - if (contentLength > 0 && buffer->length != contentLength + (uint32_t)(headerEnd - buffer->chars) + 4) { - FF_DEBUG("Received content length mismatches: %u != %u", buffer->length, contentLength + (uint32_t)(headerEnd - buffer->chars) + 4); + if (contentLength > 0 && buffer->length != contentLength + headerEnd + 4) { + FF_DEBUG("Received content length mismatches: %u != %u", buffer->length, contentLength + headerEnd + 4); return "Content length mismatch"; } @@ -487,7 +495,7 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf #ifdef FF_HAVE_ZLIB if (state->compression) { FF_DEBUG("Content received, checking if compressed"); - if (!ffNetworkingDecompressGzip(buffer, headerEnd)) { + if (!ffNetworkingDecompressGzip(buffer, buffer->chars + headerEnd)) { FF_DEBUG("Decompression failed or invalid compression format"); return "Failed to decompress or invalid format"; } else { diff --git a/src/common/impl/networking_windows.c b/src/common/impl/networking_windows.c index 3131e770b..68094ce49 100644 --- a/src/common/impl/networking_windows.c +++ b/src/common/impl/networking_windows.c @@ -19,6 +19,7 @@ static const char* initWsaData(WSADATA* wsaData) if(LOBYTE(wsaData->wVersion) != 2 || HIBYTE(wsaData->wVersion) != 2) { FF_DEBUG("Invalid wsaData version found: %d.%d", LOBYTE(wsaData->wVersion), HIBYTE(wsaData->wVersion)); + WSACleanup(); return "Invalid wsaData version found"; } @@ -26,6 +27,7 @@ static const char* initWsaData(WSADATA* wsaData) SOCKET sockfd = socket(AF_INET, SOCK_STREAM, 0); if(sockfd == INVALID_SOCKET) { FF_DEBUG("socket(AF_INET, SOCK_STREAM) failed"); + WSACleanup(); return "socket(AF_INET, SOCK_STREAM) failed"; } @@ -36,6 +38,8 @@ static const char* initWsaData(WSADATA* wsaData) &ConnectEx, sizeof(ConnectEx), &dwBytes, NULL, NULL) != 0) { FF_DEBUG("WSAIoctl(sockfd, SIO_GET_EXTENSION_FUNCTION_POINTER) failed"); + closesocket(sockfd); + WSACleanup(); return "WSAIoctl(sockfd, SIO_GET_EXTENSION_FUNCTION_POINTER) failed"; } @@ -145,25 +149,26 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho } // Initialize overlapped structure for asynchronous I/O - memset(&state->overlapped, 0, sizeof(OVERLAPPED)); + state->overlapped = (OVERLAPPED){ + .hEvent = CreateEventW(NULL, FALSE, FALSE, NULL) + }; // Build HTTP command - FF_STRBUF_AUTO_DESTROY command = ffStrbufCreateA(64); - ffStrbufAppendS(&command, "GET "); - ffStrbufAppendS(&command, path); - ffStrbufAppendS(&command, " HTTP/1.0\nHost: "); - ffStrbufAppendS(&command, host); - ffStrbufAppendS(&command, "\r\n"); - ffStrbufAppendS(&command, "Connection: close\r\n"); // Explicitly request connection closure + ffStrbufInitA(&state->command, 128); + ffStrbufAppendS(&state->command, "GET "); + ffStrbufAppendS(&state->command, path); + ffStrbufAppendS(&state->command, " HTTP/1.0\r\nHost: "); + ffStrbufAppendS(&state->command, host); + ffStrbufAppendS(&state->command, "\r\nConnection: close\r\n"); // Explicitly request connection closure // Add compression support if enabled if (state->compression) { FF_DEBUG("Enabling HTTP content compression"); - ffStrbufAppendS(&command, "Accept-Encoding: gzip\r\n"); + ffStrbufAppendS(&state->command, "Accept-Encoding: gzip\r\n"); } - ffStrbufAppendS(&command, headers); - ffStrbufAppendS(&command, "\r\n"); + ffStrbufAppendS(&state->command, headers); + ffStrbufAppendS(&state->command, "\r\n"); #ifdef TCP_FASTOPEN if (state->tfo) @@ -182,10 +187,10 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho } #endif - FF_DEBUG("Using ConnectEx to send %u bytes of data", command.length); + FF_DEBUG("Using ConnectEx to send %u bytes of data", state->command.length); DWORD sent = 0; BOOL result = ConnectEx(state->sockfd, addr->ai_addr, (int)addr->ai_addrlen, - command.chars, command.length, &sent, &state->overlapped); + state->command.chars, state->command.length, &sent, &state->overlapped); freeaddrinfo(addr); addr = NULL; @@ -195,8 +200,10 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho if (WSAGetLastError() != WSA_IO_PENDING) { FF_DEBUG("ConnectEx() failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); + CloseHandle(state->overlapped.hEvent); closesocket(state->sockfd); state->sockfd = INVALID_SOCKET; + ffStrbufDestroy(&state->command); return "ConnectEx() failed"; } else @@ -215,6 +222,7 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer) { + assert(buffer->allocated > 0); FF_DEBUG("Preparing to receive HTTP response"); if (state->sockfd == INVALID_SOCKET) @@ -227,11 +235,13 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf if (timeout > 0) { FF_DEBUG("WaitForSingleObject with timeout: %u ms", timeout); - if (WaitForSingleObject((HANDLE)state->sockfd, timeout) != WAIT_OBJECT_0) + if (WaitForSingleObject(state->overlapped.hEvent, timeout) != WAIT_OBJECT_0) { FF_DEBUG("WaitForSingleObject failed or timed out"); CancelIo((HANDLE) state->sockfd); + CloseHandle(state->overlapped.hEvent); closesocket(state->sockfd); + ffStrbufDestroy(&state->command); return "WaitForSingleObject(state->sockfd) failed or timeout"; } } @@ -241,8 +251,20 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf { FF_DEBUG("WSAGetOverlappedResult failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); closesocket(state->sockfd); + CloseHandle(state->overlapped.hEvent); + ffStrbufDestroy(&state->command); return "WSAGetOverlappedResult() failed"; } + FF_DEBUG("WSAGetOverlappedResult succeeded, %u bytes sent", (unsigned) transfer); + ffStrbufDestroy(&state->command); + CloseHandle(state->overlapped.hEvent); + state->overlapped.hEvent = NULL; + + if (setsockopt(state->sockfd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0) != 0) + { + FF_DEBUG("Failed to update connect context: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); + // Not a critical error, continue anyway + } if(timeout > 0) { @@ -252,12 +274,16 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf // Set larger receive buffer for better performance int rcvbuf = 65536; // 64KB - setsockopt(state->sockfd, SOL_SOCKET, SO_RCVBUF, (const char*)&rcvbuf, sizeof(rcvbuf)); + if (setsockopt(state->sockfd, SOL_SOCKET, SO_RCVBUF, (const char*)&rcvbuf, sizeof(rcvbuf))) + { + FF_DEBUG("Failed to set SO_RCVBUF: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); + // Not a critical error, continue anyway + } FF_DEBUG("Starting data reception"); FF_MAYBE_UNUSED int recvCount = 0; uint32_t contentLength = 0; - char* headerEnd = NULL; + uint32_t headerEnd = 0; do { FF_DEBUG("Data reception loop #%d, current buffer size: %u, available space: %u", @@ -280,10 +306,11 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf FF_DEBUG("Successfully received %zd bytes of data, total: %u bytes", received, buffer->length); // Check if HTTP header end marker is found - if (headerEnd == NULL) { - headerEnd = strstr(buffer->chars, "\r\n\r\n"); - if (headerEnd != NULL) { - FF_DEBUG("Found HTTP header end marker, position: %ld", (long)(headerEnd - buffer->chars)); + if (headerEnd == 0) { + char* pHeaderEnd = strstr(buffer->chars, "\r\n\r\n"); + if (pHeaderEnd) { + headerEnd = (uint32_t)(pHeaderEnd - buffer->chars); + FF_DEBUG("Found HTTP header end marker, position: %u", headerEnd); // Check for Content-Length header to pre-allocate enough memory const char* clHeader = strcasestr(buffer->chars, "Content-Length:"); @@ -309,10 +336,14 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf return "Empty server response received"; } - if (headerEnd == NULL) { + if (headerEnd == 0) { FF_DEBUG("No HTTP header end marker found"); return "No HTTP header end found"; } + if (contentLength > 0 && buffer->length != contentLength + headerEnd + 4) { + FF_DEBUG("Received content length mismatches: %u != %u", buffer->length, contentLength + headerEnd + 4); + return "Content length mismatch"; + } if (ffStrbufStartsWithS(buffer, "HTTP/1.0 200 OK\r\n")) { FF_DEBUG("Received valid HTTP 200 response, content length: %u bytes, total length: %u bytes", @@ -326,7 +357,7 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf #ifdef FF_HAVE_ZLIB if (state->compression) { FF_DEBUG("Content received, checking if compressed"); - if (!ffNetworkingDecompressGzip(buffer, headerEnd)) { + if (!ffNetworkingDecompressGzip(buffer, buffer->chars + headerEnd)) { FF_DEBUG("Decompression failed or invalid compression format"); return "Failed to decompress or invalid format"; } else { diff --git a/src/common/networking.h b/src/common/networking.h index d3285e2aa..91428b705 100644 --- a/src/common/networking.h +++ b/src/common/networking.h @@ -15,7 +15,6 @@ typedef struct FFNetworkingState { OVERLAPPED overlapped; #else int sockfd; - FFstrbuf command; struct addrinfo* addr; #ifdef FF_HAVE_THREADS @@ -23,6 +22,7 @@ typedef struct FFNetworkingState { #endif #endif + FFstrbuf command; uint32_t timeout; bool ipv6; bool compression; // if true, HTTP content compression will be enabled if supported From e2ee24598cc54594d994a2861f4bd66b19c0a8d9 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 6 Jan 2026 18:49:52 +0800 Subject: [PATCH 34/67] Zpool: add "Is read-only" option to module info --- src/modules/zpool/zpool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index 9c02dfabe..7fc3b8c8d 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -223,5 +223,6 @@ FFModuleBaseInfo ffZpoolModuleInfo = { {"Size used percentage bar", "used-percentage-bar"}, {"Size allocated percentage bar", "allocated-percentage-bar"}, {"Fragmentation percentage bar", "fragmentation-percentage-bar"}, + {"Is read-only", "is-readonly"}, })) }; From 977e3f317ee1bce75ce3083bfb0cd5170e806b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 6 Jan 2026 19:59:02 +0800 Subject: [PATCH 35/67] Uptime (Windows): improves accurancy on Windows 10 and later --- src/detection/uptime/uptime_windows.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c index 6978a1163..0554348ec 100644 --- a/src/detection/uptime/uptime_windows.c +++ b/src/detection/uptime/uptime_windows.c @@ -1,11 +1,28 @@ #include "uptime.h" #include "common/time.h" +#include "common/library.h" +#include #include const char* ffDetectUptime(FFUptimeResult* result) { + HMODULE hKernelBase = GetModuleHandleW(L"KernelBase.dll"); + if (__builtin_expect(!!hKernelBase, true)) + { + FF_LIBRARY_LOAD_SYMBOL_LAZY(hKernelBase, QueryInterruptTime); + if (ffQueryInterruptTime) // Windows 10 and later + { + uint64_t uptime; + ffQueryInterruptTime(&uptime); + result->uptime = uptime / 10000; // Convert from 100-nanosecond intervals to milliseconds + goto ok; + } + } + result->uptime = GetTickCount64(); + +ok: result->bootTime = ffTimeGetNow() - result->uptime; return NULL; } From 981ae6bdd143aae22fa41c73fd18a64923ef8c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 6 Jan 2026 20:21:03 +0800 Subject: [PATCH 36/67] GPU: improves error handling and add case-insensitive PCI ID parsing --- src/detection/gpu/gpu_windows.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index abaf843c7..c114a16ce 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -47,14 +47,12 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* DEVINST devInst = 0; + if (CM_Locate_DevNodeW(&devInst, devId, CM_LOCATE_DEVNODE_NORMAL) != CR_SUCCESS) { - if (CM_Locate_DevNodeW(&devInst, devId, CM_LOCATE_DEVNODE_NORMAL) != CR_SUCCESS) - { - FF_DEBUG("Failed to get device instance ID or locate device node"); - continue; - } - FF_DEBUG("Device instance ID: %lu", devInst); + FF_DEBUG("Failed to get device instance ID or locate device node"); + continue; } + FF_DEBUG("Device instance ID: %lu", devInst); FFGPUResult* gpu = (FFGPUResult*)ffListAdd(gpus); deviceCount++; @@ -75,7 +73,10 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpu->frequency = FF_GPU_FREQUENCY_UNSET; unsigned vendorId = 0, deviceId = 0, subSystemId = 0, revId = 0; - if (swscanf(devId, L"PCI\\VEN_%x&DEV_%x&SUBSYS_%x&REV_%x", &vendorId, &deviceId, &subSystemId, &revId) == 4) + if ( + (*devId == 'P' && swscanf(devId, L"PCI\\VEN_%x&DEV_%x&SUBSYS_%x&REV_%x", &vendorId, &deviceId, &subSystemId, &revId) == 4) || + (*devId == 'p' && swscanf(devId, L"pci\\ven_%x&dev_%x&subsys_%x&rev_%x", &vendorId, &deviceId, &subSystemId, &revId) == 4) // Windows 7 + ) { FF_DEBUG("Parsed PCI IDs - Vendor: 0x%x, Device: 0x%x, SubSystem: 0x%x, Rev: 0x%x", vendorId, deviceId, subSystemId, revId); ffStrbufSetStatic(&gpu->vendor, ffGPUGetVendorString(vendorId)); @@ -224,9 +225,9 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* FF_DEBUG("Failed to open device node registry key"); } - if (gpu->vendor.length == 0 || gpu->name.length == 0) + if (gpu->vendor.length == 0 || gpu->name.length == 0 || gpu->driver.length == 0 || gpu->dedicated.total == FF_GPU_VMEM_SIZE_UNSET) { - FF_DEBUG("Trying fallback registry method for vendor/name"); + FF_DEBUG("Trying fallback registry method for vendor/name etc."); bufferLen = sizeof(buffer); if (CM_Get_DevNode_Registry_PropertyW(devInst, CM_DRP_DRIVER, NULL, buffer, &bufferLen, 0) == CR_SUCCESS && bufferLen == (FF_GUID_STRLEN + strlen("\\0000") + 1) * 2) From c640ddbff75193252bb18ac66119fcdae9b809b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 6 Jan 2026 22:41:00 +0800 Subject: [PATCH 37/67] Uptime (Windows): uses QueryInterruptTime on WoA unconditionally --- src/detection/uptime/uptime_windows.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c index 0554348ec..fb6a78727 100644 --- a/src/detection/uptime/uptime_windows.c +++ b/src/detection/uptime/uptime_windows.c @@ -7,6 +7,7 @@ const char* ffDetectUptime(FFUptimeResult* result) { + #ifndef __aarch64__ HMODULE hKernelBase = GetModuleHandleW(L"KernelBase.dll"); if (__builtin_expect(!!hKernelBase, true)) { @@ -21,6 +22,11 @@ const char* ffDetectUptime(FFUptimeResult* result) } result->uptime = GetTickCount64(); + #else + uint64_t uptime; + QueryInterruptTime(&uptime); + result->uptime = uptime / 10000; // Convert from 100-nanosecond intervals to milliseconds + #endif ok: result->bootTime = ffTimeGetNow() - result->uptime; From 072f67988fac3c5e91a708bcad4e989c023371bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 6 Jan 2026 22:57:27 +0800 Subject: [PATCH 38/67] Networking: prefers WSA* functions No functional change. --- src/common/impl/networking_windows.c | 33 +++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/common/impl/networking_windows.c b/src/common/impl/networking_windows.c index 68094ce49..3083427d5 100644 --- a/src/common/impl/networking_windows.c +++ b/src/common/impl/networking_windows.c @@ -148,11 +148,19 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho return "bind() failed"; } - // Initialize overlapped structure for asynchronous I/O + // Initialize overlapped structure with WSA event for asynchronous I/O state->overlapped = (OVERLAPPED){ - .hEvent = CreateEventW(NULL, FALSE, FALSE, NULL) + .hEvent = WSACreateEvent() }; + if (state->overlapped.hEvent == WSA_INVALID_EVENT) { + FF_DEBUG("WSACreateEvent() failed"); + closesocket(state->sockfd); + freeaddrinfo(addr); + state->sockfd = INVALID_SOCKET; + return "WSACreateEvent() failed"; + } + // Build HTTP command ffStrbufInitA(&state->command, 128); ffStrbufAppendS(&state->command, "GET "); @@ -200,7 +208,7 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho if (WSAGetLastError() != WSA_IO_PENDING) { FF_DEBUG("ConnectEx() failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); - CloseHandle(state->overlapped.hEvent); + WSACloseEvent(state->overlapped.hEvent); closesocket(state->sockfd); state->sockfd = INVALID_SOCKET; ffStrbufDestroy(&state->command); @@ -234,15 +242,20 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf uint32_t timeout = state->timeout; if (timeout > 0) { - FF_DEBUG("WaitForSingleObject with timeout: %u ms", timeout); - if (WaitForSingleObject(state->overlapped.hEvent, timeout) != WAIT_OBJECT_0) + FF_DEBUG("WSAWaitForMultipleEvents with timeout: %u ms", timeout); + DWORD result = WSAWaitForMultipleEvents(1, &state->overlapped.hEvent, TRUE, timeout, FALSE); + if (result != WSA_WAIT_EVENT_0) { - FF_DEBUG("WaitForSingleObject failed or timed out"); + if (result == WSA_WAIT_TIMEOUT) { + FF_DEBUG("WSAWaitForMultipleEvents timed out"); + } else { + FF_DEBUG("WSAWaitForMultipleEvents failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); + } CancelIo((HANDLE) state->sockfd); - CloseHandle(state->overlapped.hEvent); + WSACloseEvent(state->overlapped.hEvent); closesocket(state->sockfd); ffStrbufDestroy(&state->command); - return "WaitForSingleObject(state->sockfd) failed or timeout"; + return "WSAWaitForMultipleEvents() failed or timeout"; } } @@ -251,13 +264,13 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf { FF_DEBUG("WSAGetOverlappedResult failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError())); closesocket(state->sockfd); - CloseHandle(state->overlapped.hEvent); + WSACloseEvent(state->overlapped.hEvent); ffStrbufDestroy(&state->command); return "WSAGetOverlappedResult() failed"; } FF_DEBUG("WSAGetOverlappedResult succeeded, %u bytes sent", (unsigned) transfer); ffStrbufDestroy(&state->command); - CloseHandle(state->overlapped.hEvent); + WSACloseEvent(state->overlapped.hEvent); state->overlapped.hEvent = NULL; if (setsockopt(state->sockfd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0) != 0) From 3a7f4f5848eeb52b5ad9e7054120945b2b29a938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 08:56:00 +0800 Subject: [PATCH 39/67] Uptime (Windows): silences a compiler warning --- src/detection/uptime/uptime_windows.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c index fb6a78727..030b58bed 100644 --- a/src/detection/uptime/uptime_windows.c +++ b/src/detection/uptime/uptime_windows.c @@ -22,13 +22,13 @@ const char* ffDetectUptime(FFUptimeResult* result) } result->uptime = GetTickCount64(); +ok: + #else uint64_t uptime; QueryInterruptTime(&uptime); result->uptime = uptime / 10000; // Convert from 100-nanosecond intervals to milliseconds #endif - -ok: result->bootTime = ffTimeGetNow() - result->uptime; return NULL; } From 0b52d75415d589a6fbbf994bba677dbaca6e035a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 08:58:03 +0800 Subject: [PATCH 40/67] GPU (Windows): assumes Win10+ on WoA --- src/detection/gpu/gpu_windows.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index c114a16ce..75f0c2b8c 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -330,6 +330,10 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* if (gpu->type == FF_GPU_TYPE_UNKNOWN && adapterLuid > 0) { FF_DEBUG("Trying to determine GPU type using D3DKMT APIs"); + #if __aarch64__ + D3DKMT_OPENADAPTERFROMLUID openAdapterFromLuid = { .AdapterLuid = *(LUID*)&adapterLuid }; + if (NT_SUCCESS(D3DKMTOpenAdapterFromLuid(&openAdapterFromLuid))) + #else HMODULE hgdi32 = GetModuleHandleW(L"gdi32.dll"); if (hgdi32) { @@ -338,6 +342,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* { D3DKMT_OPENADAPTERFROMLUID openAdapterFromLuid = { .AdapterLuid = *(LUID*)&adapterLuid }; if (NT_SUCCESS(ffD3DKMTOpenAdapterFromLuid(&openAdapterFromLuid))) + #endif { FF_DEBUG("Successfully opened adapter from LUID"); @@ -433,6 +438,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* FF_DEBUG("Failed to get GPU temperature or temperature is 0"); } } + #if !__aarch64__ } else { @@ -443,6 +449,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* { FF_DEBUG("Failed to get gdi32.dll module handle"); } + #endif } if (gpu->type == FF_GPU_TYPE_UNKNOWN) From 7ae007a1d05f04764574e3d7f90213907d123de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 08:58:20 +0800 Subject: [PATCH 41/67] CI (OpenBSD): upgrades OS version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfbe7166a..d0bc11036 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -520,7 +520,7 @@ jobs: architecture: x86-64 cpu_count: 4 shell: bash - version: '7.7' + version: '7.8' run: | uname -a sudo pkg_add -u From 3163cfb1b651b1eb8d6600b0a4b21554a2f7067e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 09:34:50 +0800 Subject: [PATCH 42/67] Common (Windows): improves performance a littile --- src/common/windows/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/windows/registry.c b/src/common/windows/registry.c index 02aeffb06..c46c877ff 100644 --- a/src/common/windows/registry.c +++ b/src/common/windows/registry.c @@ -48,6 +48,7 @@ bool ffRegReadStrbuf(HKEY hKey, const wchar_t* valueNameW, FFstrbuf* result, FFs } return false; } + assert(bufSize >= sizeof(wchar_t)); wchar_t* FF_AUTO_FREE resultW = (wchar_t*)malloc(bufSize); if(RegGetValueW(hKey, NULL, valueNameW, RRF_RT_REG_SZ, NULL, resultW, &bufSize) != ERROR_SUCCESS) { @@ -60,7 +61,7 @@ bool ffRegReadStrbuf(HKEY hKey, const wchar_t* valueNameW, FFstrbuf* result, FFs } return false; } - ffStrbufSetWS(result, resultW); + ffStrbufSetNWS(result, (uint32_t) (bufSize / sizeof(*resultW) - 1), resultW); return true; } From cd8c15d01e25a83fd2a0e7d4029b26b88bb88a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 09:32:40 +0800 Subject: [PATCH 43/67] OS (Windows): acquires OS name from registry --- src/detection/os/os_windows.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp index 71b1163ae..d56cdd7b3 100644 --- a/src/detection/os/os_windows.cpp +++ b/src/detection/os/os_windows.cpp @@ -69,6 +69,17 @@ void ffDetectOSImpl(FFOSResult* os) if(ffStrbufStartsWithS(&os->variant, "Microsoft ")) ffStrbufSubstrAfter(&os->variant, strlen("Microsoft ") - 1); + if(os->variant.length == 0) // Windows PE? + { + wchar_t buf[128]; + DWORD bufSize = (DWORD) sizeof(buf); // with trailing '\0' + if(RegGetValueW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", L"ProductName", RRF_RT_REG_SZ, NULL, buf, &bufSize) == ERROR_SUCCESS) + { + assert(bufSize >= sizeof(wchar_t)); + ffStrbufSetNWS(&os->variant, bufSize / sizeof(wchar_t) - 1, buf); + } + } + ffStrbufSet(&os->prettyName, &os->variant); if(ffStrbufStartsWithS(&os->variant, "Windows ")) @@ -83,6 +94,9 @@ void ffDetectOSImpl(FFOSResult* os) ffStrbufSubstrAfter(&os->variant, strlen(" Server") - 1); } + if(ffStrbufStartsWithIgnCaseS(&os->variant, "(TM) ")) + ffStrbufSubstrAfter(&os->variant, strlen(" (TM)") - 1); + uint32_t index = ffStrbufFirstIndexC(&os->variant, ' '); ffStrbufAppendNS(&os->version, index, os->variant.chars); ffStrbufSubstrAfter(&os->variant, index); From 8423efb6867d566514ba80f632d9cf2e7ad5efd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 11:05:12 +0800 Subject: [PATCH 44/67] CMake (Windows): introduces a flag to remove Win7 compat mode --- CMakeLists.txt | 17 +++++++++++++++-- src/common/impl/processing_windows.c | 4 ++-- src/detection/cpuusage/cpuusage_windows.c | 2 +- src/detection/gpu/gpu_windows.c | 4 ++-- src/detection/uptime/uptime_windows.c | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14a8496e8..1b7603f2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,13 @@ cmake_dependent_option(ENABLE_ELF "Enable libelf" ON "LINUX OR ANDROID OR Dragon cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF) cmake_dependent_option(ENABLE_PCIACCESS "Enable libpciaccess" ON "GNU" OFF) +if(WIN32) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + set(WIN32_WOA ON) + endif() + cmake_dependent_option(ENABLE_WIN7_COMPAT "Enable Windows 7 compatibility" OFF "WIN32_WOA" ON) +endif() + option(ENABLE_ZLIB "Enable zlib" ON) option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF) option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF) @@ -1419,6 +1426,13 @@ if(WIN32) if(HAVE_MSVC_MSIZE) target_compile_definitions(libfastfetch PUBLIC FF_HAVE_MSVC_MSIZE=1) endif() + + if(ENABLE_WIN7_COMPAT) + message(STATUS "Enabling Windows 7 compatibility mode") + target_compile_definitions(libfastfetch PUBLIC FF_WIN7_COMPAT=1) + else() + target_compile_definitions(libfastfetch PUBLIC FF_WIN7_COMPAT=0) + endif() else() check_function_exists(malloc_usable_size HAVE_MALLOC_USABLE_SIZE) if(HAVE_MALLOC_USABLE_SIZE) @@ -1692,8 +1706,7 @@ elseif(WIN32) PRIVATE "propsys" PRIVATE "secur32" ) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - # WoA only works on Windows 10 or higher + if(NOT ENABLE_WIN7_COMPAT) target_link_libraries(libfastfetch PRIVATE "mincore" ) diff --git a/src/common/impl/processing_windows.c b/src/common/impl/processing_windows.c index 4a5ec4373..b128d1438 100644 --- a/src/common/impl/processing_windows.c +++ b/src/common/impl/processing_windows.c @@ -152,7 +152,7 @@ const char* ffProcessReadOutput(FFProcessHandle* handle, FFstrbuf* buffer) switch (GetLastError()) { case ERROR_IO_PENDING: - #if __aarch64__ + #if !FF_WIN7_COMPAT if (!GetOverlappedResultEx(hChildPipeRead, &overlapped, &nRead, timeout < 0 ? INFINITE : (DWORD) timeout, FALSE)) #else // To support Windows 7 @@ -172,7 +172,7 @@ const char* ffProcessReadOutput(FFProcessHandle* handle, FFstrbuf* buffer) CancelIo(hChildPipeRead); TerminateProcess(hProcess, 1); return "GetOverlappedResult" - #if __aarch64__ + #if !FF_WIN7_COMPAT "Ex" #endif "(hChildPipeRead) failed"; diff --git a/src/detection/cpuusage/cpuusage_windows.c b/src/detection/cpuusage/cpuusage_windows.c index 1679350d4..89ce1a1a0 100644 --- a/src/detection/cpuusage/cpuusage_windows.c +++ b/src/detection/cpuusage/cpuusage_windows.c @@ -155,7 +155,7 @@ static const char* getInfoByPerflib(FFlist* cpuTimes) const char* ffGetCpuUsageInfo(FFlist* cpuTimes) { - #if __aarch64__ + #if !FF_WIN7_COMPAT static uint8_t winver = 10; // Assume Windows 10 or later for WoA #else static uint8_t winver = 0; diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index 75f0c2b8c..85ce19f1d 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -330,7 +330,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* if (gpu->type == FF_GPU_TYPE_UNKNOWN && adapterLuid > 0) { FF_DEBUG("Trying to determine GPU type using D3DKMT APIs"); - #if __aarch64__ + #if !FF_WIN7_COMPAT D3DKMT_OPENADAPTERFROMLUID openAdapterFromLuid = { .AdapterLuid = *(LUID*)&adapterLuid }; if (NT_SUCCESS(D3DKMTOpenAdapterFromLuid(&openAdapterFromLuid))) #else @@ -438,7 +438,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* FF_DEBUG("Failed to get GPU temperature or temperature is 0"); } } - #if !__aarch64__ + #if FF_WIN7_COMPAT } else { diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c index 030b58bed..c5cd7245a 100644 --- a/src/detection/uptime/uptime_windows.c +++ b/src/detection/uptime/uptime_windows.c @@ -7,7 +7,7 @@ const char* ffDetectUptime(FFUptimeResult* result) { - #ifndef __aarch64__ + #if FF_WIN7_COMPAT HMODULE hKernelBase = GetModuleHandleW(L"KernelBase.dll"); if (__builtin_expect(!!hKernelBase, true)) { From 234552fbf2b5f1a4d5224adf49d1839525f6f8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 16:22:28 +0800 Subject: [PATCH 45/67] CI (OpenBSD): uses clang-21 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0bc11036..3cdebbecd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -524,8 +524,8 @@ jobs: run: | uname -a sudo pkg_add -u - sudo pkg_add -r llvm-19.1.7p3 cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 imagemagick chafa - CC=clang-19 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . + sudo pkg_add -r llvm-21.1.2p0 cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 imagemagick chafa + CC=clang-21 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . cmake --build . --target package --verbose -j4 ./fastfetch --list-features time ./fastfetch -c presets/ci.jsonc --stat false From 1fa9a61b3fbe4231150855be7e1a2467367401ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 18:32:58 +0800 Subject: [PATCH 46/67] CMake (Windows): fixes option `ENABLE_WIN7_COMPAT` --- CMakeLists.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b7603f2c..70c5ff92c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,13 +94,6 @@ cmake_dependent_option(ENABLE_ELF "Enable libelf" ON "LINUX OR ANDROID OR Dragon cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF) cmake_dependent_option(ENABLE_PCIACCESS "Enable libpciaccess" ON "GNU" OFF) -if(WIN32) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - set(WIN32_WOA ON) - endif() - cmake_dependent_option(ENABLE_WIN7_COMPAT "Enable Windows 7 compatibility" OFF "WIN32_WOA" ON) -endif() - option(ENABLE_ZLIB "Enable zlib" ON) option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF) option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF) @@ -114,6 +107,9 @@ option(ENABLE_EMBEDDED_PCIIDS "Embed pci.ids into fastfetch, requires `python`" option(ENABLE_EMBEDDED_AMDGPUIDS "Embed amdgpu.ids into fastfetch, requires `python`" OFF) option(ENABLE_WORDEXP "Enable using of wordexp(3) if available, instead of glob(3)" ON) option(ENABLE_LIBZFS "Enable libzfs" ON) +if(WIN32 AND NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + option(ENABLE_WIN7_COMPAT "Enable Windows 7 compatibility" ON) +endif() set(BINARY_LINK_TYPE_OPTIONS dlopen dynamic static) set(BINARY_LINK_TYPE dlopen CACHE STRING "How to link fastfetch") @@ -168,7 +164,13 @@ if(WIN32 OR Haiku OR ENABLE_DIRECTX_HEADERS) endif() if(WIN32) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--tsaware -Wl,--build-id -Wl,--subsystem,console:6.1,--major-os-version,6,--minor-os-version,1") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--tsaware -Wl,--build-id") + + if(ENABLE_WIN7_COMPAT) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,console,--major-os-version,6,--minor-os-version,1") + else() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,console,--major-os-version,10,--minor-os-version,0") + endif() elseif(APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc") endif() @@ -1428,7 +1430,6 @@ if(WIN32) endif() if(ENABLE_WIN7_COMPAT) - message(STATUS "Enabling Windows 7 compatibility mode") target_compile_definitions(libfastfetch PUBLIC FF_WIN7_COMPAT=1) else() target_compile_definitions(libfastfetch PUBLIC FF_WIN7_COMPAT=0) From 4d185e64ac83cb4f309aacfc89cf3e5e0f97e842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 18:36:01 +0800 Subject: [PATCH 47/67] SunOS: silences compiler warnings --- CMakeLists.txt | 2 +- src/detection/localip/localip_linux.c | 4 ++-- src/detection/memory/memory_sunos.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70c5ff92c..0d2ad783d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1411,7 +1411,7 @@ elseif(OpenBSD) elseif(DragonFly) target_compile_definitions(libfastfetch PUBLIC __FreeBSD__) elseif(SunOS) - target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE __STDC_WANT_LIB_EXT1__ _FILE_OFFSET_BITS=64 __EXTENSIONS__ _POSIX_C_SOURCE) + target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE __STDC_WANT_LIB_EXT1__ _FILE_OFFSET_BITS=64 __EXTENSIONS__ _POSIX_C_SOURCE) elseif(NetBSD) target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-char-subscripts") diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index 07138a4d6..2e525dd04 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -339,8 +339,8 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results) } } - FF_DEBUG("Processing interface %s (family=%d, flags=0x%x)", - ifa->ifa_name, ifa->ifa_addr->sa_family, ifa->ifa_flags); + FF_DEBUG("Processing interface %s (family=%d, flags=0x%lx)", + ifa->ifa_name, ifa->ifa_addr->sa_family, (unsigned long) ifa->ifa_flags); FFAdapter* adapter = NULL; FF_LIST_FOR_EACH(FFAdapter, x, adapters) diff --git a/src/detection/memory/memory_sunos.c b/src/detection/memory/memory_sunos.c index 1df271055..f390d0ae3 100644 --- a/src/detection/memory/memory_sunos.c +++ b/src/detection/memory/memory_sunos.c @@ -3,8 +3,8 @@ const char* ffDetectMemory(FFMemoryResult* ram) { - ram->bytesTotal = sysconf(_SC_PHYS_PAGES) * instance.state.platform.sysinfo.pageSize; - ram->bytesUsed = ram->bytesTotal - sysconf(_SC_AVPHYS_PAGES) * instance.state.platform.sysinfo.pageSize; + ram->bytesTotal = (uint64_t) sysconf(_SC_PHYS_PAGES) * instance.state.platform.sysinfo.pageSize; + ram->bytesUsed = ram->bytesTotal - (uint64_t) sysconf(_SC_AVPHYS_PAGES) * instance.state.platform.sysinfo.pageSize; return NULL; } From 9e494513408a44d0393aa4bc669c78846ebbcc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 20:04:54 +0800 Subject: [PATCH 48/67] Display (Windows): supports dpi scale factor detection on Win 7 --- .../displayserver/displayserver_windows.c | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/detection/displayserver/displayserver_windows.c b/src/detection/displayserver/displayserver_windows.c index b72a81b99..b18e502db 100644 --- a/src/detection/displayserver/displayserver_windows.c +++ b/src/detection/displayserver/displayserver_windows.c @@ -32,6 +32,13 @@ static void detectDisplays(FFDisplayServerResult* ds) FF_LIST_AUTO_DESTROY monitors = ffListCreate(sizeof(FFMonitorInfo)); EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (LPARAM) &monitors); + #if FF_WIN7_COMPAT + HDC hdc = GetDC(NULL); + uint32_t systemDpi = (uint32_t) GetDeviceCaps(hdc, LOGPIXELSX); + if (systemDpi == 0) systemDpi = 96; + ReleaseDC(NULL, hdc); + #endif + DISPLAYCONFIG_PATH_INFO paths[128]; uint32_t pathCount = ARRAY_SIZE(paths); DISPLAYCONFIG_MODE_INFO modes[256]; @@ -161,12 +168,21 @@ static void detectDisplays(FFDisplayServerResult* ds) preferredRefreshRate = freq.Numerator / (double) freq.Denominator; } + uint32_t scaledWidth = (uint32_t) (monitorInfo->info.rcMonitor.right - monitorInfo->info.rcMonitor.left); + uint32_t scaledHeight = (uint32_t) (monitorInfo->info.rcMonitor.bottom - monitorInfo->info.rcMonitor.top); + FFDisplayResult* display = ffdsAppendDisplay(ds, width, height, path->targetInfo.refreshRate.Numerator / (double) path->targetInfo.refreshRate.Denominator, - (uint32_t) (monitorInfo->info.rcMonitor.right - monitorInfo->info.rcMonitor.left), - (uint32_t) (monitorInfo->info.rcMonitor.bottom - monitorInfo->info.rcMonitor.top), + #if FF_WIN7_COMPAT + // Windows 7 always reports scaled width as the real width, as I tested on VM with 200% scaling. + scaledWidth == width ? width * 96 / systemDpi : scaledWidth, + scaledHeight == height ? height * 96 / systemDpi : scaledHeight, + #else + scaledWidth, + scaledHeight, + #endif preferredMode.width, preferredMode.height, preferredRefreshRate, From bc6fd025cb23421016860c7cb78f07294f0c758f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 7 Jan 2026 20:11:41 +0800 Subject: [PATCH 49/67] Common: silences compiler warnings --- src/common/mallocHelper.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/mallocHelper.h b/src/common/mallocHelper.h index b784775a5..a36423d69 100644 --- a/src/common/mallocHelper.h +++ b/src/common/mallocHelper.h @@ -33,6 +33,7 @@ static inline size_t ffMallocUsableSize(const void* ptr) #elif FF_HAVE_MSVC_MSIZE return _msize((void*) ptr); #else + (void) ptr; return 0; // Not supported #endif } From 0a17da2da033b49f417f02b2623dcabc13419918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 8 Jan 2026 09:18:18 +0800 Subject: [PATCH 50/67] CI (Windows): build `win7-compat` artifacts --- .github/workflows/ci.yml | 25 ++++++++++++++++++------- src/common/impl/init.c | 3 +++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cdebbecd..6a160881c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -647,7 +647,7 @@ jobs: path: ./fastfetch-*.* windows-hosts: - name: Windows-${{ matrix.arch }} + name: Windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }} runs-on: ${{ matrix.runs-on }} permissions: security-events: write @@ -660,11 +660,22 @@ jobs: msystem: CLANG64 msystem-lower: clang64 msys-arch: x86_64 + win7-compat-flag: OFF + win7-compat-postfix: "" + - arch: amd64 + runs-on: windows-latest + msystem: CLANG64 + msystem-lower: clang64 + msys-arch: x86_64 + win7-compat-flag: ON + win7-compat-postfix: "-win7" - arch: aarch64 runs-on: windows-11-arm msystem: CLANGARM64 msystem-lower: clangarm64 msys-arch: aarch64 + win7-compat-flag: OFF + win7-compat-postfix: "" defaults: run: shell: msys2 {0} @@ -683,7 +694,7 @@ jobs: run: uname -a - name: configure project - run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On . + run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_WIN7_COMPAT=${{ matrix.win7-compat-flag }} . - name: build project run: cmake --build . --verbose -j4 @@ -714,7 +725,7 @@ jobs: name: upload artifacts for signing uses: actions/upload-artifact@v4 with: - name: fastfetch-windows-${{ matrix.arch }} + name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }} path: | *.dll fastfetch.exe @@ -733,16 +744,16 @@ jobs: output-artifact-directory: '.' - name: create zip archive - run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets + run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets - name: create 7z archive - run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets + run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets - name: upload true artifacts uses: actions/upload-artifact@v4 with: - name: fastfetch-windows-${{ matrix.arch }} - path: ./fastfetch-windows-${{ matrix.arch }}.* + name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }} + path: ./fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.* overwrite: true release: diff --git a/src/common/impl/init.c b/src/common/impl/init.c index 0e38be713..ae28316d6 100644 --- a/src/common/impl/init.c +++ b/src/common/impl/init.c @@ -262,6 +262,9 @@ void ffListFeatures(void) #if FF_HAVE_EMBEDDED_PCIIDS "Embedded pciids\n" #endif + #if FF_WIN7_COMPAT + "Windows 7 Compatibility\n" + #endif "" , stdout); } From 546908fc29ff059dbb7877c7f31ded0f75bbefa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 8 Jan 2026 10:02:31 +0800 Subject: [PATCH 51/67] Release: v2.57.0 --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ CMakeLists.txt | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8fe63c72..3813e2555 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +# 2.57.0 + +Deprecation Notice: +* Windows 7 (and 8.x) support is deprecated and will be removed in a future release. Extended support for Windows 7 (and 8.1) ended on January 10, 2023 (3 years ago). These versions lack official support for ANSI escape codes (running fastfetch on them requires a 3rd party terminal like ConEmu). In addition, Windows 7 lacks some APIs used by fastfetch. Currently, fastfetch loads these APIs dynamically at runtime to maintain compatibility, but this adds complexity to the codebase and increases the maintenance burden. + * A CMake flag `ENABLE_WIN7_COMPAT:BOOLEAN` has been introduced (defaults to `ON` for now). If set to `OFF`, Windows 7 compatibility code is excluded, and target binaries will support only Windows 10 (version 1607 and later) and Windows 11. + * The main prebuilt Windows binaries on the Release page (`fastfetch-windows-amd64.*`) are built with `ENABLE_WIN7_COMPAT=OFF`, which are used by `scoop` and `winget`. Users who need Windows 7 (or 8.x) support may download the `-win7` variant. + * The `ENABLE_WIN7_COMPAT` cmake option and `-win7` variant binaries are planned for removal in 2.60.0. + +Features: +* Supports COSMIC DE version detection (DE, Linux) +* Supports niri version detection (#2121, WM, Linux) +* Supports cosmic-term version and term font detection (Terminal / TerminalFont, Linux) +* Supports urxvt font detection (TerminalFont, Linux) (#2105) +* Improves xterm font detection by checking `xterm.vt100.faceName` (TerminalFont, Linux) +* Supports secure boot detection (Bootmgr, macOS) +* Supports DPI scale factor detection on Windows 7 (Display, Windows) +* Improves uptime accuracy on Windows 10+ (Uptime, Windows) + +Bugfixes: +* Skips local / loopback routes when detecting network interfaces (LocalIP, Linux) (#2127) +* Fixes CPU speed detection on s390x (CPU, Linux) (#2129) +* Fixes GPU detection error handling and supports case-insensitive PCI ID parsing (GPU, Windows) +* Fixes some networking issues and memory leaks (Networking) + +Logos: +* Adds openSUSE Tumbleweed braille logo +* Renames HydraPWK to NetHydra +* Fixes colors of deepin +* Fixes colors of UOS + # 2.56.1 Features: diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d2ad783d..905e4405f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 2.56.1 + VERSION 2.57.0 LANGUAGES C DESCRIPTION "Fast neofetch-like system information tool" HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch" From c9c9a58f5927b9bb95c113f9ceb2803cb81b49e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 8 Jan 2026 10:42:58 +0800 Subject: [PATCH 52/67] Colors: supports `@` --- CHANGELOG.md | 3 +++ src/common/impl/option.c | 16 ++++++++++++++++ tests/color.c | 5 +++++ 3 files changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3813e2555..b5a9915ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ Features: * Improves xterm font detection by checking `xterm.vt100.faceName` (TerminalFont, Linux) * Supports secure boot detection (Bootmgr, macOS) * Supports DPI scale factor detection on Windows 7 (Display, Windows) +* Supports xterm 256 color codes in color configuration + * In `display.color`: "@" (e.g., "@34" for color index 34) + * In `format` strings: "#@" (e.g., "#@34" for color index 34) * Improves uptime accuracy on Windows 10+ (Uptime, Windows) Bugfixes: diff --git a/src/common/impl/option.c b/src/common/impl/option.c index d5a5fabaf..63da17ef3 100644 --- a/src/common/impl/option.c +++ b/src/common/impl/option.c @@ -166,6 +166,22 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer) exit(479); } } + else if (value[0] == '@') + { + // Xterm 256 color + ++value; + char* pend = NULL; + uint32_t color = (uint32_t) strtoul(value, &pend, 10); + if (pend == value || color > 255) { + fprintf(stderr, "Error: invalid 256 color code found: %s\n", value); + exit(479); + } + + ffStrbufAppendS(buffer, FF_COLOR_FG_256); + ffStrbufAppendUInt(buffer, color); + value = pend; + continue; + } else if (value[0] == '#') { // RGB color diff --git a/tests/color.c b/tests/color.c index d000c2f53..45cdd51a0 100644 --- a/tests/color.c +++ b/tests/color.c @@ -44,6 +44,11 @@ int main(void) VERIFY("#123456", "38;2;18;52;86"); VERIFY("#abc", "38;2;170;187;204"); + // xterm 256 color codes + VERIFY("@0", "38;5;0"); + VERIFY("@1", "38;5;1"); + VERIFY("@255", "38;5;255"); + VERIFY("bold_#ff00ff", "1;38;2;255;0;255"); VERIFY("underline_#123", "4;38;2;17;34;51"); From 5bfabe7a52fcc0a2ed4a6446777f2f12e096ff71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 8 Jan 2026 14:13:19 +0800 Subject: [PATCH 53/67] Presets: adds a new example --- presets/examples/31.jsonc | 170 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 presets/examples/31.jsonc diff --git a/presets/examples/31.jsonc b/presets/examples/31.jsonc new file mode 100644 index 000000000..440a7a5c8 --- /dev/null +++ b/presets/examples/31.jsonc @@ -0,0 +1,170 @@ +// Modified from https://github.com/fastfetch-cli/fastfetch/discussions/2133 + +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "source": "\u001b[?25l\u001b[0m\u001b[38;2;0;0;0;48;2;23;23;23m▇\u001b[48;2;24;24;24m▇▇▇▇▇\u001b[38;2;6;2;4;48;2;39;20;29m▅\u001b[38;2;45;17;30;48;2;5;4;4m▁\u001b[38;2;57;23;43;48;2;5;3;4m▁\u001b[38;2;46;17;34;48;2;4;3;4m▁\u001b[38;2;49;19;37;48;2;7;5;6m▁\u001b[38;2;52;20;41;48;2;13;8;10m▄\u001b[38;2;96;79;131;48;2;52;23;42m▗\u001b[38;2;153;160;221;48;2;83;63;97m▅\u001b[38;2;162;178;235;48;2;95;103;133m▇\u001b[38;2;158;173;227;48;2;93;103;135m▇\u001b[38;2;165;183;244;48;2;94;104;138m▇\u001b[38;2;166;184;248;48;2;96;103;138m▇\u001b[38;2;164;180;243;48;2;94;102;137m▇\u001b[38;2;162;178;240m▇\u001b[38;2;164;180;247;48;2;93;101;137m▇\u001b[38;2;163;181;247;48;2;94;102;138m▇\u001b[38;2;163;180;245;48;2;94;101;139m▇\u001b[38;2;164;180;246;48;2;95;102;139m▇\u001b[38;2;165;179;248;48;2;94;102;139m▇\u001b[38;2;164;179;248;48;2;95;101;139m▇\u001b[38;2;163;179;247;48;2;94;101;139m▇\u001b[38;2;163;178;247;48;2;93;100;138m▇\u001b[38;2;163;179;246;48;2;95;100;136m▇\u001b[38;2;27;17;22;48;2;144;151;202m▝\u001b[38;2;94;74;108;48;2;50;21;40m▁\u001b[38;2;55;17;43;48;2;19;9;14m▄\u001b[38;2;51;16;41;48;2;9;5;7m▂\u001b[38;2;4;1;3;48;2;23;23;24m▇\u001b[38;2;4;1;2;48;2;24;24;24m▇\u001b[38;2;45;15;33;48;2;4;3;3m▁\u001b[38;2;48;17;36;48;2;10;5;6m▁\u001b[38;2;0;0;0;48;2;24;24;24m▇\u001b[48;2;23;23;23m▇\u001b[48;2;24;24;24m▇▇▇\u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[38;2;24;11;18;48;2;2;1;2m▁\u001b[38;2;44;18;32;48;2;6;3;4m▅\u001b[38;2;42;13;28;48;2;50;21;38m╴\u001b[38;2;55;25;45;48;2;53;23;42m╴\u001b[38;2;54;24;44;48;2;56;22;45m▄\u001b[38;2;56;23;45;48;2;55;24;48m▘\u001b[38;2;54;25;48;48;2;55;23;46m╴\u001b[38;2;90;82;131;48;2;66;41;72m▗\u001b[38;2;116;115;169;48;2;151;155;218m▚\u001b[38;2;107;106;151;48;2;150;158;205m╼\u001b[38;2;137;142;194;48;2;164;166;200m╹\u001b[38;2;128;121;155;48;2;186;187;218m▏\u001b[38;2;170;166;177;48;2;186;189;219m▁\u001b[38;2;158;158;196;48;2;162;177;234m╴\u001b[38;2;130;129;169;48;2;156;168;222m╱\u001b[38;2;163;182;247;48;2;163;180;244m┊\u001b[38;2;164;183;248;48;2;162;181;246m▆\u001b[38;2;164;183;249;48;2;162;181;247m▄\u001b[38;2;163;181;248;48;2;163;181;245m╴\u001b[38;2;148;152;200;48;2;156;168;225m╴\u001b[38;2;162;181;245;48;2;163;181;247m╼\u001b[38;2;155;156;191;48;2;162;179;242m╺\u001b[38;2;172;176;214;48;2;194;194;226m▏\u001b[38;2;145;143;163;48;2;187;190;225m╶\u001b[38;2;116;116;151;48;2;169;174;217m▏\u001b[38;2;171;172;203;48;2;161;176;238m▁\u001b[38;2;152;162;215;48;2;114;104;145m▇\u001b[38;2;133;126;167;48;2;52;18;45m▖\u001b[38;2;56;20;48;48;2;55;19;46m╴\u001b[38;2;55;20;46;48;2;56;20;46m╸\u001b[38;2;55;18;47;48;2;56;20;47m▝\u001b[38;2;55;18;44;48;2;55;19;45m╹\u001b[38;2;44;14;35;48;2;50;18;42m╵\u001b[38;2;12;4;9;48;2;46;16;36m▝\u001b[38;2;34;12;25;48;2;2;0;1m▖\u001b[48;2;0;0;0m \u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[38;2;109;75;91;48;2;15;6;11m▗\u001b[38;2;154;127;138;48;2;64;36;49m▖\u001b[38;2;57;26;45;48;2;42;17;32m▇\u001b[38;2;43;18;30;48;2;53;24;40m╶\u001b[38;2;57;27;44;48;2;55;25;42m╴\u001b[38;2;56;26;48;48;2;56;26;46m━\u001b[38;2;39;17;29;48;2;54;24;43m▁\u001b[38;2;51;24;43;48;2;89;75;111m▋\u001b[38;2;107;100;153;48;2;90;82;126m▝\u001b[38;2;234;232;241;48;2;140;125;150m▗\u001b[38;2;125;97;98;48;2;224;218;222m▗\u001b[38;2;219;190;204;48;2;190;175;186m╴\u001b[38;2;149;148;174;48;2;188;193;225m╴\u001b[38;2;118;118;152;48;2;162;170;215m╻\u001b[38;2;117;116;154;48;2;160;171;224m╻\u001b[38;2;119;119;160;48;2;163;179;238m▗\u001b[38;2;138;144;205;48;2;165;181;245m▏\u001b[38;2;165;184;246;48;2;165;183;249m▂\u001b[38;2;165;185;246m▂\u001b[38;2;166;185;244;48;2;165;184;248m▃\u001b[38;2;136;139;184;48;2;163;177;231m┃\u001b[38;2;147;157;202;48;2;161;176;233m╴\u001b[38;2;167;182;240;48;2;165;183;247m▁\u001b[38;2;164;180;239;48;2;169;176;210m▇\u001b[38;2;153;155;189;48;2;192;197;228m╾\u001b[38;2;148;123;123;48;2;194;182;195m┕\u001b[38;2;155;137;136;48;2;217;208;219m▏\u001b[38;2;207;204;230;48;2;156;156;192m▊\u001b[38;2;160;169;221;48;2;124;118;156m▇\u001b[38;2;112;96;128;48;2;61;30;56m▏\u001b[38;2;48;14;35;48;2;51;19;42m╴\u001b[38;2;57;22;48;48;2;57;22;47m╴\u001b[38;2;58;23;46m▁\u001b[38;2;45;16;36;48;2;54;21;43m┎\u001b[38;2;43;17;33;48;2;53;21;43m╵\u001b[38;2;151;120;136;48;2;69;37;56m▗\u001b[38;2;108;77;93;48;2;17;7;12m▖\u001b[48;2;0;0;0m \u001b[38;2;0;0;1m▗\u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[38;2;27;17;26m▝\u001b[38;2;49;25;40;48;2;150;122;134m▍\u001b[38;2;118;92;100;48;2;63;34;49m▘\u001b[38;2;59;31;47;48;2;57;29;46m▖\u001b[38;2;59;28;46;48;2;58;28;46m╵\u001b[38;2;37;15;26;48;2;55;25;42m╹\u001b[38;2;58;27;45;48;2;44;16;31m▉\u001b[38;2;39;16;30;48;2;49;23;39m┆\u001b[38;2;57;30;50;48;2;91;78;114m▋\u001b[38;2;86;74;115;48;2;95;86;131m┊\u001b[38;2;102;95;139;48;2;185;174;200m▂\u001b[38;2;170;163;199;48;2;101;84;108m▚\u001b[38;2;171;187;245;48;2;166;178;229m╴\u001b[38;2;147;158;201;48;2;167;183;238m╴\u001b[38;2;136;137;173;48;2;165;179;229m┃\u001b[38;2;105;97;144;48;2;155;166;216m┃\u001b[38;2;168;182;234;48;2;91;81;122m▋\u001b[38;2;114;112;170;48;2;162;175;235m▖\u001b[38;2;162;175;236;48;2;165;182;242m╻\u001b[38;2;160;176;234;48;2;166;184;243m╷\u001b[38;2;166;185;245m▉\u001b[38;2;95;91;129;48;2;161;170;224m┃\u001b[38;2;125;127;165;48;2;162;172;224m│\u001b[38;2;117;120;156;48;2;163;175;223m│\u001b[38;2;102;100;149;48;2;164;178;235m╷\u001b[38;2;167;185;244;48;2;166;184;245m╴\u001b[38;2;162;175;230;48;2;157;157;195m▇\u001b[38;2;127;110;128;48;2;173;175;215m▘\u001b[38;2;190;187;226;48;2;152;154;194m▊\u001b[38;2;174;186;239;48;2;167;187;246m▏\u001b[38;2;165;178;231;48;2;102;88;115m▊\u001b[38;2;41;14;33;48;2;49;20;40m╷\u001b[38;2;44;16;35;48;2;58;24;49m▎\u001b[38;2;58;23;48;48;2;37;10;24m▊\u001b[38;2;50;21;37;48;2;59;24;48m▏\u001b[38;2;59;25;48;48;2;58;24;50m▅\u001b[38;2;65;32;53;48;2;127;97;109m▊\u001b[38;2;149;121;137;48;2;84;57;70m▉\u001b[38;2;39;15;27;48;2;4;1;2m▏\u001b[48;2;0;0;0m \u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[38;2;0;0;1m╵\u001b[38;2;109;85;92;48;2;36;21;29m▝\u001b[38;2;58;33;47;48;2;61;30;47m▇\u001b[38;2;59;32;50;48;2;59;32;47m┒\u001b[38;2;47;21;35;48;2;55;28;43m╶\u001b[38;2;54;25;41;48;2;58;30;46m▏\u001b[38;2;57;28;46;48;2;71;46;67m▋\u001b[38;2;94;75;106;48;2;59;32;54m▆\u001b[38;2;51;31;53;48;2;97;88;130m▘\u001b[38;2;87;78;121;48;2;102;95;149m▏\u001b[38;2;103;96;151;48;2;90;81;126m▉\u001b[38;2;97;88;135;48;2;150;158;209m▍\u001b[38;2;124;124;160;48;2;156;167;213m╴\u001b[38;2;127;120;140;48;2;166;177;220m╻\u001b[38;2;121;102;114;48;2;169;156;177m╹\u001b[38;2;181;188;221;48;2;109;96;131m▎\u001b[38;2;161;172;220;48;2;107;89;112m▊\u001b[38;2;143;149;208;48;2;103;92;145m▝\u001b[38;2;104;103;158;48;2;155;166;224m╻\u001b[38;2;166;181;233;48;2;112;110;152m▋\u001b[38;2;140;146;202;48;2;166;182;239m▏\u001b[38;2;166;177;222;48;2;107;100;150m▎\u001b[38;2;165;170;211;48;2;111;102;142m▌\u001b[38;2;146;111;114;48;2;168;164;197m┍\u001b[38;2;164;161;194;48;2;107;101;141m▊\u001b[38;2;108;99;144;48;2;160;175;231m▖\u001b[38;2;117;119;161;48;2;159;172;223m┕\u001b[38;2;129;131;184;48;2;167;183;236m▖\u001b[38;2;146;152;193;48;2;162;176;225m╸\u001b[38;2;170;190;244;48;2;168;188;244m▂\u001b[38;2;158;167;207;48;2;76;62;82m▉\u001b[38;2;99;78;114;48;2;64;34;60m▅\u001b[38;2;80;59;88;48;2;59;28;52m▖\u001b[38;2;60;27;49;48;2;59;25;48m╴\u001b[38;2;52;19;38;48;2;55;22;44m╴\u001b[38;2;60;26;49;48;2;59;26;48m▃\u001b[38;2;59;26;48;48;2;60;26;49m╵\u001b[38;2;134;107;115;48;2;57;37;45m▘\u001b[38;2;0;0;1;48;2;0;0;0m╵ \u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;1;48;2;0;0;0m╸ \u001b[38;2;48;30;39;48;2;5;3;4m▝\u001b[38;2;59;34;48;48;2;59;35;47m╴\u001b[38;2;59;36;48;48;2;59;34;48m╷\u001b[38;2;42;16;29;48;2;54;30;43m╹\u001b[38;2;60;33;49;48;2;60;32;49m▃\u001b[38;2;57;31;51;48;2;99;78;108m▍\u001b[38;2;102;81;116;48;2;101;81;114m╵\u001b[38;2;69;52;73;48;2;88;76;108m╻\u001b[38;2;105;100;152;48;2;83;75;115m▋\u001b[38;2;104;98;151;48;2;86;77;114m▋\u001b[38;2;102;94;135;48;2;75;65;95m▚\u001b[38;2;117;91;94;48;2;166;158;184m╻\u001b[38;2;174;150;157;48;2;157;125;125m┣\u001b[38;2;164;121;108;48;2;202;155;147m▃\u001b[38;2;92;62;55;48;2;157;122;119m▂\u001b[38;2;155;158;202;48;2;125;100;115m╹\u001b[38;2;187;145;138;48;2;121;98;127m▖\u001b[38;2;101;91;147;48;2;103;95;147m╵\u001b[38;2;152;159;207;48;2;125;99;109m▊\u001b[38;2;109;90;125;48;2;154;154;196m▍\u001b[38;2;169;143;149;48;2;110;90;120m▏\u001b[38;2;123;88;86;48;2;151;126;144m▂\u001b[38;2;101;74;62;48;2;206;176;176m▂\u001b[38;2;98;73;59;48;2;199;168;163m▁\u001b[38;2;141;96;81;48;2;147;114;119m╻\u001b[38;2;169;183;235;48;2;131;116;151m▝\u001b[38;2;112;110;152;48;2;142;149;197m▚\u001b[38;2;174;192;240;48;2;163;180;230m╵\u001b[38;2;171;190;240;48;2;171;190;243m╲\u001b[38;2;173;184;226;48;2;100;85;108m▎\u001b[38;2;100;80;111;48;2;99;80;115m▏\u001b[38;2;98;77;111;48;2;58;28;54m▊\u001b[38;2;60;28;51;48;2;60;27;50m▅\u001b[38;2;41;12;32;48;2;57;25;47m╹\u001b[38;2;60;27;50;48;2;61;28;48m▘\u001b[38;2;60;26;51;48;2;58;26;47m╵\u001b[38;2;33;16;26;48;2;2;0;1m▘\u001b[48;2;0;0;0m \u001b[0m\n\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[48;2;0;0;1m▉\u001b[38;2;2;1;1;48;2;43;28;36m▖\u001b[38;2;49;26;37;48;2;55;32;45m┌\u001b[38;2;47;24;36;48;2;58;34;48m▏\u001b[38;2;59;35;49;48;2;55;32;46m▉\u001b[38;2;56;31;50;48;2;102;85;113m▎\u001b[38;2;99;82;112;48;2;99;81;111m▎\u001b[38;2;103;83;110;48;2;89;71;98m┊\u001b[38;2;89;75;108;48;2;94;88;128m▃\u001b[38;2;99;95;141;48;2;90;83;124m▇\u001b[38;2;85;73;107;48;2;94;85;125m┃\u001b[38;2;82;56;72;48;2;121;102;130m╹\u001b[38;2;170;129;124;48;2;194;148;138m▏\u001b[38;2;125;91;82;48;2;220;193;186m▘\u001b[38;2;198;176;170;48;2;145;83;80m▋\u001b[38;2;232;207;202;48;2;104;52;53m▗\u001b[38;2;234;208;202;48;2;148;102;99m▆\u001b[38;2;230;199;192;48;2;132;101;113m▄\u001b[38;2;132;111;138;48;2;220;176;169m▉\u001b[38;2;214;177;169;48;2;147;111;118m▅\u001b[38;2;235;205;199;48;2;143;100;98m▅\u001b[38;2;229;208;204;48;2;134;87;81m▇\u001b[38;2;215;180;178;48;2;112;34;37m▂\u001b[38;2;106;67;64;48;2;223;202;196m▘\u001b[38;2;237;209;204;48;2;139;95;88m▆\u001b[38;2;122;99;120;48;2;187;161;170m▝\u001b[38;2;142;146;195;48;2;98;89;129m▖\u001b[38;2;110;105;156;48;2;168;183;235m▎\u001b[38;2;134;130;157;48;2;161;173;211m▁\u001b[38;2;116;108;135;48;2;93;74;102m▏\u001b[38;2;100;81;114;48;2;100;80;113m╸\u001b[38;2;98;79;112;48;2;57;37;57m▉\u001b[38;2;49;16;39;48;2;62;28;51m▏\u001b[38;2;61;27;50;48;2;52;22;38m▉\u001b[38;2;48;20;33;48;2;56;27;44m╴\u001b[38;2;61;31;47;48;2;14;7;11m▘\u001b[48;2;0;0;0m \u001b[0m\n\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[38;2;43;28;35;48;2;5;3;3m▝\u001b[38;2;57;39;48;48;2;54;34;45m╴\u001b[38;2;59;35;48;48;2;51;27;41m▉\u001b[38;2;35;10;26;48;2;100;83;110m▏\u001b[38;2;99;85;113;48;2;97;82;111m▍\u001b[38;2;85;68;93;48;2;93;76;104m╻\u001b[38;2;99;81;112;48;2;96;79;108m╵\u001b[38;2;83;66;91;48;2;96;86;123m╸\u001b[38;2;75;65;93;48;2;93;89;130m▖\u001b[38;2;101;100;149;48;2;100;98;147m┊\u001b[38;2;90;75;95;48;2;108;96;127m┕\u001b[38;2;101;77;88;48;2;213;184;173m▖\u001b[38;2;245;224;216;48;2;239;217;207m╵\u001b[38;2;245;223;214;48;2;243;222;212m▌\u001b[38;2;243;221;211;48;2;239;219;210m▃\u001b[38;2;243;220;211;48;2;241;219;210m╴\u001b[38;2;191;154;140;48;2;235;206;196m╻\u001b[38;2;243;219;210;48;2;243;220;212m▘\u001b[38;2;243;220;212;48;2;245;219;215m▇\u001b[38;2;243;219;211;48;2;245;219;213m▃\u001b[38;2;241;218;209;48;2;245;221;216m▁\u001b[38;2;166;140;133;48;2;241;218;212m▂\u001b[38;2;144;145;172;48;2;187;177;187m╶\u001b[38;2;144;154;201;48;2;171;186;231m▁\u001b[38;2;142;149;193;48;2;161;173;223m▁\u001b[38;2;87;73;103;48;2;157;159;182m▌\u001b[38;2;126;121;137;48;2;97;77;106m▘\u001b[38;2;100;80;112;48;2;88;66;94m▋\u001b[38;2;99;80;115;48;2;99;80;114m╹\u001b[38;2;97;77;109;48;2;50;22;46m▉\u001b[38;2;57;24;45;48;2;62;30;51m▏\u001b[38;2;14;6;9;48;2;56;29;45m▗\u001b[38;2;1;0;1;48;2;33;18;26m▇\u001b[48;2;0;0;0m \u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;0;48;2;0;0;0m \u001b[48;2;2;2;2m╴\u001b[38;2;166;152;177;48;2;32;25;30m▗\u001b[38;2;160;149;172;48;2;10;5;6m▅\u001b[38;2;66;58;65;48;2;9;7;8m▏\u001b[38;2;37;27;32;48;2;1;0;0m▝\u001b[38;2;22;14;17;48;2;55;35;46m▂\u001b[38;2;98;83;109;48;2;56;36;51m▝\u001b[38;2;51;34;47;48;2;95;82;108m▁\u001b[38;2;67;55;70;48;2;91;76;102m▁\u001b[38;2;101;87;117;48;2;98;84;110m╴\u001b[38;2;100;85;114;48;2;97;82;109m╴\u001b[38;2;64;51;70;48;2;92;77;103m┖\u001b[38;2;94;81;111;48;2;74;65;89m▉\u001b[38;2;68;58;68;48;2;96;92;132m▂\u001b[38;2;116;100;123;48;2;110;81;85m▆\u001b[38;2;130;66;58;48;2;202;169;153m▂\u001b[38;2;219;188;169;48;2;240;218;205m▁\u001b[38;2;239;221;206;48;2;243;221;210m▂\u001b[38;2;244;222;212;48;2;240;218;207m╵\u001b[38;2;154;108;101;48;2;225;198;186m╹\u001b[38;2;227;203;193;48;2;238;215;205m╻\u001b[38;2;242;219;209;48;2;242;220;210m▄\u001b[38;2;241;218;207;48;2;242;219;210m▁\u001b[38;2;181;129;118;48;2;222;194;184m▁\u001b[38;2;145;74;66;48;2;166;132;133m▖\u001b[38;2;92;76;95;48;2;149;149;180m┎\u001b[38;2;61;53;72;48;2;123;122;169m▄\u001b[38;2;130;134;174;48;2;91;74;101m▘\u001b[38;2;87;69;85;48;2;98;79;106m╹\u001b[38;2;100;81;113;48;2;98;79;109m╵\u001b[38;2;69;49;65;48;2;95;75;103m▁\u001b[38;2;53;27;45;48;2;97;77;107m▁\u001b[38;2;99;78;109;48;2;59;32;51m▘\u001b[38;2;5;2;3;48;2;51;26;40m▗\u001b[38;2;0;0;0;48;2;3;1;2m╵\u001b[48;2;1;0;0m┊\u001b[38;2;128;108;125;48;2;2;0;1m▄\u001b[38;2;140;121;146;48;2;2;1;2m▃\u001b[38;2;0;0;0;48;2;4;3;4m╴\u001b[48;2;0;0;0m \u001b[0m\n\u001b[7m\u001b[38;2;0;0;0m \u001b[0m\u001b[38;2;0;0;0;48;2;2;1;2m╴\u001b[38;2;7;5;6;48;2;89;75;96m▘\u001b[38;2;100;88;115;48;2;115;104;128m▇\u001b[38;2;100;89;114;48;2;156;149;176m▅\u001b[38;2;141;128;144;48;2;25;17;20m▋\u001b[38;2;54;38;48;48;2;0;0;0m▂\u001b[38;2;56;39;51;48;2;1;0;0m▂\u001b[38;2;57;40;49;48;2;12;8;10m▂\u001b[38;2;57;37;50;48;2;18;12;15m▂\u001b[38;2;0;0;0;48;2;36;22;28m━\u001b[38;2;105;75;79;48;2;18;10;13m▁\u001b[38;2;192;174;183;48;2;27;17;21m▂\u001b[38;2;213;205;220;48;2;72;47;56m▃\u001b[38;2;188;176;181;48;2;64;19;20m▖\u001b[38;2;134;23;22;48;2;65;19;19m▆\u001b[38;2;92;57;57;48;2;177;164;175m▌\u001b[38;2;120;30;32;48;2;187;172;180m▝\u001b[38;2;193;163;176;48;2;132;53;49m▂\u001b[38;2;118;26;22;48;2;220;194;178m▄\u001b[38;2;166;93;81;48;2;235;215;200m▂\u001b[38;2;237;210;190;48;2;239;219;207m▁\u001b[38;2;239;220;211;48;2;236;216;203m╵\u001b[38;2;149;78;71;48;2;238;214;203m▃\u001b[38;2;113;12;12;48;2;201;156;154m╼\u001b[38;2;209;194;197;48;2;152;68;69m▄\u001b[38;2;224;216;213;48;2;184;144;144m▇\u001b[38;2;164;57;18;48;2;174;155;153m▆\u001b[38;2;234;70;2;48;2;142;55;30m╴\u001b[38;2;238;227;219;48;2;85;44;48m▂\u001b[38;2;240;230;232;48;2;44;26;29m▁\u001b[38;2;108;80;80;48;2;15;7;11m▁\u001b[38;2;10;4;6;48;2;42;22;32m▆\u001b[38;2;62;35;49;48;2;12;6;9m▁\u001b[38;2;64;37;51;48;2;7;3;4m▁\u001b[38;2;56;28;45;48;2;0;0;0m▁\u001b[38;2;29;10;20m▁\u001b[38;2;24;16;17;48;2;138;119;136m▍\u001b[38;2;89;70;94;48;2;158;142;171m▗\u001b[38;2;100;82;110;48;2;135;120;145m▆\u001b[38;2;12;7;11;48;2;94;75;101m▝\u001b[38;2;0;0;0;48;2;3;1;2m┊\u001b[0m\n\u001b[38;2;0;0;0;48;2;1;1;1m╴\u001b[38;2;6;5;6;48;2;87;76;97m▘\u001b[38;2;99;90;117;48;2;101;90;117m▇\u001b[38;2;99;89;117;48;2;99;89;115m▎\u001b[38;2;59;45;58;48;2;97;84;109m▗\u001b[38;2;52;37;47;48;2;56;39;50m▏\u001b[38;2;47;30;40;48;2;57;39;48m╴\u001b[38;2;211;205;201;48;2;62;42;52m▂\u001b[38;2;222;224;219;48;2;58;38;47m▄\u001b[38;2;235;241;236;48;2;77;52;60m▅\u001b[38;2;238;246;239;48;2;122;97;100m▆\u001b[38;2;239;244;236;48;2;212;195;194m▇\u001b[38;2;141;98;78;48;2;229;233;227m▃\u001b[38;2;181;62;13;48;2;170;162;160m▅\u001b[38;2;186;57;10;48;2;87;23;20m▆\u001b[38;2;200;183;178;48;2;122;34;30m▃\u001b[38;2;176;167;175;48;2;204;198;210m╶\u001b[38;2;109;95;97;48;2;197;193;205m▝\u001b[38;2;123;113;115;48;2;200;194;208m▘\u001b[38;2;213;209;228;48;2;163;101;111m▇\u001b[38;2;207;196;214;48;2;119;16;19m▆\u001b[38;2;120;32;34;48;2;195;151;128m▇\u001b[38;2;186;157;169;48;2;140;58;58m▅\u001b[38;2;220;215;227;48;2;172;102;110m▇\u001b[38;2;84;65;58;48;2;217;211;214m╺\u001b[38;2;119;97;91;48;2;204;198;190m┛\u001b[38;2;206;199;191;48;2;231;229;223m╸\u001b[38;2;114;45;24;48;2;216;212;208m▝\u001b[38;2;144;116;109;48;2;177;57;11m▖\u001b[38;2;197;72;22;48;2;208;194;182m▆\u001b[38;2;160;70;38;48;2;230;227;217m▃\u001b[38;2;183;168;151;48;2;239;236;229m▁\u001b[38;2;241;241;237;48;2;126;101;108m▆\u001b[38;2;236;235;231;48;2;79;50;61m▅\u001b[38;2;239;239;236;48;2;77;50;62m▃\u001b[38;2;212;202;203;48;2;64;37;50m▂\u001b[38;2;49;24;35;48;2;66;39;53m╴\u001b[38;2;62;36;51;48;2;93;74;86m▇\u001b[38;2;69;45;61;48;2;111;92;113m▅\u001b[38;2;100;81;112;48;2;100;82;111m▋\u001b[38;2;101;83;115m▝\u001b[38;2;6;4;6;48;2;84;68;89m▝\u001b[0m\n\u001b[38;2;5;3;5;48;2;82;74;92m▘\u001b[38;2;100;91;116;48;2;99;91;116m╴\u001b[38;2;99;90;117;48;2;97;88;112m╵\u001b[38;2;59;47;57;48;2;94;85;107m▃\u001b[38;2;56;39;49;48;2;65;48;57m╵\u001b[38;2;220;221;210;48;2;87;65;72m▄\u001b[38;2;236;244;235;48;2;159;142;141m▇\u001b[38;2;238;248;243;48;2;237;248;240m╍\u001b[38;2;238;248;242m╸\u001b[38;2;235;248;239;48;2;235;246;236m╵\u001b[38;2;122;70;48;48;2;221;228;215m▃\u001b[38;2;186;63;14;48;2;170;159;145m▆\u001b[38;2;125;39;11;48;2;218;69;4m▗\u001b[38;2;227;222;210;48;2;184;78;35m▃\u001b[38;2;236;241;232;48;2;161;118;106m▆\u001b[38;2;238;248;240;48;2;237;247;238m┊\u001b[38;2;225;229;233;48;2;236;245;238m▝\u001b[38;2;224;228;233;48;2;193;190;204m▇\u001b[38;2;184;182;192;48;2;210;210;222m╺\u001b[38;2;185;185;194;48;2;205;206;221m┐\u001b[38;2;209;211;231;48;2;212;214;228m╴\u001b[38;2;236;241;238;48;2;217;215;230m▃\u001b[38;2;236;241;236;48;2;222;221;230m▆\u001b[38;2;221;221;211;48;2;230;233;225m╷\u001b[38;2;196;193;184;48;2;231;234;228m╴\u001b[38;2;233;238;233;48;2;217;219;211m▇\u001b[38;2;236;242;235;48;2;237;243;237m╲\u001b[38;2;236;244;237;48;2;238;243;239m▃\u001b[38;2;239;244;240;48;2;233;236;231m╴\u001b[38;2;226;226;220;48;2;137;73;53m▄\u001b[38;2;96;25;7;48;2;193;69;20m╴\u001b[38;2;212;64;3;48;2;132;86;72m▇\u001b[38;2;181;73;30;48;2;234;229;216m▆\u001b[38;2;116;71;57;48;2;240;239;228m▖\u001b[38;2;239;241;237;48;2;241;245;240m▃\u001b[38;2;242;245;241;48;2;241;244;239m╺\u001b[38;2;241;243;239;48;2;196;182;182m▇\u001b[38;2;232;231;228;48;2;108;83;92m▅\u001b[38;2;164;147;148;48;2;65;39;51m▖\u001b[38;2;67;45;59;48;2;92;72;95m▃\u001b[38;2;101;80;110;48;2;98;79;106m╴\u001b[38;2;101;82;112;48;2;104;85;113m▉\u001b[0m\n\u001b[38;2;65;63;77;48;2;99;92;116m▏\u001b[38;2;55;42;50;48;2;90;82;101m▗\u001b[38;2;51;37;46;48;2;69;59;72m▇\u001b[38;2;53;36;45;48;2;61;45;52m┊\u001b[38;2;110;95;90;48;2;213;206;194m▚\u001b[38;2;187;185;173;48;2;236;244;232m▏\u001b[38;2;237;249;240;48;2;236;249;237m▝\u001b[38;2;236;249;238;48;2;237;248;241m▃\u001b[38;2;236;247;235;48;2;235;247;236m┊\u001b[38;2;199;200;187;48;2;115;70;51m▌\u001b[38;2;157;47;7;48;2;224;70;3m▏\u001b[38;2;233;73;0;48;2;230;73;2m╵\u001b[38;2;117;45;25;48;2;204;192;180m▋\u001b[48;2;236;246;236m \u001b[38;2;238;246;239;48;2;236;247;239m▝\u001b[38;2;233;247;235;48;2;236;247;238m▂\u001b[38;2;235;246;236;48;2;236;246;238m▅\u001b[38;2;234;245;234;48;2;235;246;237m╍\u001b[38;2;234;246;234;48;2;235;245;237m▅\u001b[38;2;234;244;235;48;2;229;233;232m▇\u001b[38;2;209;208;194;48;2;226;230;219m╵\u001b[38;2;195;194;179;48;2;233;239;228m─\u001b[38;2;204;202;187;48;2;230;234;223m╸\u001b[38;2;236;244;239;48;2;235;241;233m╴\u001b[38;2;235;243;234;48;2;235;243;236m▍\u001b[38;2;235;244;232m▅\u001b[38;2;235;243;233;48;2;237;243;236m▅\u001b[38;2;235;242;236m▅\u001b[38;2;236;242;234;48;2;238;243;237m▃\u001b[38;2;237;242;232;48;2;238;243;236m▅\u001b[38;2;229;224;215;48;2;129;45;20m▍\u001b[38;2;235;72;1;48;2;234;72;0m╴\u001b[38;2;236;71;0m╵\u001b[38;2;152;47;13;48;2;172;151;134m▊\u001b[38;2;237;240;235;48;2;237;236;228m╵\u001b[38;2;234;237;231;48;2;237;240;235m▃\u001b[38;2;232;235;231;48;2;236;239;235m▂\u001b[38;2;230;233;228;48;2;236;238;232m▃\u001b[38;2;122;101;93;48;2;210;204;196m▄\u001b[38;2;208;198;185;48;2;76;50;59m▖\u001b[38;2;61;36;50;48;2;75;54;71m▇\u001b[38;2;70;49;66;48;2;101;82;111m▖\u001b[0m\n\u001b[38;2;58;46;54;48;2;90;84;100m▗\u001b[38;2;41;27;33;48;2;53;40;46m┎\u001b[38;2;58;44;51;48;2;60;45;52m╴\u001b[38;2;236;223;202;48;2;104;87;79m╱\u001b[38;2;202;195;183;48;2;97;84;76m▗\u001b[38;2;234;246;233;48;2;232;241;228m╵\u001b[38;2;233;244;231;48;2;234;247;236m▄\u001b[38;2;132;139;141;48;2;224;236;224m▁\u001b[38;2;77;78;109;48;2;217;225;213m▅\u001b[38;2;52;53;100;48;2;95;43;29m▆\u001b[38;2;57;50;94;48;2;209;72;6m▆\u001b[38;2;55;52;98;48;2;168;55;9m▅\u001b[38;2;229;237;223;48;2;83;72;91m▝\u001b[38;2;242;243;231;48;2;234;246;234m▏\u001b[38;2;236;247;236;48;2;234;248;235m▘\u001b[38;2;234;248;234;48;2;234;247;234m╍\u001b[38;2;234;247;234;48;2;234;245;235m▄\u001b[38;2;234;244;234;48;2;234;246;235m┷\u001b[38;2;232;243;233;48;2;234;245;234m┬\u001b[38;2;233;243;233;48;2;241;248;236m▉\u001b[38;2;216;213;200;48;2;150;130;113m▏\u001b[38;2;219;207;188;48;2;143;120;104m┠\u001b[38;2;148;124;108;48;2;191;187;165m▇\u001b[38;2;229;217;200;48;2;235;242;231m▏\u001b[38;2;233;243;233;48;2;234;242;235m▌\u001b[38;2;233;241;232;48;2;234;242;233m┊\u001b[38;2;234;243;232m┳\u001b[38;2;233;241;233;48;2;234;241;235m▆\u001b[38;2;236;241;233;48;2;234;242;233m╴\u001b[38;2;234;241;234;48;2;236;241;232m▂\u001b[38;2;226;225;216;48;2;77;44;62m▌\u001b[38;2;71;48;87;48;2;224;75;7m▅\u001b[38;2;61;49;95;48;2;206;67;6m▅\u001b[38;2;62;49;97;48;2;154;50;15m▆\u001b[38;2;70;62;103;48;2;199;197;189m▆\u001b[38;2;79;72;103;48;2;216;218;210m▃\u001b[38;2;156;154;153;48;2;224;227;219m▁\u001b[38;2;219;223;213;48;2;225;229;221m▅\u001b[38;2;196;193;187;48;2;124;108;107m▌\u001b[38;2;174;156;142;48;2;87;67;63m▝\u001b[38;2;160;143;127;48;2;67;42;51m▖\u001b[38;2;79;58;76;48;2;56;33;46m▝\u001b[0m\n\u001b[38;2;75;67;76;48;2;47;38;41m▘\u001b[38;2;35;34;34;48;2;58;43;48m▂\u001b[38;2;80;66;68;48;2;175;168;153m▊\u001b[38;2;193;182;167;48;2;111;103;90m╶\u001b[38;2;60;62;59;48;2;223;230;212m▂\u001b[38;2;57;59;55;48;2;231;244;226m▂\u001b[38;2;52;51;65;48;2;190;196;189m▄\u001b[38;2;56;54;100;48;2;54;55;84m╴\u001b[38;2;34;34;38;48;2;51;55;101m▂\u001b[38;2;33;33;36;48;2;47;50;93m▂\u001b[38;2;49;52;94;48;2;20;21;36m▝\u001b[38;2;34;34;37;48;2;53;55;99m▂\u001b[38;2;56;50;76;48;2;170;159;151m▊\u001b[38;2;60;62;60;48;2;236;248;234m▂\u001b[38;2;60;63;60;48;2;236;249;236m▂\u001b[48;2;236;249;235m▂\u001b[48;2;235;248;235m▂\u001b[38;2;60;63;61;48;2;235;248;236m▂\u001b[38;2;60;62;60;48;2;235;248;235m▂\u001b[48;2;235;247;235m▂\u001b[38;2;60;62;61;48;2;236;247;236m▂\u001b[48;2;236;247;235m▂\u001b[38;2;60;62;60;48;2;237;244;235m▂\u001b[38;2;61;62;61;48;2;236;245;236m▂\u001b[38;2;60;62;60;48;2;236;244;237m▂\u001b[48;2;236;244;234m▂▂\u001b[48;2;235;244;236m▂\u001b[48;2;235;244;234m▂\u001b[38;2;60;61;60;48;2;235;243;235m▂\u001b[38;2;188;188;183;48;2;62;49;78m▌\u001b[38;2;35;34;39;48;2;59;51;104m▂\u001b[38;2;18;17;26;48;2;44;41;80m▗\u001b[38;2;21;19;31;48;2;48;45;84m▖\u001b[38;2;34;34;39;48;2;57;50;101m▂\u001b[38;2;34;34;38;48;2;56;48;95m▂\u001b[38;2;52;47;92;48;2;58;52;79m╴\u001b[38;2;45;44;44;48;2;175;172;168m▂\u001b[38;2;56;56;55;48;2;215;217;205m▂\u001b[38;2;206;203;196;48;2;120;113;108m╾\u001b[38;2;95;76;69;48;2;158;147;133m▋\u001b[38;2;145;123;118;48;2;68;50;55m╴\u001b[0m", + "type": "data-raw" + }, + "display": { + "separator": "▌", + "key": { + "width": 18 + }, + "bar": { + "border": null, + "char": { + "elapsed": "█", + "total": "░" + }, + "width": 35 + } + }, + "modules": [ + { + "type": "custom", + "format": "{#@196}╔════════════════════════════════════════════════════════╗" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}███╗ ██╗███████╗██████╗ ██╗ ██╗ {#@220}EVA-00 SYSTEM {#@196}║" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}████╗ ██║██╔════╝██╔══██╗██║ ██║ {#@220}MAGI INTERFACE {#@196} ║" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}██╔██╗ ██║█████╗ ██████╔╝██║ ██║ {#@196}║" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}██║╚██╗██║██╔══╝ ██╔══██╗╚██╗ ██╔╝ {#@208}CLASSIFIED {#@196} ║" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}██║ ╚████║███████╗██║ ██║ ╚████╔╝ {#@208}ACCESS ONLY {#@196} ║" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}╚═╝ ╚═══╝╚══════╝╚═╝ ╚═╝ ╚═══╝ {#@196} ║" + }, + { + "type": "custom", + "format": "{#@196}╚════════════════════════════════════════════════════════╝" + }, + { + "type": "custom", + "format": "{#@208}╔══●{#@166}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━●══╗" + }, + { + "type": "custom", + "format": "{#@208}║ {#@46}00101{#@208} ●{#@166}────{#@208}● NERVE CONNECTION INTERFACE ●{#@166}────{#@208}● {#@46}00102{#@196} ║" + }, + { + "type": "custom", + "format": "{#@208}╚══●{#@166}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━●══╝" + }, + { + "type": "custom", + "format": "{#@208}▰{#@166}▰{#@208}▰{#@166}▰{#@208} BORDER LINE {#@166}▰{#@208}▰{#@166}▰{#@208}▰ {#@46}[{#@220}SYSTEM CONFIG{#@46}]" + }, + { + "type": "os", + "key": "{#@46}│ OS " + }, + { + "type": "kernel", + "key": "{#@46}│ KERNEL " + }, + { + "type": "uptime", + "key": "{#@46}│ UPTIME " + }, + { + "type": "custom", + "format": "{#@208}▰{#@166}▰{#@208}▰{#@166}▰{#@208}▰ ABSOLUTE {#@166}▰{#@208}▰{#@166}▰{#@208}▰{#@166}▰ {#@196}[{#@220}FIRST CHILD{#@196}] {#@51}REI AYANAMI" + }, + { + "type": "users", + "key": "{#@46}│ DESIGNATION ", + "format": "{name}, since {login-time}", + "myselfOnly": true + }, + { + "type": "localip", + "key": "{#@46}│ NEURAL-LINK ", + "format": "{ipv4}" + }, + { + "type": "custom", + "format": "{#@196}▰{#@208}▰{#@196}▰{#@208}▰{#@196}▰ DANGER {#@208}▰{#@196}▰{#@208}▰{#@196}▰{#@208}▰ {#@220}[{#@196}UNIT-00{#@220}] {#@51}CORE STATUS" + }, + { + "type": "cpu", + "key": "{#@220}│ CPU-CORE ", + "format": "{name}" + }, + { + "type": "cpu", + "key": "{#@220}│ SYNC-RATE ", + "format": "{cores-physical}C / {cores-logical}T" + }, + { + "type": "custom", + "format": "{#@196}▰{#@208}▰{#@196}▰{#@208}▰{#@196} WARNING {#@208}▰{#@196}▰{#@208}▰{#@196}▰ {#@220}[{#@51}LCL{#@220}] {#@208}[{#@51}A.T. FIELD{#@208}]" + }, + { + "type": "memory", + "key": "{#@208}{#@166}{#@208}{#@220}│ LCL-LEVEL ", + "format": "{used} / {total} (RAM)" + }, + { + "type": "memory", + "key": "{#@208}{#@166}{#@208}{#@220}│ A.T.FIELD ", + "percent": { + "type": [ + "bar", + "hide-others" + ] + } + }, + { + "type": "disk", + "folders": "/", + "key": "{#@208}{#@166}{#@208}{#@220}│ ENTRY-PLUG ", + "format": "{size-used} / {size-total} (DISK)" + }, + { + "type": "disk", + "folders": "/", + "key": "{#@208}{#@166}{#@208}{#@220}│ PLUG-DEPTH ", + "percent": { + "type": [ + "bar", + "hide-others" + ] + } + }, + { + "type": "custom", + "format": "{#@196}╔═════════════════════════════════════════════════════════╗" + }, + { + "type": "custom", + "format": "{#@196}║ {#@46}[SYSTEMS NOMINAL] {#@208}MAGI: {#@46} ONLINE {#@208} STATUS: {#@46} OK {#@196} ║" + }, + { + "type": "custom", + "format": "{#@196}╚═════════════════════════════════════════════════════════╝" + }, + { + "type": "custom", + "format": "{#@46} PILOT REI AYANAMI - READY FOR DEPLOYMENT" + }, + { + "type": "custom", + "format": "{#@208} 綾波レイ (I am not a doll. I am me.)" + } + ] +} From 2efa5a1869b3f690b90dd9c58851dfd5340e9a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 8 Jan 2026 15:56:44 +0800 Subject: [PATCH 54/67] Logo: code refactor for future use --- src/logo/logo.c | 19 +++++++++++-------- src/logo/logo.h | 9 +++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/logo/logo.c b/src/logo/logo.c index 0e88d0229..c6d364746 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -12,13 +12,6 @@ #include #include -typedef enum __attribute__((__packed__)) FFLogoSize -{ - FF_LOGO_SIZE_UNKNOWN, - FF_LOGO_SIZE_NORMAL, - FF_LOGO_SIZE_SMALL, -} FFLogoSize; - static bool ffLogoPrintCharsRaw(const char* data, size_t length, bool printError) { FFOptionsLogo* options = &instance.config.logo; @@ -451,7 +444,7 @@ static bool logoPrintBuiltinIfExists(const FFstrbuf* name, FFLogoSize size) return true; } - const FFlogo* logo = ffStrbufEqualS(name, "?") ? &ffLogoUnknown : logoGetBuiltin(name, size); + const FFlogo* logo = ffLogoGetBuiltinForName(name, size); if(logo == NULL) return false; @@ -784,3 +777,13 @@ void ffLogoBuiltinListAutocompletion(void) printf("%s\n", logo->names[0]); } } + +const FFlogo* ffLogoGetBuiltinForName(const FFstrbuf* name, FFLogoSize size) +{ + return ffStrbufEqualS(name, "?") ? &ffLogoUnknown : logoGetBuiltin(name, size); +} + +const FFlogo* ffLogoGetBuiltinDetected(FFLogoSize size) +{ + return logoGetBuiltinDetected(size); +} diff --git a/src/logo/logo.h b/src/logo/logo.h index d4f332dad..e36047509 100644 --- a/src/logo/logo.h +++ b/src/logo/logo.h @@ -10,6 +10,13 @@ typedef enum __attribute__((__packed__)) FFLogoLineType FF_LOGO_LINE_TYPE_FORCE_UNSIGNED = UINT8_MAX, } FFLogoLineType; +typedef enum __attribute__((__packed__)) FFLogoSize +{ + FF_LOGO_SIZE_UNKNOWN, + FF_LOGO_SIZE_NORMAL, + FF_LOGO_SIZE_SMALL, +} FFLogoSize; + typedef struct FFlogo { const char* lines; @@ -28,6 +35,8 @@ void ffLogoPrintRemaining(void); void ffLogoBuiltinPrint(void); void ffLogoBuiltinList(void); void ffLogoBuiltinListAutocompletion(void); +const FFlogo* ffLogoGetBuiltinForName(const FFstrbuf* name, FFLogoSize size); +const FFlogo* ffLogoGetBuiltinDetected(FFLogoSize size); //builtin.c extern const FFlogo* ffLogoBuiltins[]; From 5c783e64c008917f06bf5ed1c5589ed10391f695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 8 Jan 2026 16:29:24 +0800 Subject: [PATCH 55/67] Logo: adds new module for querying raw builtin logo data Fixes #2124 --- CHANGELOG.md | 2 + CMakeLists.txt | 1 + src/modules/logo/logo.c | 91 +++++++++++++++++++++++++++++++++++++++ src/modules/logo/logo.h | 11 +++++ src/modules/logo/option.h | 10 +++++ src/modules/modules.c | 1 + src/modules/modules.h | 1 + 7 files changed, 117 insertions(+) create mode 100644 src/modules/logo/logo.c create mode 100644 src/modules/logo/logo.h create mode 100644 src/modules/logo/option.h diff --git a/CHANGELOG.md b/CHANGELOG.md index b5a9915ca..4004e929e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ Features: * In `display.color`: "@" (e.g., "@34" for color index 34) * In `format` strings: "#@" (e.g., "#@34" for color index 34) * Improves uptime accuracy on Windows 10+ (Uptime, Windows) +* Adds a new module `Logo` to query built-in logo raw data in JSON output (Logo) + * Usage: `fastfetch -s logo -l -j # Supported in JSON format only` Bugfixes: * Skips local / loopback routes when detecting network interfaces (LocalIP, Linux) (#2127) diff --git a/CMakeLists.txt b/CMakeLists.txt index 905e4405f..e42ec5080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -468,6 +468,7 @@ set(LIBFASTFETCH_SRC src/modules/loadavg/loadavg.c src/modules/locale/locale.c src/modules/localip/localip.c + src/modules/logo/logo.c src/modules/memory/memory.c src/modules/monitor/monitor.c src/modules/netio/netio.c diff --git a/src/modules/logo/logo.c b/src/modules/logo/logo.c new file mode 100644 index 000000000..1d47a52ca --- /dev/null +++ b/src/modules/logo/logo.c @@ -0,0 +1,91 @@ +#include "3rdparty/yyjson/yyjson.h" +#include "common/printing.h" +#include "logo/logo.h" +#include "fastfetch.h" +#include "modules/logo/logo.h" +#include "options/logo.h" + +bool ffPrintLogo(FF_MAYBE_UNUSED FFLogoOptions* options) +{ + ffPrintError(FF_LOGO_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_DEFAULT, "Supported in JSON format only"); + return false; +} + +void ffParseLogoJsonObject(FF_MAYBE_UNUSED FFLogoOptions* options, FF_MAYBE_UNUSED yyjson_val* module) +{ + yyjson_val *key, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key, val) + { + if (unsafe_yyjson_equals_str(key, "type") || unsafe_yyjson_equals_str(key, "condition")) + continue; + + ffPrintError(FF_LOGO_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); + } +} + +bool ffGenerateLogoJsonResult(FF_MAYBE_UNUSED FFLogoOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) +{ + FFLogoSize size = FF_LOGO_SIZE_UNKNOWN; + FFOptionsLogo* logoOptions = &instance.config.logo; + if (logoOptions->type == FF_LOGO_TYPE_SMALL) + size = FF_LOGO_SIZE_SMALL; + else if (logoOptions->type != FF_LOGO_TYPE_BUILTIN && logoOptions->type != FF_LOGO_TYPE_AUTO) + { + yyjson_mut_obj_add_str(doc, module, "error", "Only 'builtin' and 'small' logo types are supported"); + return false; + } + + const FFlogo* logo = logoOptions->source.length > 0 + ? ffLogoGetBuiltinForName(&logoOptions->source, size) + : ffLogoGetBuiltinDetected(size); + + if (!logo) + { + yyjson_mut_obj_add_str(doc, module, "error", "No built-in logo found for the specified name/size"); + return false; + } + + yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result"); + + yyjson_mut_obj_add_str(doc, obj, "lines", logo->lines); + + yyjson_mut_val* namesArr = yyjson_mut_obj_add_arr(doc, obj, "names"); + for (size_t i = 0; i < FASTFETCH_LOGO_MAX_NAMES && logo->names[i]; i++) + yyjson_mut_arr_add_str(doc, namesArr, logo->names[i]); + + yyjson_mut_val* colorsArr = yyjson_mut_obj_add_arr(doc, obj, "colors"); + for (size_t i = 0; i < FASTFETCH_LOGO_MAX_COLORS && logo->colors[i]; i++) + yyjson_mut_arr_add_str(doc, colorsArr, logo->colors[i]); + + yyjson_mut_obj_add_str(doc, obj, "colorKeys", logo->colorKeys); + yyjson_mut_obj_add_str(doc, obj, "colorTitle", logo->colorTitle); + + yyjson_mut_val* typeArr = yyjson_mut_obj_add_arr(doc, obj, "type"); + if (logo->type & FF_LOGO_LINE_TYPE_NORMAL) + yyjson_mut_arr_add_str(doc, typeArr, "normal"); + if (logo->type & FF_LOGO_LINE_TYPE_SMALL_BIT) + yyjson_mut_arr_add_str(doc, typeArr, "small"); + if (logo->type & FF_LOGO_LINE_TYPE_ALTER_BIT) + yyjson_mut_arr_add_str(doc, typeArr, "alter"); + + return true; +} + +void ffInitLogoOptions(FF_MAYBE_UNUSED FFLogoOptions* options) +{ +} + +void ffDestroyLogoOptions(FF_MAYBE_UNUSED FFLogoOptions* options) +{ +} + +FFModuleBaseInfo ffLogoModuleInfo = { + .name = FF_LOGO_MODULE_NAME, + .description = "Query built-in logo for JSON output", + .initOptions = (void*) ffInitLogoOptions, + .destroyOptions = (void*) ffDestroyLogoOptions, + .parseJsonObject = (void*) ffParseLogoJsonObject, + .printModule = (void*) ffPrintLogo, + .generateJsonResult = (void*) ffGenerateLogoJsonResult, +}; diff --git a/src/modules/logo/logo.h b/src/modules/logo/logo.h new file mode 100644 index 000000000..7f48e2dd6 --- /dev/null +++ b/src/modules/logo/logo.h @@ -0,0 +1,11 @@ +#pragma once + +#include "option.h" + +#define FF_LOGO_MODULE_NAME "Logo" + +bool ffPrintLogo(FFLogoOptions* options); +void ffInitLogoOptions(FFLogoOptions* options); +void ffDestroyLogoOptions(FFLogoOptions* options); + +extern FFModuleBaseInfo ffLogoModuleInfo; diff --git a/src/modules/logo/option.h b/src/modules/logo/option.h new file mode 100644 index 000000000..0abfff55d --- /dev/null +++ b/src/modules/logo/option.h @@ -0,0 +1,10 @@ +#pragma once + +#include "common/option.h" + +typedef struct FFLogoOptions +{ + FFModuleArgs moduleArgs; +} FFLogoOptions; + +static_assert(sizeof(FFLogoOptions) <= FF_OPTION_MAX_SIZE, "FFLogoOptions size exceeds maximum allowed size"); diff --git a/src/modules/modules.c b/src/modules/modules.c index 7ad221005..cae08a06e 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -82,6 +82,7 @@ static FFModuleBaseInfo* L[] = { &ffLoadavgModuleInfo, &ffLocaleModuleInfo, &ffLocalIPModuleInfo, + &ffLogoModuleInfo, NULL, }; diff --git a/src/modules/modules.h b/src/modules/modules.h index adc128f94..2579ad90e 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -37,6 +37,7 @@ #include "modules/loadavg/loadavg.h" #include "modules/locale/locale.h" #include "modules/localip/localip.h" +#include "modules/logo/logo.h" #include "modules/media/media.h" #include "modules/memory/memory.h" #include "modules/monitor/monitor.h" From 5d901da81baa77350470bb1ae0560f18e900a636 Mon Sep 17 00:00:00 2001 From: Ezozbek Date: Fri, 9 Jan 2026 05:57:28 +0500 Subject: [PATCH 56/67] Logo (Builtin): adds Xinux logo (#2135) * Logo (Builtin): adds Xinux logo * Fix formatting in xinux.txt ASCII art --------- Co-authored-by: Carter Li --- src/logo/ascii/xinux.txt | 14 ++++++++++++++ src/logo/builtin.c | 9 +++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/logo/ascii/xinux.txt diff --git a/src/logo/ascii/xinux.txt b/src/logo/ascii/xinux.txt new file mode 100644 index 000000000..be34e6892 --- /dev/null +++ b/src/logo/ascii/xinux.txt @@ -0,0 +1,14 @@ +$1 * $2======= ===== ======= $1* +$1 **** $2======= ======= ======= $1*** +$1 ****** $2======= ======= ======= $1****** +$1 ******* $2======== ======= ======= $1******* +$1 ******* $2======== ============= $1******* +$1 ******* $2======== ========== $1******* +$1 ******* $2======== ======== $1******* +$1 ******** $2======= ======= $1********* +$1 *********** $2==== ======= $1*********** +$1 ************* $2== ======= $1************* +$1 ******* ******* $2======== $1******* ******* +$1 ******* ******* $2====== $1******* ******* +$1******* ******* $2==== $1******* ******* +$1 ***** ******* $2== $1******* ***** diff --git a/src/logo/builtin.c b/src/logo/builtin.c index b646e3d46..4feb5515f 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -5500,6 +5500,15 @@ static const FFlogo X[] = { FF_COLOR_FG_256 "16", } }, + // Xinux + { + .names = {"Xinux"}, + .lines = FASTFETCH_DATATEXT_LOGO_XINUX, + .colors = { + FF_COLOR_FG_BLUE, + FF_COLOR_FG_CYAN, + } + }, // LAST {}, }; From 420d1cf804562fe9f96faa0b84d623cb30b3dff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 15:19:46 +0800 Subject: [PATCH 57/67] FFstrbuf: updates `ffStrbufSet*` that they won't reserve extra space --- src/common/FFstrbuf.h | 91 ++++++++++++++----------------- src/common/impl/FFstrbuf.c | 62 ++++++++++++++++++++- tests/strbuf.c | 108 +++++++++++++++++++++++++++++++++++-- 3 files changed, 204 insertions(+), 57 deletions(-) diff --git a/src/common/FFstrbuf.h b/src/common/FFstrbuf.h index a4bfcde4c..7e82cdd4d 100644 --- a/src/common/FFstrbuf.h +++ b/src/common/FFstrbuf.h @@ -24,6 +24,8 @@ #define FASTFETCH_STRBUF_DEFAULT_ALLOC 32 +// static string (allocated == 0), chars points to a string literal +// dynamic string (allocated > 0), chars points to a heap allocated buffer typedef struct FFstrbuf { uint32_t allocated; @@ -55,6 +57,10 @@ void ffStrbufPrependC(FFstrbuf* strbuf, char c); void ffStrbufInsertNC(FFstrbuf* strbuf, uint32_t index, uint32_t num, char c); +// Clear the content of strbuf and set new value +// NOTE: Unlike ffStrbufAppend*, ffStrbufSet* functions may NOT reserve extra space +void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value); +void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value); FF_C_PRINTF(2, 3) void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...); void ffStrbufTrimLeft(FFstrbuf* strbuf, char c); @@ -148,7 +154,7 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateA(uint32_t allocate) static inline void ffStrbufInitCopy(FFstrbuf* __restrict strbuf, const FFstrbuf* __restrict src) { if (src->allocated == 0) // static string - memcpy(strbuf, src, sizeof(FFstrbuf)); + *strbuf = *src; else { ffStrbufInitA(strbuf, src->allocated); @@ -168,9 +174,7 @@ static inline void ffStrbufInitMove(FFstrbuf* strbuf, FFstrbuf* src) { if (src) { - strbuf->allocated = src->allocated; - strbuf->chars = src->chars; - strbuf->length = src->length; + *strbuf = *src; ffStrbufInit(src); } else @@ -220,19 +224,10 @@ static inline void ffStrbufInitMoveS(FFstrbuf* strbuf, char* heapStr) static inline void ffStrbufDestroy(FFstrbuf* strbuf) { - extern char* CHAR_NULL_PTR; + if(strbuf->allocated > 0) + free(strbuf->chars); - if(strbuf->allocated == 0) - { - strbuf->length = 0; - strbuf->chars = CHAR_NULL_PTR; - return; - } - - //Avoid free-after-use. These 3 assignments are cheap so don't remove them - strbuf->allocated = strbuf->length = 0; - free(strbuf->chars); - strbuf->chars = CHAR_NULL_PTR; + ffStrbufInit(strbuf); } FF_C_NODISCARD static inline uint32_t ffStrbufGetFree(const FFstrbuf* strbuf) @@ -249,6 +244,30 @@ static inline void ffStrbufRecalculateLength(FFstrbuf* strbuf) strbuf->length = (uint32_t) strlen(strbuf->chars); } +static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value) +{ + assert(strbuf != NULL); + + if (value == NULL) + ffStrbufClear(strbuf); + else + ffStrbufSetNS(strbuf, (uint32_t) strlen(value), value); +} + +static inline bool ffStrbufSetJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal) +{ + assert(strbuf != NULL); + + if (yyjson_is_str(jsonVal)) + { + ffStrbufSetNS(strbuf, (uint32_t) unsafe_yyjson_get_len(jsonVal), unsafe_yyjson_get_str(jsonVal)); + return true; + } + + ffStrbufClear(strbuf); + return false; +} + static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value) { if(value == NULL) @@ -266,42 +285,10 @@ static inline bool ffStrbufAppendJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal) return false; } -static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value) -{ - ffStrbufClear(strbuf); - - if(value != NULL) - ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value); -} - -static inline void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value) -{ - ffStrbufClear(strbuf); - ffStrbufAppendNS(strbuf, length, value); -} - -static inline void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value) -{ - assert(value && value != strbuf); - if (strbuf->allocated == 0 && value->allocated == 0) - { - memcpy(strbuf, value, sizeof(FFstrbuf)); - return; - } - ffStrbufSetNS(strbuf, value->length, value->chars); -} - -static inline bool ffStrbufSetJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal) -{ - ffStrbufClear(strbuf); - return ffStrbufAppendJsonVal(strbuf, jsonVal); -} - static inline void ffStrbufInit(FFstrbuf* strbuf) { extern char* CHAR_NULL_PTR; - strbuf->allocated = 0; - strbuf->length = 0; + strbuf->allocated = strbuf->length = 0; strbuf->chars = CHAR_NULL_PTR; } @@ -332,10 +319,12 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateStatic(const char* str) static inline void ffStrbufSetStatic(FFstrbuf* strbuf, const char* value) { if(strbuf->allocated > 0) - ffStrbufDestroy(strbuf); + free(strbuf->chars); if(value != NULL) ffStrbufInitStatic(strbuf, value); + else + ffStrbufInit(strbuf); } static inline void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* str) @@ -392,7 +381,7 @@ static inline void ffStrbufPrependS(FFstrbuf* strbuf, const char* value) ffStrbufPrependNS(strbuf, (uint32_t) strlen(value), value); } -static inline int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp) +static inline FF_C_NODISCARD int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp) { uint32_t length = strbuf->length > comp->length ? comp->length : strbuf->length; return memcmp(strbuf->chars, comp->chars, length + 1); diff --git a/src/common/impl/FFstrbuf.c b/src/common/impl/FFstrbuf.c index d65902108..1f59bf1a1 100644 --- a/src/common/impl/FFstrbuf.c +++ b/src/common/impl/FFstrbuf.c @@ -72,6 +72,7 @@ void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free) strbuf->allocated = allocate; } +// Ensure that at least `free` bytes are available in the buffer besides the current length // for an empty buffer, free + 1 length memory will be allocated(+1 for the NUL) void ffStrbufEnsureFixedLengthFree(FFstrbuf* strbuf, uint32_t free) { @@ -165,7 +166,7 @@ void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments) uint32_t free = ffStrbufGetFree(strbuf); int written = vsnprintf(strbuf->chars + strbuf->length, strbuf->allocated > 0 ? free + 1 : 0, format, arguments); - if(written > 0 && strbuf->length + (uint32_t) written > free) + if(written > 0 && (uint32_t) written > free) { ffStrbufEnsureFree(strbuf, (uint32_t) written); written = vsnprintf(strbuf->chars + strbuf->length, (uint32_t) written + 1, format, copy); @@ -237,6 +238,55 @@ void ffStrbufPrependC(FFstrbuf* strbuf, char c) strbuf->length += 1; } +void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value) +{ + assert(strbuf != NULL); + + if (length == 0) + { + ffStrbufClear(strbuf); + return; + } + + assert(value != NULL); + + if (strbuf->allocated < length + 1) + { + if (strbuf->allocated > 0) + free(strbuf->chars); + strbuf->allocated = length + 1; + strbuf->chars = malloc(sizeof(char) * strbuf->allocated); + } + + memcpy(strbuf->chars, value, length); + strbuf->length = length; + strbuf->chars[length] = '\0'; +} + +void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value) +{ + assert(value && value != strbuf); + + if (value->length == 0) + { + ffStrbufClear(strbuf); + return; + } + + if (value->allocated == 0) // static string + { + if (strbuf->allocated != 0) + { + free(strbuf->chars); + strbuf->allocated = 0; + } + strbuf->chars = value->chars; + strbuf->length = value->length; + return; + } + ffStrbufSetNS(strbuf, value->length, value->chars); +} + void ffStrbufTrimLeft(FFstrbuf* strbuf, char c) { if(strbuf->length == 0) @@ -398,7 +448,15 @@ void ffStrbufReplaceAllC(FFstrbuf* strbuf, char find, char replace) return; ffStrbufEnsureFree(strbuf, 0); - for (char *current_pos = strchr(strbuf->chars, find); current_pos; current_pos = strchr(current_pos + 1, find)) + for ( + char *current_pos = memchr(strbuf->chars, find, strbuf->length); + current_pos; + current_pos = memchr( + current_pos + 1, + find, + strbuf->length - (uint32_t)(current_pos + 1 - strbuf->chars) + ) + ) *current_pos = replace; } diff --git a/tests/strbuf.c b/tests/strbuf.c index 7e8058018..aa891698c 100644 --- a/tests/strbuf.c +++ b/tests/strbuf.c @@ -629,17 +629,28 @@ int main(void) ffStrbufSetStatic(&strbuf, "abcdef"); FF_STRBUF_AUTO_DESTROY newStr = ffStrbufCreateS("123456"); ffStrbufSet(&newStr, &strbuf); - VERIFY(newStr.allocated > 0); - VERIFY(newStr.chars != strbuf.chars); + VERIFY(newStr.allocated == 0); + VERIFY(newStr.chars == strbuf.chars); VERIFY(ffStrbufEqualS(&newStr, "abcdef")); } + { + ffStrbufClear(&strbuf); + FF_STRBUF_AUTO_DESTROY newStr = ffStrbufCreateS("123456"); + uint32_t oldAlloc = newStr.allocated; + VERIFY(oldAlloc > newStr.length); + ffStrbufSet(&newStr, &strbuf); + VERIFY(newStr.allocated == oldAlloc); + VERIFY(newStr.chars != strbuf.chars); + VERIFY(ffStrbufEqualS(&newStr, "")); + } + { ffStrbufSetStatic(&strbuf, "abcdefghijkl"); FF_STRBUF_AUTO_DESTROY newStr = ffStrbufCreateS("123456"); ffStrbufSet(&newStr, &strbuf); - VERIFY(newStr.allocated > 0); - VERIFY(newStr.chars != strbuf.chars); + VERIFY(newStr.allocated == 0); + VERIFY(newStr.chars == strbuf.chars); VERIFY(ffStrbufEqualS(&newStr, "abcdefghijkl")); } @@ -1024,6 +1035,95 @@ int main(void) ffStrbufDestroy(&strbuf); } + //setS + ffStrbufInitStatic(&strbuf, "STATIC"); + ffStrbufSetS(&strbuf, "DYNAMIC"); + VERIFY(ffStrbufEqualS(&strbuf, "DYNAMIC")); + VERIFY(strbuf.allocated > 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInit(&strbuf); + ffStrbufSetS(&strbuf, ""); + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitStatic(&strbuf, "STATIC"); + ffStrbufSetS(&strbuf, ""); + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitStatic(&strbuf, "STATIC"); + ffStrbufSetStatic(&strbuf, ""); + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitS(&strbuf, "DYNAMIC"); + ffStrbufSetStatic(&strbuf, ""); + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitS(&strbuf, "DYNAMIC"); + ffStrbufSetS(&strbuf, "ANOTHER DYNAMIC"); + VERIFY(ffStrbufEqualS(&strbuf, "ANOTHER DYNAMIC")); + VERIFY(strbuf.allocated > 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInit(&strbuf); + ffStrbufSetStatic(&strbuf, ""); + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + //set + ffStrbufInitStatic(&strbuf, "STATIC"); + { + FF_STRBUF_AUTO_DESTROY other = ffStrbufCreateS("DYNAMIC"); + ffStrbufSet(&strbuf, &other); + } + VERIFY(ffStrbufEqualS(&strbuf, "DYNAMIC")); + VERIFY(strbuf.allocated > 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInit(&strbuf); + { + FF_STRBUF_AUTO_DESTROY other = ffStrbufCreateS(""); + ffStrbufSet(&strbuf, &other); + } + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitStatic(&strbuf, "STATIC"); + { + FF_STRBUF_AUTO_DESTROY other = ffStrbufCreateS(""); + ffStrbufSet(&strbuf, &other); + } + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitS(&strbuf, "DYNAMIC"); + { + FF_STRBUF_AUTO_DESTROY other = ffStrbufCreateS(""); + ffStrbufSet(&strbuf, &other); + } + VERIFY(ffStrbufEqualS(&strbuf, "")); + VERIFY(strbuf.allocated > 0); + ffStrbufDestroy(&strbuf); + + ffStrbufInitS(&strbuf, "DYNAMIC"); + { + FF_STRBUF_AUTO_DESTROY other = ffStrbufCreateStatic("STATIC"); + ffStrbufSet(&strbuf, &other); + } + VERIFY(ffStrbufEqualS(&strbuf, "STATIC")); + VERIFY(strbuf.allocated == 0); + ffStrbufDestroy(&strbuf); + //Success puts("\e[32mAll tests passed!" FASTFETCH_TEXT_MODIFIER_RESET); } From 03aab33507ecdfee90962501392aec9bf9d82183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 16:07:20 +0800 Subject: [PATCH 58/67] Shell (Linux): supports version detection for deleted binaries Fixes #2136 --- src/common/impl/processing_linux.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/common/impl/processing_linux.c b/src/common/impl/processing_linux.c index c270ab01a..ad76c6c00 100644 --- a/src/common/impl/processing_linux.c +++ b/src/common/impl/processing_linux.c @@ -222,6 +222,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons { assert(processName->length > 0); ffStrbufClear(exe); + if (exePath) ffStrbufClear(exePath); #if defined(__linux__) || defined(__GNU__) @@ -270,13 +271,14 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons if (length > 0) // doesn't contain trailing NUL { buf[length] = '\0'; - ffStrbufEnsureFixedLengthFree(exePath, (uint32_t)length); - ffStrbufAppendNS(exePath, (uint32_t)length, buf); + // When the process is a deleted executable, the resolved path is like `/usr/bin/app (deleted)` + // But we can still access the binary via `/proc/pid/exe`. See #2136 + if (ffPathExists(buf, FF_PATHTYPE_ANY)) + ffStrbufSetNS(exePath, (uint32_t)length, buf); } - else - { + + if (exePath->length == 0) ffStrbufSetS(exePath, filePath); - } } #elif defined(__APPLE__) From d43ed33661f8c3b97be7bdcace8536c59ad94292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 16:08:54 +0800 Subject: [PATCH 59/67] Shell (macOS): fixes `exePath` not reports absolute paths --- src/common/impl/processing_linux.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/common/impl/processing_linux.c b/src/common/impl/processing_linux.c index ad76c6c00..3ec67e97d 100644 --- a/src/common/impl/processing_linux.c +++ b/src/common/impl/processing_linux.c @@ -320,16 +320,21 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons ffStrbufSetS(exe, arg0); } } - else + + if (exePath || exe->length == 0) { char buf[PROC_PIDPATHINFO_MAXSIZE]; int length = proc_pidpath(pid, buf, ARRAY_SIZE(buf)); if (length > 0) { - ffStrbufEnsureFixedLengthFree(exe, (uint32_t) length); - ffStrbufAppendNS(exe, (uint32_t) length, buf); + if (exe->length == 0) + ffStrbufSetNS(exe, (uint32_t) length, buf); if (exePath) - ffStrbufSet(exePath, exe); + { + // We don't use exec_path above as exePath because it's a relative path and can be different + // from the actual executable being run (for example, when the original file is moved) + ffStrbufSetNS(exePath, (uint32_t) length, buf); + } } } From 30ea52938e38a14b1b0414df35570c6abdf36c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 16:09:43 +0800 Subject: [PATCH 60/67] Processing (SunOS): tidy --- src/common/impl/processing_linux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/impl/processing_linux.c b/src/common/impl/processing_linux.c index 3ec67e97d..37767ac99 100644 --- a/src/common/impl/processing_linux.c +++ b/src/common/impl/processing_linux.c @@ -410,8 +410,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons if (length > 0) // doesn't contain trailing NUL { buf[length] = '\0'; - ffStrbufEnsureFixedLengthFree(exePath, (uint32_t)length); - ffStrbufAppendNS(exePath, (uint32_t)length, buf); + ffStrbufSetNS(exePath, (uint32_t)length, buf); } } From 1337525eb58a075eb3bb97395ea08dafc7bea1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 16:12:56 +0800 Subject: [PATCH 61/67] Shell: fixes xonsh version detection --- src/detection/terminalshell/terminalshell.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index dce77020e..8f15e9e1b 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -204,13 +204,14 @@ static bool getShellVersionAsh(FFstrbuf* exe, FFstrbuf* version) return true; } -static bool getShellVersionXonsh(FFstrbuf* exe, FFstrbuf* version) +static bool getShellVersionXonsh(FF_MAYBE_UNUSED FFstrbuf* exe, FFstrbuf* version) { ffStrbufSetS(version, getenv("XONSH_VERSION")); if (version->length) return true; + // exe is python here if(ffProcessAppendStdErr(version, (char* const[]) { - exe->chars, + "xonsh", "--version", NULL }) != NULL) From b065b3da515d42eb7689e1aa6c9e03268f01dcc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 16:18:25 +0800 Subject: [PATCH 62/67] Global: optimises usage of `FFstrbuf` and `FFlist` --- src/common/FFlist.h | 7 +++++++ src/detection/dns/dns_linux.c | 2 +- src/detection/localip/localip_linux.c | 4 ++-- src/detection/packages/packages_linux.c | 2 +- src/fastfetch.c | 7 +++++-- src/logo/logo.c | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/common/FFlist.h b/src/common/FFlist.h index a105d6cd8..4ef1239bd 100644 --- a/src/common/FFlist.h +++ b/src/common/FFlist.h @@ -126,3 +126,10 @@ static inline void ffListClear(FFlist* list) assert(sizeof(itemType) == (listVar).elementSize); \ (itemType*) ffListAdd(&(listVar)); \ }) + +#define FF_LIST_FIRST(itemType, listVar) FF_LIST_GET(itemType, listVar, 0) +#define FF_LIST_LAST(itemType, listVar) \ + ({ \ + assert((listVar).length > 0); \ + FF_LIST_GET(itemType, listVar, ((listVar).length - 1)); \ + }) diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c index b4c205cf6..986d14e0b 100644 --- a/src/detection/dns/dns_linux.c +++ b/src/detection/dns/dns_linux.c @@ -75,7 +75,7 @@ const char* ffDetectDNS(FFDNSOptions* options, FFlist* results) // Handle different DNS management services if (results->length == 1) { - const FFstrbuf* firstEntry = FF_LIST_GET(FFstrbuf, *results, 0); + const FFstrbuf* firstEntry = FF_LIST_FIRST(FFstrbuf, *results); if (ffStrbufEqualS(firstEntry, "127.0.0.53")) { diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index 2e525dd04..0d3ca66f9 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -462,7 +462,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results) appendIpv4(options, &item->ipv4, ifa); else if (adapter->ipv4.length > 0) { - appendIpv4(options, &item->ipv4, *FF_LIST_GET(struct ifaddrs*, adapter->ipv4, 0)); + appendIpv4(options, &item->ipv4, *FF_LIST_FIRST(struct ifaddrs*, adapter->ipv4)); FF_DEBUG("Using first IPv4 address for interface %s", adapter->mac->ifa_name); } } @@ -527,7 +527,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results) appendIpv6(options, &item->ipv6, selected); else if (adapter->ipv6.length > 0) { - appendIpv6(options, &item->ipv6, *FF_LIST_GET(struct ifaddrs*, adapter->ipv6, 0)); + appendIpv6(options, &item->ipv6, *FF_LIST_FIRST(struct ifaddrs*, adapter->ipv6)); FF_DEBUG("Using first IPv6 address for interface %s", adapter->mac->ifa_name); } } diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 8203f89c4..e2f4a6b23 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -261,7 +261,7 @@ static uint32_t getAMUser(void) if (instance.state.platform.configDirs.length == 0) return 0; // check if $XDG_CONFIG_HOME/appman/appman-config exists - FFstrbuf* baseDir = FF_LIST_GET(FFstrbuf, instance.state.platform.configDirs, 0); + FFstrbuf* baseDir = FF_LIST_FIRST(FFstrbuf, instance.state.platform.configDirs); uint32_t baseLen = baseDir->length; ffStrbufAppendS(baseDir, "appman/appman-config"); FF_STRBUF_AUTO_DESTROY packagesPath = ffStrbufCreate(); diff --git a/src/fastfetch.c b/src/fastfetch.c index 2891010e0..840790bef 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -442,7 +442,9 @@ static void generateConfigFile(bool force, const char* filePath, bool fullConfig exit(477); } - ffStrbufSet(&instance.state.genConfigPath, FF_LIST_GET(FFstrbuf, instance.state.platform.configDirs, 0)); + FFstrbuf* configDir = FF_LIST_FIRST(FFstrbuf, instance.state.platform.configDirs); + ffStrbufEnsureFixedLengthFree(&instance.state.genConfigPath, configDir->length + strlen("fastfetch/config.jsonc")); + ffStrbufSet(&instance.state.genConfigPath, configDir); ffStrbufAppendS(&instance.state.genConfigPath, "fastfetch/config.jsonc"); } else @@ -486,7 +488,8 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val //Try to load as an absolute path - FF_STRBUF_AUTO_DESTROY absolutePath = ffStrbufCreateS(value); + FF_STRBUF_AUTO_DESTROY absolutePath = ffStrbufCreateA(128); + ffStrbufSetS(&absolutePath, value); bool strictJson = ffStrbufEndsWithIgnCaseS(&absolutePath, ".json"); bool jsonc = !strictJson && ffStrbufEndsWithIgnCaseS(&absolutePath, ".jsonc"); bool json5 = !strictJson && !jsonc && ffStrbufEndsWithIgnCaseS(&absolutePath, ".json5"); diff --git a/src/logo/logo.c b/src/logo/logo.c index c6d364746..1b09c6eea 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -487,7 +487,7 @@ static bool updateLogoPath(void) return true; } - FF_STRBUF_AUTO_DESTROY fullPath = ffStrbufCreate(); + FF_STRBUF_AUTO_DESTROY fullPath = ffStrbufCreateA(128); if (ffPathExpandEnv(options->source.chars, &fullPath) && ffPathExists(fullPath.chars, FF_PATHTYPE_FILE)) { ffStrbufDestroy(&options->source); From 5fec607ebe250d4d13e682e6496e06036bce0365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 9 Jan 2026 16:26:31 +0800 Subject: [PATCH 63/67] Doc: updates changelog --- CHANGELOG.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4004e929e..2fbb14f0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,31 +1,34 @@ # 2.57.0 -Deprecation Notice: -* Windows 7 (and 8.x) support is deprecated and will be removed in a future release. Extended support for Windows 7 (and 8.1) ended on January 10, 2023 (3 years ago). These versions lack official support for ANSI escape codes (running fastfetch on them requires a 3rd party terminal like ConEmu). In addition, Windows 7 lacks some APIs used by fastfetch. Currently, fastfetch loads these APIs dynamically at runtime to maintain compatibility, but this adds complexity to the codebase and increases the maintenance burden. - * A CMake flag `ENABLE_WIN7_COMPAT:BOOLEAN` has been introduced (defaults to `ON` for now). If set to `OFF`, Windows 7 compatibility code is excluded, and target binaries will support only Windows 10 (version 1607 and later) and Windows 11. - * The main prebuilt Windows binaries on the Release page (`fastfetch-windows-amd64.*`) are built with `ENABLE_WIN7_COMPAT=OFF`, which are used by `scoop` and `winget`. Users who need Windows 7 (or 8.x) support may download the `-win7` variant. - * The `ENABLE_WIN7_COMPAT` cmake option and `-win7` variant binaries are planned for removal in 2.60.0. +Deprecation notice: +* Support for Windows 7 (and 8.x) is deprecated and will be removed in a future release. Extended support for Windows 7 (and 8.1) ended on January 10, 2023. These versions do not officially support ANSI escape codes (running fastfetch on them requires a third-party terminal such as ConEmu). In addition, Windows 7 lacks some APIs used by fastfetch. Fastfetch currently loads these APIs dynamically at runtime to maintain compatibility, but this adds complexity to the codebase and increases the maintenance burden. + * A CMake flag `ENABLE_WIN7_COMPAT:BOOLEAN` has been introduced (defaults to `ON` for now). If set to `OFF`, Windows 7 compatibility code is excluded, and the resulting binaries will support only Windows 10 (version 1607 and later) and Windows 11. + * The main prebuilt Windows binaries on the Release page (`fastfetch-windows-amd64.*`) are built with `ENABLE_WIN7_COMPAT=OFF`. These are the binaries used by `scoop` and `winget`. Users who need Windows 7 (or 8.x) support can download the `-win7` variant instead. + * The `ENABLE_WIN7_COMPAT` CMake option and the `-win7` variant binaries are planned to be removed in 2.60.0. Features: * Supports COSMIC DE version detection (DE, Linux) * Supports niri version detection (#2121, WM, Linux) -* Supports cosmic-term version and term font detection (Terminal / TerminalFont, Linux) +* Supports cosmic-term version and terminal font detection (Terminal / TerminalFont, Linux) * Supports urxvt font detection (TerminalFont, Linux) (#2105) * Improves xterm font detection by checking `xterm.vt100.faceName` (TerminalFont, Linux) -* Supports secure boot detection (Bootmgr, macOS) +* Supports Secure Boot detection (Bootmgr, macOS) * Supports DPI scale factor detection on Windows 7 (Display, Windows) -* Supports xterm 256 color codes in color configuration +* Supports xterm 256-color codes in color configuration * In `display.color`: "@" (e.g., "@34" for color index 34) * In `format` strings: "#@" (e.g., "#@34" for color index 34) * Improves uptime accuracy on Windows 10+ (Uptime, Windows) * Adds a new module `Logo` to query built-in logo raw data in JSON output (Logo) * Usage: `fastfetch -s logo -l -j # Supported in JSON format only` +* Supports shell version detection even if the binary has been deleted (#2136, Shell, Linux) +* Overall code refinements and optimizations Bugfixes: * Skips local / loopback routes when detecting network interfaces (LocalIP, Linux) (#2127) * Fixes CPU speed detection on s390x (CPU, Linux) (#2129) * Fixes GPU detection error handling and supports case-insensitive PCI ID parsing (GPU, Windows) * Fixes some networking issues and memory leaks (Networking) +* Fixes `exePath` reporting relative paths on macOS (Shell, macOS) Logos: * Adds openSUSE Tumbleweed braille logo From 019c9f0f77e59f45e059d076f7ada2eaeb511e9b Mon Sep 17 00:00:00 2001 From: ctb unit 248 <127646511+ctb248@users.noreply.github.com> Date: Fri, 9 Jan 2026 20:44:27 -0500 Subject: [PATCH 64/67] Logo (Builtin): macOS large Apple logo: add missing warm band using ANSI LIGHT_RED (#2138) Co-authored-by: ctb248 --- src/logo/ascii/macos.txt | 6 +++--- src/logo/builtin.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/logo/ascii/macos.txt b/src/logo/ascii/macos.txt index 6ecf8840e..bec7f9a1d 100644 --- a/src/logo/ascii/macos.txt +++ b/src/logo/ascii/macos.txt @@ -8,10 +8,10 @@ XMMMMMMMMMMMMMMMMMMMMMMMX. $3;MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: -.MMMMMMMMMMMMMMMMMMMMMMMMX. +$4.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - $4'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + $5'XMMMMMMMMMMMMMMMMMMMMMMMMMMk 'XMMMMMMMMMMMMMMMMMMMMMMMMK. - $5kMMMMMMMMMMMMMMMMMMMMMMd + $6kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. "cooc*" "*coo'" \ No newline at end of file diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 4feb5515f..cb4a9a8fa 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -354,6 +354,7 @@ static const FFlogo A[] = { .colors = { FF_COLOR_FG_GREEN, FF_COLOR_FG_YELLOW, + FF_COLOR_FG_LIGHT_RED, FF_COLOR_FG_RED, FF_COLOR_FG_MAGENTA, FF_COLOR_FG_BLUE, @@ -2879,6 +2880,7 @@ static const FFlogo M[] = { .colors = { FF_COLOR_FG_GREEN, FF_COLOR_FG_YELLOW, + FF_COLOR_FG_LIGHT_RED, FF_COLOR_FG_RED, FF_COLOR_FG_MAGENTA, FF_COLOR_FG_BLUE, @@ -3739,6 +3741,7 @@ static const FFlogo O[] = { .colors = { FF_COLOR_FG_GREEN, FF_COLOR_FG_YELLOW, + FF_COLOR_FG_LIGHT_RED, FF_COLOR_FG_RED, FF_COLOR_FG_MAGENTA, FF_COLOR_FG_BLUE, From 7ef994d0cfecd3b702f6b82238381eda2f70f9da Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 12 Jan 2026 09:00:57 +0800 Subject: [PATCH 65/67] Logo (Builtin): update macOS variants --- src/logo/ascii/macos.txt | 2 +- src/logo/ascii/macos2.txt | 8 ++++---- src/logo/ascii/macos3.txt | 28 ++++++++++++++-------------- src/logo/builtin.c | 12 +++++++----- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/logo/ascii/macos.txt b/src/logo/ascii/macos.txt index bec7f9a1d..53afa49f1 100644 --- a/src/logo/ascii/macos.txt +++ b/src/logo/ascii/macos.txt @@ -1,4 +1,4 @@ - $1..' + ..' ,xNMM. .OMMMMo lMM" diff --git a/src/logo/ascii/macos2.txt b/src/logo/ascii/macos2.txt index af4248e11..ea7c9638e 100644 --- a/src/logo/ascii/macos2.txt +++ b/src/logo/ascii/macos2.txt @@ -1,4 +1,4 @@ - $1..' + ..' ,xN . .O o l " @@ -8,10 +8,10 @@ X X. $3; : : : -. X. +$4. X. k Wd. - $4'X k + $5'X k 'X K. - $5k d + $6k d ;K WXXW k. "cooc*" "*coo'" \ No newline at end of file diff --git a/src/logo/ascii/macos3.txt b/src/logo/ascii/macos3.txt index 32f60ae13..73d26c706 100644 --- a/src/logo/ascii/macos3.txt +++ b/src/logo/ascii/macos3.txt @@ -1,16 +1,16 @@ -$1 -:+:. -$1 :++++. -$1 /+++/. -$1 .:-::- .+/:-\`\`.::- -$1 .:/++++++/::::/++++++/::` -$2 .:///////////////////////::` -$2 /////////////////////////` + -:+:. + :++++. + /+++/. + .:-::- .+/:-\`\`.::- + .:/++++++/::::/++++++/::` + $2.:///////////////////////::` + /////////////////////////` $3+++++++++++++++++++++++++` -$3++++++++++++++++++++++++ +++++++++++++++++++++++++ $4ssssssssssssssssssssssss. -$4:ssssssssssssssssssssssss- -$5 osssssssssssssssssssssssss` -$5 `syyyyyyyyyyyyyyyyyyyyyyyyys` -$6 `ossssssssssssssssssssssss -$6 :ooooooooooooooooooo+. -$6 `:++oo+/:- -:/+o+/- \ No newline at end of file +:ssssssssssssssssssssssss- + $5osssssssssssssssssssssssss` + `syyyyyyyyyyyyyyyyyyyyyyyyys` + $6`ossssssssssssssssssssssss + :ooooooooooooooooooo+. + `:++oo+/:- -:/+o+/- \ No newline at end of file diff --git a/src/logo/builtin.c b/src/logo/builtin.c index cb4a9a8fa..9138d1909 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -2875,7 +2875,7 @@ static const FFlogo M[] = { }, // MacOS { - .names = {"macos", "mac"}, + .names = {"macOS"}, .lines = FASTFETCH_DATATEXT_LOGO_MACOS, .colors = { FF_COLOR_FG_GREEN, @@ -2890,7 +2890,7 @@ static const FFlogo M[] = { }, // MacOSSmall { - .names = {"macos_small", "mac_small"}, + .names = {"macOS_small"}, .type = FF_LOGO_LINE_TYPE_SMALL_BIT, .lines = FASTFETCH_DATATEXT_LOGO_MACOS_SMALL, .colors = { @@ -2905,12 +2905,13 @@ static const FFlogo M[] = { }, // MacOS2 { - .names = {"macos2", "mac2"}, + .names = {"macOS2"}, .type = FF_LOGO_LINE_TYPE_ALTER_BIT, .lines = FASTFETCH_DATATEXT_LOGO_MACOS2, .colors = { FF_COLOR_FG_GREEN, FF_COLOR_FG_YELLOW, + FF_COLOR_FG_LIGHT_RED, FF_COLOR_FG_RED, FF_COLOR_FG_MAGENTA, FF_COLOR_FG_BLUE, @@ -2920,7 +2921,7 @@ static const FFlogo M[] = { }, // MacOS2Small { - .names = {"macos2_small", "mac2_small"}, + .names = {"macOS2_small"}, .type = FF_LOGO_LINE_TYPE_SMALL_BIT | FF_LOGO_LINE_TYPE_ALTER_BIT, .lines = FASTFETCH_DATATEXT_LOGO_MACOS2_SMALL, .colors = { @@ -2935,12 +2936,13 @@ static const FFlogo M[] = { }, // MacOS3 { - .names = {"macos3", "mac3"}, + .names = {"macOS3"}, .type = FF_LOGO_LINE_TYPE_ALTER_BIT, .lines = FASTFETCH_DATATEXT_LOGO_MACOS3, .colors = { FF_COLOR_FG_GREEN, FF_COLOR_FG_YELLOW, + FF_COLOR_FG_LIGHT_RED, FF_COLOR_FG_RED, FF_COLOR_FG_MAGENTA, FF_COLOR_FG_BLUE, From e10c9cc1644f0e603e2004aef2cd55209d5f1f24 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 12 Jan 2026 09:06:43 +0800 Subject: [PATCH 66/67] Doc: updates changelog --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fbb14f0d..bd796459f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ Features: * Supports DPI scale factor detection on Windows 7 (Display, Windows) * Supports xterm 256-color codes in color configuration * In `display.color`: "@" (e.g., "@34" for color index 34) - * In `format` strings: "#@" (e.g., "#@34" for color index 34) + * In `*.format` strings: "#@" (e.g., "#@34" for color index 34) * Improves uptime accuracy on Windows 10+ (Uptime, Windows) * Adds a new module `Logo` to query built-in logo raw data in JSON output (Logo) * Usage: `fastfetch -s logo -l -j # Supported in JSON format only` @@ -32,9 +32,10 @@ Bugfixes: Logos: * Adds openSUSE Tumbleweed braille logo +* Adds Xinux * Renames HydraPWK to NetHydra -* Fixes colors of deepin -* Fixes colors of UOS +* Fixes colors of deepin and UOS +* Fixes colors of macOS and variants # 2.56.1 From 16e6decebf00f1abacf5219cba49132b894276d2 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 12 Jan 2026 09:34:25 +0800 Subject: [PATCH 67/67] Logo: general fixes 1. updates JSON schema 2. removes unused fields 3. runs tests in CI --- doc/json_schema.json | 14 ++++++++++++++ presets/ci.jsonc | 1 + src/modules/logo/option.h | 1 - 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/json_schema.json b/doc/json_schema.json index b226d5705..92e885471 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -3202,6 +3202,20 @@ } } }, + { + "title": "Logo", + "type": "object", + "additionalProperties": false, + "properties": { + "type": { + "const": "logo", + "description": "Query built-in logo for JSON output" + }, + "condition": { + "$ref": "#/$defs/conditions" + } + } + }, { "title": "Media", "type": "object", diff --git a/presets/ci.jsonc b/presets/ci.jsonc index 4203ff7c5..d9946454f 100644 --- a/presets/ci.jsonc +++ b/presets/ci.jsonc @@ -109,6 +109,7 @@ }, "tpm", "version", + "logo", "break", "colors" ] diff --git a/src/modules/logo/option.h b/src/modules/logo/option.h index 0abfff55d..92e254e40 100644 --- a/src/modules/logo/option.h +++ b/src/modules/logo/option.h @@ -4,7 +4,6 @@ typedef struct FFLogoOptions { - FFModuleArgs moduleArgs; } FFLogoOptions; static_assert(sizeof(FFLogoOptions) <= FF_OPTION_MAX_SIZE, "FFLogoOptions size exceeds maximum allowed size");