Merge pull request fastfetch-cli#1189 from fastfetch-cli/dev

CarterLi · web-flow · commit ff8e0e72d21e · 2024-08-15T15:58:32.000+08:00
Release v2.21.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.21.3
+
+Bugfixes:
+* Fix bad Intel Arc GPU name detection, which was supposed to be fixed in the last version but the change was reverted accidentally (#1177, GPU, Linux)
+* Fix arm32 CPU name detection no longer work. Regression of 2.21.2 (CPU, Linux)
+
 # 2.21.2
 
 Features:
diff --git 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.21.2
+    VERSION 2.21.3
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+fastfetch (2.21.2) jammy; urgency=medium
+
+  * Update to 2.21.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 14 Aug 2024 14:42:07 +0800
+
 fastfetch (2.21.1) jammy; urgency=medium
 
   * Update to 2.21.1
diff --git a/debian/files b/debian/files
@@ -1 +1 @@
-fastfetch_2.21.1_source.buildinfo universe/utils optional
+fastfetch_2.21.2_source.buildinfo universe/utils optional
diff --git a/src/detection/cpu/cpu_arm.h b/src/detection/cpu/cpu_arm.h
@@ -28,7 +28,7 @@ static const char* hwImplId2Vendor(uint32_t implId)
     case 0x6D: return "Microsoft";
     case 0x70: return "Phytium";
     case 0xc0: return "Ampere";
-    default: return 0;
+    default: return "Unknown";
     }
 }
 
@@ -106,7 +106,7 @@ static const char* armPartId2name(uint32_t partId)
     case 0xd80: return "Cortex-A520";
     case 0xd81: return "Cortex-A720";
     case 0xd82: return "Cortex-X4";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -117,7 +117,7 @@ static const char* brcmPartId2name(uint32_t partId)
     case 0x0f: return "Brahma-B15";
     case 0x100: return "Brahma-B53";
     case 0x516: return "ThunderX2";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -127,7 +127,7 @@ static const char* decPartId2name(uint32_t partId)
     {
     case 0xa10: return "SA110";
     case 0xa11: return "SA1100";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -148,7 +148,7 @@ static const char* caviumPartId2name(uint32_t partId)
     case 0x0b5: return "OcteonTX2-95XXMM";
     case 0x0b6: return "OcteonTX2-95XXO";
     case 0x0b8: return "ThunderX3-T110";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -157,7 +157,7 @@ static const char* apmPartId2name(uint32_t partId)
     switch (partId)
     {
     case 0x000: return "X-Gene";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -181,19 +181,19 @@ static const char* qcomPartId2name(uint32_t partId)
     case 0x805: return "Kryo-4XX-Silver";
     case 0xc00: return "Falkor";
     case 0xc01: return "Saphira";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
 static const char* samsungPartId2name(uint32_t partId)
 {
     switch (partId)
     {
-    case 0x001: return "exynos-m1";
-    case 0x002: return "exynos-m3";
-    case 0x003: return "exynos-m4";
-    case 0x004: return "exynos-m5";
-    default: return "Unknown";
+    case 0x001: return "Exynos-M1";
+    case 0x002: return "Exynos-M3";
+    case 0x003: return "Exynos-M4";
+    case 0x004: return "Exynos-M5";
+    default: return NULL;
     }
 }
 
@@ -204,7 +204,7 @@ static const char* nvidiaPartId2name(uint32_t partId)
     case 0x000: return "Denver";
     case 0x003: return "Denver 2";
     case 0x004: return "Carmel";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -215,7 +215,7 @@ static const char* marvellPartId2name(uint32_t partId)
     case 0x131: return "Feroceon-88FR131";
     case 0x581: return "PJ4/PJ4b";
     case 0x584: return "PJ4B-MP";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -259,7 +259,7 @@ static const char* applePartId2name(uint32_t partId)
     case 0x037: return "Everest-A16";
     case 0x038: return "Blizzard-M2-Max";
     case 0x039: return "Avalanche-M2-Max";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -269,7 +269,7 @@ static const char* faradayPartId2name(uint32_t partId)
     {
     case 0x526: return "FA526";
     case 0x626: return "FA626";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -298,7 +298,7 @@ static const char* intelPartId2name(uint32_t partId)
     case 0x689: return "PXA31x";
     case 0xb11: return "SA1110";
     case 0xc12: return "IPX1200";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -307,7 +307,7 @@ static const char* fujitsuPartId2name(uint32_t partId)
     switch (partId)
     {
     case 0x001: return "A64FX";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -319,7 +319,7 @@ static const char* hisiPartId2name(uint32_t partId)
     case 0xd02: return "TaiShan-v120";	/* used in Kirin 990A and 9000S SoCs */
     case 0xd40: return "Cortex-A76";	/* HiSilicon uses this ID though advertises A76 */
     case 0xd41: return "Cortex-A77";	/* HiSilicon uses this ID though advertises A77 */
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -329,7 +329,7 @@ static const char* amperePartId2name(uint32_t partId)
     {
     case 0xac3: return "Ampere-1";
     case 0xac4: return "Ampere-1a";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -344,7 +344,7 @@ static const char* ftPartId2name(uint32_t partId)
     case 0x663: return "FTC663";
     case 0x664: return "FTC664";
     case 0x862: return "FTC862";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
 
@@ -353,6 +353,6 @@ static const char* msPartId2name(uint32_t partId)
     switch (partId)
     {
     case 0xd49: return "Azure-Cobalt-100";
-    default: return "Unknown";
+    default: return NULL;
     }
 }
diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c
@@ -74,52 +74,59 @@ static void detectAndroid(FFCPUResult* cpu)
 }
 #endif
 
-#ifdef __aarch64__
+#if __arm__ || __aarch64__
 #include "cpu_arm.h"
 
 static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
 {
     FF_AUTO_FREE char* line = NULL;
     rewind(cpuinfo);
     size_t len = 0;
-    const char* lastName = NULL;
+    uint32_t lastPartId = UINT32_MAX;
     uint32_t num = 0;
     while(getline(&line, &len, cpuinfo) != -1)
     {
         if (!ffStrStartsWith(line, "CPU part\t: ")) continue;
         uint32_t partId = (uint32_t) strtoul(line + strlen("CPU part\t: "), NULL, 16);
         const char* name = NULL;
-        switch (implId)
+        if (partId > 0) // Linux reports 0 for unknown CPUs
         {
-            case 0x41: name = armPartId2name(partId); break;
-            case 0x42: name = brcmPartId2name(partId); break;
-            case 0x43: name = caviumPartId2name(partId); break;
-            case 0x44: name = decPartId2name(partId); break;
-            case 0x46: name = fujitsuPartId2name(partId); break;
-            case 0x48: name = hisiPartId2name(partId); break;
-            case 0x4e: name = nvidiaPartId2name(partId); break;
-            case 0x50: name = apmPartId2name(partId); break;
-            case 0x51: name = qcomPartId2name(partId); break;
-            case 0x53: name = samsungPartId2name(partId); break;
-            case 0x56: name = marvellPartId2name(partId); break;
-            case 0x61: name = applePartId2name(partId); break;
-            case 0x66: name = faradayPartId2name(partId); break;
-            case 0x69: name = intelPartId2name(partId); break;
-            case 0x6d: name = msPartId2name(partId); break;
-            case 0x70: name = ftPartId2name(partId); break;
-            case 0xc0: name = amperePartId2name(partId); break;
-            default: name = "Unknown"; break;
+            switch (implId)
+            {
+                case 0x41: name = armPartId2name(partId); break;
+                case 0x42: name = brcmPartId2name(partId); break;
+                case 0x43: name = caviumPartId2name(partId); break;
+                case 0x44: name = decPartId2name(partId); break;
+                case 0x46: name = fujitsuPartId2name(partId); break;
+                case 0x48: name = hisiPartId2name(partId); break;
+                case 0x4e: name = nvidiaPartId2name(partId); break;
+                case 0x50: name = apmPartId2name(partId); break;
+                case 0x51: name = qcomPartId2name(partId); break;
+                case 0x53: name = samsungPartId2name(partId); break;
+                case 0x56: name = marvellPartId2name(partId); break;
+                case 0x61: name = applePartId2name(partId); break;
+                case 0x66: name = faradayPartId2name(partId); break;
+                case 0x69: name = intelPartId2name(partId); break;
+                case 0x6d: name = msPartId2name(partId); break;
+                case 0x70: name = ftPartId2name(partId); break;
+                case 0xc0: name = amperePartId2name(partId); break;
+            }
         }
-        if (lastName != name)
+        if (lastPartId != partId)
         {
-            if (lastName)
+            if (lastPartId != UINT32_MAX)
             {
                 if (num > 1)
                     ffStrbufAppendF(&cpu->name, "*%u", num);
                 ffStrbufAppendS(&cpu->name, " + ");
             }
-            ffStrbufAppendS(&cpu->name, name);
-            lastName = name;
+            if (name)
+                ffStrbufAppendS(&cpu->name, name);
+            else if (partId)
+                ffStrbufAppendF(&cpu->name, "%s-%X", cpu->vendor.chars, partId);
+            else
+                ffStrbufAppend(&cpu->name, &cpu->vendor);
+            lastPartId = partId;
             num = 1;
         }
         else
@@ -149,7 +156,7 @@ static const char* parseCpuInfo(FILE* cpuinfo, FFCPUResult* cpu, FFstrbuf* physi
             ffParsePropLine(line, "isa :", cpuIsa) ||
             ffParsePropLine(line, "uarch :", cpuUarch) ||
 
-            #if __aarch64__
+            #if __arm__ || __aarch64__
             (cpu->vendor.length == 0 && ffParsePropLine(line, "CPU implementer :", cpuImplementer)) ||
             #endif
             #if __ANDROID__
@@ -351,20 +358,16 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         ffStrbufAppend(&cpu->name, &cpuIsa);
     }
 
-    #ifdef __aarch64__
+    #if __arm__ || __aarch64__
     uint32_t cpuImplementer = (uint32_t) strtoul(cpuImplementerStr.chars, NULL, 16);
     ffStrbufSetStatic(&cpu->vendor, hwImplId2Vendor(cpuImplementer));
-    #endif
 
-    #ifdef __ANDROID__
+    #if __ANDROID__
     detectAndroid(cpu);
-    #endif
-
-    #if defined(__linux__) && defined(__aarch64__) && !defined(__ANDROID__)
+    #elif __aarch64__
     detectAsahi(cpu);
     #endif
 
-    #ifdef __aarch64__
     if (cpu->name.length == 0)
         detectArmName(cpuinfo, cpu, cpuImplementer);
     #endif
diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c
@@ -204,9 +204,6 @@ static void pciDetectIntelSpecific(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf*
     // Works for Intel GPUs
     // https://patchwork.kernel.org/project/intel-gfx/patch/1422039866-11572-3-git-send-email-ville.syrjala@linux.intel.com/
 
-    if (ffStrbufStartsWithS(&gpu->name, "Intel "))
-        ffStrbufSubstrAfter(&gpu->name, (uint32_t) strlen("Intel "));
-
     if ((coreName->chars[0] == 'D' || coreName->chars[0] == 'S') &&
             coreName->chars[1] == 'G' &&
             ffCharIsDigit(coreName->chars[2]))
diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c
@@ -26,7 +26,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu
     {
         ffPrintLogoAndKey(FF_GPU_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
 
-        FF_STRBUF_AUTO_DESTROY output = ffStrbufCreateA(gpu->vendor.length + 1 + gpu->name.length);
+        FF_STRBUF_AUTO_DESTROY output = ffStrbufCreate();
 
         if(gpu->vendor.length > 0 && !ffStrbufStartsWith(&gpu->name, &gpu->vendor))
         {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-fastfetch_2.21.1_source.buildinfo universe/utils optional`
	`1`	`+fastfetch_2.21.2_source.buildinfo universe/utils optional`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static const char* hwImplId2Vendor(uint32_t implId)`
`28`	`28`	`case 0x6D: return "Microsoft";`
`29`	`29`	`case 0x70: return "Phytium";`
`30`	`30`	`case 0xc0: return "Ampere";`
`31`		`- default: return 0;`
	`31`	`+ default: return "Unknown";`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`@@ -106,7 +106,7 @@ static const char* armPartId2name(uint32_t partId)`
`106`	`106`	`case 0xd80: return "Cortex-A520";`
`107`	`107`	`case 0xd81: return "Cortex-A720";`
`108`	`108`	`case 0xd82: return "Cortex-X4";`
`109`		`- default: return "Unknown";`
	`109`	`+ default: return NULL;`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -117,7 +117,7 @@ static const char* brcmPartId2name(uint32_t partId)`
`117`	`117`	`case 0x0f: return "Brahma-B15";`
`118`	`118`	`case 0x100: return "Brahma-B53";`
`119`	`119`	`case 0x516: return "ThunderX2";`
`120`		`- default: return "Unknown";`
	`120`	`+ default: return NULL;`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`@@ -127,7 +127,7 @@ static const char* decPartId2name(uint32_t partId)`
`127`	`127`	`{`
`128`	`128`	`case 0xa10: return "SA110";`
`129`	`129`	`case 0xa11: return "SA1100";`
`130`		`- default: return "Unknown";`
	`130`	`+ default: return NULL;`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`@@ -148,7 +148,7 @@ static const char* caviumPartId2name(uint32_t partId)`
`148`	`148`	`case 0x0b5: return "OcteonTX2-95XXMM";`
`149`	`149`	`case 0x0b6: return "OcteonTX2-95XXO";`
`150`	`150`	`case 0x0b8: return "ThunderX3-T110";`
`151`		`- default: return "Unknown";`
	`151`	`+ default: return NULL;`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`@@ -157,7 +157,7 @@ static const char* apmPartId2name(uint32_t partId)`
`157`	`157`	`switch (partId)`
`158`	`158`	`{`
`159`	`159`	`case 0x000: return "X-Gene";`
`160`		`- default: return "Unknown";`
	`160`	`+ default: return NULL;`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`@@ -181,19 +181,19 @@ static const char* qcomPartId2name(uint32_t partId)`
`181`	`181`	`case 0x805: return "Kryo-4XX-Silver";`
`182`	`182`	`case 0xc00: return "Falkor";`
`183`	`183`	`case 0xc01: return "Saphira";`
`184`		`- default: return "Unknown";`
	`184`	`+ default: return NULL;`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`static const char* samsungPartId2name(uint32_t partId)`
`189`	`189`	`{`
`190`	`190`	`switch (partId)`
`191`	`191`	`{`
`192`		`- case 0x001: return "exynos-m1";`
`193`		`- case 0x002: return "exynos-m3";`
`194`		`- case 0x003: return "exynos-m4";`
`195`		`- case 0x004: return "exynos-m5";`
`196`		`- default: return "Unknown";`
	`192`	`+ case 0x001: return "Exynos-M1";`
	`193`	`+ case 0x002: return "Exynos-M3";`
	`194`	`+ case 0x003: return "Exynos-M4";`
	`195`	`+ case 0x004: return "Exynos-M5";`
	`196`	`+ default: return NULL;`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`@@ -204,7 +204,7 @@ static const char* nvidiaPartId2name(uint32_t partId)`
`204`	`204`	`case 0x000: return "Denver";`
`205`	`205`	`case 0x003: return "Denver 2";`
`206`	`206`	`case 0x004: return "Carmel";`
`207`		`- default: return "Unknown";`
	`207`	`+ default: return NULL;`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`@@ -215,7 +215,7 @@ static const char* marvellPartId2name(uint32_t partId)`
`215`	`215`	`case 0x131: return "Feroceon-88FR131";`
`216`	`216`	`case 0x581: return "PJ4/PJ4b";`
`217`	`217`	`case 0x584: return "PJ4B-MP";`
`218`		`- default: return "Unknown";`
	`218`	`+ default: return NULL;`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`@@ -259,7 +259,7 @@ static const char* applePartId2name(uint32_t partId)`
`259`	`259`	`case 0x037: return "Everest-A16";`
`260`	`260`	`case 0x038: return "Blizzard-M2-Max";`
`261`	`261`	`case 0x039: return "Avalanche-M2-Max";`
`262`		`- default: return "Unknown";`
	`262`	`+ default: return NULL;`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`
`@@ -269,7 +269,7 @@ static const char* faradayPartId2name(uint32_t partId)`
`269`	`269`	`{`
`270`	`270`	`case 0x526: return "FA526";`
`271`	`271`	`case 0x626: return "FA626";`
`272`		`- default: return "Unknown";`
	`272`	`+ default: return NULL;`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`@@ -298,7 +298,7 @@ static const char* intelPartId2name(uint32_t partId)`
`298`	`298`	`case 0x689: return "PXA31x";`
`299`	`299`	`case 0xb11: return "SA1110";`
`300`	`300`	`case 0xc12: return "IPX1200";`
`301`		`- default: return "Unknown";`
	`301`	`+ default: return NULL;`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`@@ -307,7 +307,7 @@ static const char* fujitsuPartId2name(uint32_t partId)`
`307`	`307`	`switch (partId)`
`308`	`308`	`{`
`309`	`309`	`case 0x001: return "A64FX";`
`310`		`- default: return "Unknown";`
	`310`	`+ default: return NULL;`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`
`@@ -319,7 +319,7 @@ static const char* hisiPartId2name(uint32_t partId)`
`319`	`319`	`case 0xd02: return "TaiShan-v120"; /* used in Kirin 990A and 9000S SoCs */`
`320`	`320`	`case 0xd40: return "Cortex-A76"; /* HiSilicon uses this ID though advertises A76 */`
`321`	`321`	`case 0xd41: return "Cortex-A77"; /* HiSilicon uses this ID though advertises A77 */`
`322`		`- default: return "Unknown";`
	`322`	`+ default: return NULL;`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`
`@@ -329,7 +329,7 @@ static const char* amperePartId2name(uint32_t partId)`
`329`	`329`	`{`
`330`	`330`	`case 0xac3: return "Ampere-1";`
`331`	`331`	`case 0xac4: return "Ampere-1a";`
`332`		`- default: return "Unknown";`
	`332`	`+ default: return NULL;`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`@@ -344,7 +344,7 @@ static const char* ftPartId2name(uint32_t partId)`
`344`	`344`	`case 0x663: return "FTC663";`
`345`	`345`	`case 0x664: return "FTC664";`
`346`	`346`	`case 0x862: return "FTC862";`
`347`		`- default: return "Unknown";`
	`347`	`+ default: return NULL;`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
`@@ -353,6 +353,6 @@ static const char* msPartId2name(uint32_t partId)`
`353`	`353`	`switch (partId)`
`354`	`354`	`{`
`355`	`355`	`case 0xd49: return "Azure-Cobalt-100";`
`356`		`- default: return "Unknown";`
	`356`	`+ default: return NULL;`
`357`	`357`	`}`
`358`	`358`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu`
`26`	`26`	`{`
`27`	`27`	`ffPrintLogoAndKey(FF_GPU_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
`28`	`28`
`29`		`- FF_STRBUF_AUTO_DESTROY output = ffStrbufCreateA(gpu->vendor.length + 1 + gpu->name.length);`
	`29`	`+ FF_STRBUF_AUTO_DESTROY output = ffStrbufCreate();`
`30`	`30`
`31`	`31`	`if(gpu->vendor.length > 0 && !ffStrbufStartsWith(&gpu->name, &gpu->vendor))`
`32`	`32`	`{`