Merge pull request #540 from fastfetch-cli/dev

Release v2.0.4

Author: CarterLi

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 2.0.4
+
+Bugfixes:
+* Fix building on 32-bit FreeBSD (Memory, BSD)
+* Fix `--file-raw` doesn't work (Logo)
+
+Features:
+* Trait `-` as an alias for `/dev/stdin`. Available for `--file`, `--file-raw` and `--raw` (Logo)
+
 # 2.0.3
 
 Bugfixes:

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

src/detection/memory/memory_bsd.c

@@ -3,7 +3,7 @@
 
 const char* ffDetectMemory(FFMemoryResult* ram)
 {
-    uint64_t length = sizeof(ram->bytesTotal);
+    size_t length = sizeof(ram->bytesTotal);
     if (sysctl((int[]){ CTL_HW, HW_PHYSMEM }, 2, &ram->bytesTotal, &length, NULL, 0))
         return "Failed to read hw.physmem";
 

src/fastfetch.c

@@ -1205,7 +1205,8 @@ static void parseArguments(FFdata* data, int argc, const char** argv)
         }
 
         if(i == argc - 1 || (
-            *argv[i + 1] == '-' &&
+            argv[i + 1][0] == '-' &&
+            argv[i + 1][1] != '\0' && // `-` is used as an alias for `/dev/stdin`
             strcasecmp(argv[i], "--separator-string") != 0 // Separator string can start with a -
         )) {
             parseOption(data, argv[i], NULL);

src/logo/logo.c

@@ -359,7 +359,10 @@ static bool logoPrintFileIfExists(bool doColorReplacement, bool raw)
 
     FF_STRBUF_AUTO_DESTROY content = ffStrbufCreate();
 
-    if(!ffAppendFileBuffer(options->source.chars, &content))
+    if(ffStrbufEqualS(&options->source, "-")
+        ? !ffAppendFDBuffer(FFUnixFD2NativeFD(STDIN_FILENO), &content)
+        : !ffAppendFileBuffer(options->source.chars, &content)
+    )
     {
         fprintf(stderr, "Logo: Failed to load file content from logo source: %s \n", options->source.chars);
         return false;

src/logo/option.c

@@ -126,7 +126,7 @@ bool ffParseLogoCommandOptions(FFLogoOptions* options, const char* key, const ch
             ffOptionParseString(key, value, &options->source);
             options->type = FF_LOGO_TYPE_FILE;
         }
-        else if(strcasecmp(key, "raw") == 0)
+        else if(strcasecmp(subKey, "raw") == 0)
         {
             ffOptionParseString(key, value, &options->source);
             options->type = FF_LOGO_TYPE_FILE_RAW;