Merge pull request #1665 from fastfetch-cli/dev

Release v2.40.1

Author: CarterLi

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.40.1
+
+Bugfixes:
+* Fix compiling error on old intel platform (TPM, macOS)
+* Fix `--file-raw -` no longer working (Logo, #1659)
+    * Regression of v2.40.0
+
 # 2.40.0
 
 Changes:

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.40.0
+    VERSION 2.40.1
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"

debian/changelog

@@ -1,3 +1,9 @@
+fastfetch (2.40.0) jammy; urgency=medium
+
+  * Update to 2.40.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 03 Apr 2025 08:46:54 +0800
+
 fastfetch (2.39.1) jammy; urgency=medium
 
   * Update to 2.39.1

debian/files

@@ -1 +1 @@
-fastfetch_2.39.1_source.buildinfo universe/utils optional
+fastfetch_2.40.0_source.buildinfo universe/utils optional

src/common/io/io.h

@@ -119,7 +119,6 @@ static inline bool ffPathExists(const char* path, FFPathType pathType)
     }
     else
     {
-        #if (__APPLE__ || __HAIKU__) // #1395
         struct stat fileStat;
         if(stat(path, &fileStat) != 0)
             return false;
@@ -131,24 +130,6 @@ static inline bool ffPathExists(const char* path, FFPathType pathType)
 
         if(pathType & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
             return true;
-        #else
-        size_t len = strlen(path);
-        assert(len < PATH_MAX);
-        if (len == 0) return false;
-
-        int ret;
-        if (path[len - 1] != '/')
-        {
-            char buf[PATH_MAX + 1];
-            memcpy(buf, path, len);
-            buf[len] = '/';
-            buf[len + 1] = 0;
-            ret = access(buf, F_OK);
-        }
-        else
-            ret = access(path, F_OK);
-        return pathType == FF_PATHTYPE_DIRECTORY ? ret == 0 : ret == -1 && errno == ENOTDIR;
-        #endif
     }
 
     #endif

src/detection/tpm/tpm_apple.c

@@ -16,7 +16,7 @@ const char* ffDetectTPM(FFTPMResult* result)
     #else
 
     FF_IOOBJECT_AUTO_RELEASE io_service_t t2Service = IOServiceGetMatchingService(
-        kIOMainPortDefault,
+        MACH_PORT_NULL,
         IOServiceMatching("AppleT2"));
 
     if (t2Service) {

src/logo/logo.c

@@ -473,6 +473,9 @@ static void updateLogoPath(void)
     if(ffPathExists(options->source.chars, FF_PATHTYPE_FILE))
         return;
 
+    if (ffStrbufEqualS(&options->source, "-")) // stdin
+        return;
+
     FF_STRBUF_AUTO_DESTROY fullPath = ffStrbufCreate();
     if (ffPathExpandEnv(options->source.chars, &fullPath) && ffPathExists(fullPath.chars, FF_PATHTYPE_FILE))
     {