Merge pull request #521 from fastfetch-cli/dev

Fix the `<wordexp.h>` not found compiler error on Android

Author: CarterLi

CMakeLists.txt

@@ -630,11 +630,6 @@ if(WIN32)
     target_compile_definitions(libfastfetch PUBLIC WIN32_LEAN_AND_MEAN=1)
 endif()
 
-CHECK_INCLUDE_FILE("utmpx.h" HAVE_UTMPX_H)
-if(HAVE_UTMPX_H)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_UTMPX_H)
-endif()
-
 if(HAVE_WCWIDTH)
     target_compile_definitions(libfastfetch PRIVATE FF_HAVE_WCWIDTH)
 endif()
@@ -829,6 +824,20 @@ elseif(BSD)
     target_link_libraries(libfastfetch
         PRIVATE "usbhid"
     )
+elseif(ANDROID)
+    CHECK_LIBRARY_EXISTS(-l:libandroid-wordexp.a wordexp "" HAVE_LIBANDROID_WORDEXP_STATIC)
+    if(HAVE_LIBANDROID_WORDEXP_STATIC)
+        target_link_libraries(libfastfetch
+            PRIVATE -l:libandroid-wordexp.a
+        )
+    else()
+        CHECK_LIBRARY_EXISTS(android-wordexp wordexp "" HAVE_LIBANDROID_WORDEXP)
+        if(HAVE_LIBANDROID_WORDEXP)
+            target_link_libraries(libfastfetch
+                PRIVATE android-wordexp
+            )
+        endif()
+    endif()
 endif()
 
 target_include_directories(libfastfetch

src/common/io/io_unix.c

@@ -1,12 +1,16 @@
 #include "io.h"
 #include "util/stringUtils.h"
+#include "util/unused.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <termios.h>
 #include <poll.h>
 #include <dirent.h>
+
+#if __has_include(<wordexp.h>)
 #include <wordexp.h>
+#endif
 
 static void createSubfolders(const char* fileName)
 {
@@ -108,9 +112,12 @@ bool ffPathExists(const char* path, FFPathType type)
     return false;
 }
 
-bool ffPathExpandEnv(const char* in, FFstrbuf* out)
+bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* out)
 {
     bool result = false;
+
+    #if __has_include(<wordexp.h>) // https://github.com/termux/termux-packages/pull/7056
+
     wordexp_t exp;
     if(wordexp(in, &exp, WRDE_NOCMD) != 0)
         return false;
@@ -123,6 +130,8 @@ bool ffPathExpandEnv(const char* in, FFstrbuf* out)
 
     wordfree(&exp);
 
+    #endif
+
     return result;
 }
 

src/detection/users/users_linux.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "users.h"
 
-#if FF_HAVE_UTMPX_H
+#if __has_include(<utmpx.h>)
     #include <utmpx.h>
 #else
     //for Android compatibility