diff --git a/CMakeLists.txt b/CMakeLists.txt index 52e0cb3c1..02db14ef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -482,7 +482,7 @@ if(LINUX) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/platform/FFPlatform_unix.c - src/util/linux/elf.c + src/util/binary.c ) elseif(ANDROID) list(APPEND LIBFASTFETCH_SRC @@ -544,7 +544,7 @@ elseif(ANDROID) src/detection/wmtheme/wmtheme_nosupport.c src/detection/camera/camera_android.c src/util/platform/FFPlatform_unix.c - src/util/linux/elf.c + src/util/binary.c ) elseif(FreeBSD) list(APPEND LIBFASTFETCH_SRC @@ -623,7 +623,7 @@ elseif(FreeBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/platform/FFPlatform_unix.c - src/util/linux/elf.c + src/util/binary.c ) elseif(APPLE) list(APPEND LIBFASTFETCH_SRC @@ -689,6 +689,7 @@ elseif(APPLE) src/util/apple/cf_helpers.c src/util/apple/osascript.m src/util/platform/FFPlatform_unix.c + src/util/binary.c ) elseif(WIN32) list(APPEND LIBFASTFETCH_SRC @@ -755,6 +756,7 @@ elseif(WIN32) src/util/windows/unicode.c src/util/windows/wmi.cpp src/util/platform/FFPlatform_windows.c + src/util/binary.c ) elseif(SunOS) list(APPEND LIBFASTFETCH_SRC @@ -831,7 +833,7 @@ elseif(SunOS) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c src/util/platform/FFPlatform_unix.c - src/util/linux/elf.c + src/util/binary.c ) endif() diff --git a/src/detection/editor/editor.c b/src/detection/editor/editor.c index a69e6c5c9..a37accb0d 100644 --- a/src/detection/editor/editor.c +++ b/src/detection/editor/editor.c @@ -2,7 +2,7 @@ #include "common/processing.h" #include "util/stringUtils.h" #include "util/path.h" -#include "util/linux/elf.h" +#include "util/binary.h" #include @@ -92,11 +92,11 @@ const char* ffDetectEditor(FFEditorResult* result) #if __linux__ || __FreeBSD__ if (ffStrbufEqualS(&result->exe, "nvim")) - ffElfExtractStrings(buf, extractNvimVersion, &result->version); + ffBinaryExtractStrings(buf, extractNvimVersion, &result->version); else if (ffStrbufEqualS(&result->exe, "vim")) - ffElfExtractStrings(buf, extractVimVersion, &result->version); + ffBinaryExtractStrings(buf, extractVimVersion, &result->version); else if (ffStrbufEqualS(&result->exe, "nano")) - ffElfExtractStrings(buf, extractNanoVersion, &result->version); + ffBinaryExtractStrings(buf, extractNanoVersion, &result->version); if (result->version.length > 0) return NULL; #endif diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c index a16254595..d135dce87 100644 --- a/src/detection/initsystem/initsystem_linux.c +++ b/src/detection/initsystem/initsystem_linux.c @@ -1,6 +1,6 @@ #include "initsystem.h" #include "common/processing.h" -#include "util/linux/elf.h" +#include "util/binary.h" #include FF_MAYBE_UNUSED static bool elfExtractStringsCallBack(const char* str, uint32_t len, void* data) @@ -49,7 +49,7 @@ const char* ffDetectInitSystem(FFInitSystemResult* result) #if __linux__ && !__ANDROID__ if (ffStrbufEqualS(&result->name, "systemd")) { - ffElfExtractStrings(result->exe.chars, elfExtractStringsCallBack, &result->version); + ffBinaryExtractStrings(result->exe.chars, elfExtractStringsCallBack, &result->version); if (result->version.length == 0) { if (ffProcessAppendStdOut(&result->version, (char* const[]) { diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 271243354..8dd15ee7a 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -8,7 +8,7 @@ #include "detection/displayserver/displayserver.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" -#include "util/linux/elf.h" +#include "util/binary.h" static const char* getSystemMonospaceFont(void) { @@ -315,7 +315,7 @@ static void detectSt(FFTerminalFontResult* terminalFont, const FFTerminalResult* { ffStrbufClear(&font); - const char* error = ffElfExtractStrings(terminal->exePath.chars, elfExtractStringsCallBack, &font); + const char* error = ffBinaryExtractStrings(terminal->exePath.chars, elfExtractStringsCallBack, &font); if (error) { ffStrbufAppendS(&terminalFont->error, error); diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index ae22bf7a2..4073d7aef 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -3,7 +3,7 @@ #include "common/processing.h" #include "common/properties.h" #include "util/stringUtils.h" -#include "util/linux/elf.h" +#include "util/binary.h" #include #ifdef __FreeBSD__ @@ -265,7 +265,7 @@ FF_MAYBE_UNUSED static bool getTerminalVersionGnome(FFstrbuf* exe, FFstrbuf* ver { if (exe->chars[0] == '/') { - ffElfExtractStrings(exe->chars, extractGnomeTerminalVersion, version); + ffBinaryExtractStrings(exe->chars, extractGnomeTerminalVersion, version); if (version->length) return true; } diff --git a/src/util/linux/elf.c b/src/util/binary.c similarity index 92% rename from src/util/linux/elf.c rename to src/util/binary.c index 1af384354..24b6e0cab 100644 --- a/src/util/linux/elf.c +++ b/src/util/binary.c @@ -1,4 +1,4 @@ -#include "elf.h" +#include "binary.h" #ifdef FF_HAVE_ELF @@ -23,7 +23,7 @@ struct FFElfData { bool inited; } elfData; -const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata) +const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata) { if (!elfData.inited) { @@ -98,9 +98,9 @@ const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, #else -const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata) +const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata) { - FF_UNUSED(elfFile, cb, userdata); + FF_UNUSED(file, cb, userdata); return "Fastfetch was built without libelf support"; } diff --git a/src/util/linux/elf.h b/src/util/binary.h similarity index 61% rename from src/util/linux/elf.h rename to src/util/binary.h index 4cfdaeb45..2a0e0943d 100644 --- a/src/util/linux/elf.h +++ b/src/util/binary.h @@ -2,4 +2,4 @@ #include "fastfetch.h" -const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata); +const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata);