Merge branch 'fastfetch-cli:dev' into dev

WolfTech Innovations · web-flow · commit 88e379bd2b03 · 2025-02-14T19:28:49.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1124,29 +1124,29 @@ elseif(Haiku)
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/detection/battery/battery_haiku.c
-        src/detection/bios/bios_nosupport.c
-        src/detection/board/board_nosupport.c
+        src/detection/bios/bios_windows.c
+        src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
         src/detection/btrfs/btrfs_nosupport.c
-        src/detection/chassis/chassis_nosupport.c
+        src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_haiku.c
-        src/detection/cpucache/cpucache_nosupport.c
+        src/detection/cpucache/cpucache_shared.c
         src/detection/cpuusage/cpuusage_nosupport.c
         src/detection/cursor/cursor_nosupport.c
         src/detection/bluetooth/bluetooth_nosupport.c
         src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/disk/disk_haiku.cpp
         src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_nosupport.c
-        src/detection/physicalmemory/physicalmemory_nosupport.c
+        src/detection/physicalmemory/physicalmemory_linux.c
         src/detection/diskio/diskio_nosupport.c
         src/detection/displayserver/displayserver_haiku.cpp
         src/detection/font/font_haiku.cpp
         src/detection/gpu/gpu_haiku.c
         src/detection/gpu/gpu_pci.c
         src/detection/gtk_qt/gtk.c
-        src/detection/host/host_nosupport.c
+        src/detection/host/host_windows.c
         src/detection/icons/icons_nosupport.c
         src/detection/initsystem/initsystem_linux.c
         src/detection/keyboard/keyboard_nosupport.c
diff --git a/doc/json_schema.json b/doc/json_schema.json
@@ -817,8 +817,8 @@
                         "unit": {
                             "type": "string",
                             "description": "Set the unit of the temperature",
-                            "enum": ["CELSIUS", "C", "FAHRENHEIT", "F", "KELVIN", "K"],
-                            "default": "C"
+                            "enum": ["D", "Default", "Celsius", "C", "Fahrenheit", "F", "Kelvin", "K"],
+                            "default": "D"
                         },
                         "ndigits": {
                             "type": "integer",
diff --git a/src/common/netif/netif_haiku.c b/src/common/netif/netif_haiku.c
@@ -24,10 +24,10 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
         return false;
 
     int size = config.ifc_value;
-    if (size == 0)
+    if (size <= 0)
         return false;
 
-    FF_AUTO_FREE void *buffer = malloc(size);
+    FF_AUTO_FREE void *buffer = malloc((size_t) size);
     if (buffer == NULL) {
         return false;
     }
diff --git a/src/common/temps.c b/src/common/temps.c
@@ -39,6 +39,7 @@ void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig confi
 
     switch (options->tempUnit)
     {
+        case FF_TEMPERATURE_UNIT_DEFAULT:
         case FF_TEMPERATURE_UNIT_CELSIUS:
             ffStrbufAppendF(buffer, "%.*f°C", options->tempNdigits, celsius);
             break;
diff --git a/src/data/help.json b/src/data/help.json
@@ -722,11 +722,12 @@
             "arg": {
                 "type": "enum",
                 "enum": {
+                    "D": "Default",
                     "C": "Celsius",
                     "F": "Fahrenheit",
                     "K": "Kelvin"
                 },
-                "default": "C"
+                "default": "D"
             }
         },
         {
diff --git a/src/detection/battery/battery_haiku.c b/src/detection/battery/battery_haiku.c
@@ -28,7 +28,7 @@ const char* parseBattery(int dfd, const char* battId, FFlist* results)
     battery->temperature = FF_BATTERY_TEMP_UNSET;
     battery->cycleCount = extended.cycles;
     battery->timeRemaining = -1;
-    battery->capacity = (double) basic.capacity / (double) extended.last_full_charge;
+    battery->capacity = (double) basic.capacity * 100. / (double) extended.last_full_charge;
 
     if (basic.state & BATTERY_DISCHARGING)
         ffStrbufAppendS(&battery->status, "Discharging, ");
@@ -44,7 +44,7 @@ const char* parseBattery(int dfd, const char* battId, FFlist* results)
     return NULL;
 }
 
-const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
 {
     FF_AUTO_CLOSE_DIR DIR* dir = opendir("/dev/power/acpi_battery/");
     if (!dir) return "opendir(/dev/power/acpi_battery) failed";
diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c
@@ -18,7 +18,7 @@ static void paSinkInfoCallback(pa_context *c, const pa_sink_info *i, int eol, vo
     ffStrbufInitS(&device->name, i->description);
     ffStrbufTrimRightSpace(&device->name);
     ffStrbufTrimLeft(&device->name, ' ');
-    device->volume = i->mute ? 0 : (uint8_t) (i->volume.values[0] * 100 / PA_VOLUME_NORM);
+    device->volume = i->mute ? 0 : (uint8_t) ((i->volume.values[0] * 100 + PA_VOLUME_NORM / 2 /*round*/) / PA_VOLUME_NORM);
     device->active = i->active_port && i->active_port->available != PA_PORT_AVAILABLE_NO;
     device->main = false;
 }
diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c
@@ -41,7 +41,7 @@ const char* ffDetectSound(FFlist* devices)
         ffStrbufInitS(&device->name, ad.name);
         ffStrbufTrimRightSpace(&device->name);
         ffStrbufInitF(&device->platformApi, "%s", "SunAudio");
-        device->volume = (uint8_t) (ai.play.gain * 100 / AUDIO_MAX_GAIN);
+        device->volume = (uint8_t) ((ai.play.gain * 100 + AUDIO_MAX_GAIN / 2) / AUDIO_MAX_GAIN);
         device->active = true;
         device->main = defaultDev == idev;
     }
diff --git a/src/detection/sound/sound_obsd.c b/src/detection/sound/sound_obsd.c
@@ -80,7 +80,7 @@ const char* ffDetectSound(FFlist* devices)
         if (!bundle.mute[i])
             totalLevel += bundle.level[i];
     }
-    device->volume = (uint8_t) (totalLevel * 100 / bundle.iLevel);
+    device->volume = (uint8_t) ((totalLevel * 100 + bundle.iLevel / 2) / bundle.iLevel);
 
     return NULL;
 }
diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c
@@ -747,7 +747,7 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
 
     #endif
 
-    #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun) || defined(__NetBSD__)
+    #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun) || defined(__NetBSD__) || defined(__HAIKU__)
 
     if(ffStrbufStartsWithIgnCaseS(processName, "gnome-terminal"))
         return getTerminalVersionGnome(exe, version);
diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c
@@ -19,6 +19,17 @@ void ffPrepareWeather(FFWeatherOptions* options)
         ffStrbufAppend(&path, &options->location);
     ffStrbufAppendS(&path, "?format=");
     ffStrbufAppend(&path, &options->outputFormat);
+    switch (instance.config.display.tempUnit)
+    {
+        case FF_TEMPERATURE_UNIT_CELSIUS:
+            ffStrbufAppendS(&path, "&m");
+            break;
+        case FF_TEMPERATURE_UNIT_FAHRENHEIT:
+            ffStrbufAppendS(&path, "&u");
+            break;
+        default:
+            break;
+    }
     status = ffNetworkingSendHttpRequest(&state, "wttr.in", path.chars, "User-Agent: curl/0.0.0\r\n");
 }
 
diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c
@@ -160,6 +160,7 @@ static FFModuleBaseInfo ffModuleInfo = {
     .parseJsonObject = (void*) ffParsePhysicalMemoryJsonObject,
     .printModule = (void*) ffPrintPhysicalMemory,
     .generateJsonConfig = (void*) ffGeneratePhysicalMemoryJsonConfig,
+    .generateJsonResult = (void*) ffGeneratePhysicalMemoryJsonResult,
     .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
         {"Size (in bytes)", "bytes"},
         {"Size formatted", "size"},
diff --git a/src/options/display.c b/src/options/display.c
@@ -130,6 +130,8 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             {
                 int value;
                 const char* error = ffJsonConfigParseEnum(unit, &value, (FFKeyValuePair[]) {
+                    { "DEFAULT", FF_TEMPERATURE_UNIT_DEFAULT },
+                    { "D", FF_TEMPERATURE_UNIT_DEFAULT },
                     { "CELSIUS", FF_TEMPERATURE_UNIT_CELSIUS },
                     { "C", FF_TEMPERATURE_UNIT_CELSIUS },
                     { "FAHRENHEIT", FF_TEMPERATURE_UNIT_FAHRENHEIT },
@@ -418,6 +420,8 @@ bool ffOptionsParseDisplayCommandLine(FFOptionsDisplay* options, const char* key
         if(ffStrEqualsIgnCase(subkey, "unit"))
         {
             options->tempUnit = (FFTemperatureUnit) ffOptionParseEnum(key, value, (FFKeyValuePair[]) {
+                { "DEFAULT", FF_TEMPERATURE_UNIT_DEFAULT },
+                { "D", FF_TEMPERATURE_UNIT_DEFAULT },
                 { "CELSIUS", FF_TEMPERATURE_UNIT_CELSIUS },
                 { "C", FF_TEMPERATURE_UNIT_CELSIUS },
                 { "FAHRENHEIT", FF_TEMPERATURE_UNIT_FAHRENHEIT },
@@ -513,7 +517,7 @@ void ffOptionsInitDisplay(FFOptionsDisplay* options)
     options->keyPaddingLeft = 0;
     options->keyType = FF_MODULE_KEY_TYPE_STRING;
 
-    options->tempUnit = FF_TEMPERATURE_UNIT_CELSIUS;
+    options->tempUnit = FF_TEMPERATURE_UNIT_DEFAULT;
     options->tempNdigits = 1;
     ffStrbufInitStatic(&options->tempColorGreen, FF_COLOR_FG_GREEN);
     ffStrbufInitStatic(&options->tempColorYellow, instance.state.terminalLightTheme ? FF_COLOR_FG_YELLOW : FF_COLOR_FG_LIGHT_YELLOW);
@@ -643,6 +647,9 @@ void ffOptionsGenerateDisplayJsonConfig(FFOptionsDisplay* options, yyjson_mut_do
         {
             switch (options->tempUnit)
             {
+                case FF_TEMPERATURE_UNIT_DEFAULT:
+                    yyjson_mut_obj_add_str(doc, temperature, "unit", "DEFAULT");
+                    break;
                 case FF_TEMPERATURE_UNIT_CELSIUS:
                     yyjson_mut_obj_add_str(doc, obj, "unit", "C");
                     break;
diff --git a/src/options/display.h b/src/options/display.h
@@ -11,6 +11,7 @@ typedef enum __attribute__((__packed__)) FFSizeBinaryPrefixType
 
 typedef enum __attribute__((__packed__)) FFTemperatureUnit
 {
+    FF_TEMPERATURE_UNIT_DEFAULT,
     FF_TEMPERATURE_UNIT_CELSIUS,
     FF_TEMPERATURE_UNIT_FAHRENHEIT,
     FF_TEMPERATURE_UNIT_KELVIN,
diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c
@@ -50,7 +50,7 @@ const FFSmbiosHeader* ffSmbiosNextEntry(const FFSmbiosHeader* header)
     return (const FFSmbiosHeader*) (p + 1);
 }
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__sun)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__sun) || defined(__HAIKU__)
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -135,6 +135,7 @@ const FFSmbiosHeaderTable* ffGetSmbiosHeaderTable()
 
     if (buffer.chars == NULL)
     {
+        #ifndef __HAIKU__
         #ifdef __linux__
         if (!ffAppendFileBuffer("/sys/firmware/dmi/tables/DMI", &buffer))
         #endif
@@ -216,6 +217,50 @@ const FFSmbiosHeaderTable* ffGetSmbiosHeaderTable()
                 munmap(p, tableLength);
             }
         }
+        #else
+        {
+            uint32_t tableLength = 0;
+            off_t tableAddress = 0;
+            FF_AUTO_CLOSE_FD int fd = open("/dev/misc/mem", O_RDONLY);
+            if (fd < 0)
+                return NULL;
+            FF_AUTO_FREE uint8_t* smBiosBase = malloc(0x10000);
+            if (pread(fd, smBiosBase, 0x10000, 0xF0000) != 0x10000)
+                return NULL;
+
+            for (off_t offset = 0; offset <= 0xffe0; offset += 0x10)
+            {
+                FFSmbiosEntryPoint* p = (void*)(smBiosBase + offset);
+                if (memcmp(p, "_SM3_", sizeof(p->Smbios30.AnchorString)) == 0)
+                {
+                    if (p->Smbios30.EntryPointLength != sizeof(p->Smbios30))
+                        return NULL;
+                    tableLength = p->Smbios30.StructureTableMaximumSize;
+                    tableAddress = (off_t) p->Smbios30.StructureTableAddress;
+                    break;
+                }
+                else if (memcmp(p, "_SM_", sizeof(p->Smbios20.AnchorString)) == 0)
+                {
+                    if (p->Smbios20.EntryPointLength != sizeof(p->Smbios20))
+                        return NULL;
+                    tableLength = p->Smbios20.StructureTableLength;
+                    tableAddress = (off_t) p->Smbios20.StructureTableAddress;
+                    break;
+                }
+            }
+            if (tableLength == 0)
+                return NULL;
+
+            ffStrbufEnsureFixedLengthFree(&buffer, tableLength);
+            if (pread(fd, buffer.chars, tableLength, tableAddress) == tableLength)
+            {
+                buffer.length = tableLength;
+                buffer.chars[buffer.length] = '\0';
+            }
+            else
+                return NULL;
+        }
+        #endif
 
         for (
             const FFSmbiosHeader* header = (const FFSmbiosHeader*) buffer.chars;
diff --git a/src/util/stringUtils.h b/src/util/stringUtils.h
@@ -83,7 +83,7 @@ static inline bool ffCharIsDigit(char c)
 // Copies at most (dstBufSiz - 1) bytes from src to dst; dst is always null-terminated
 static inline char* ffStrCopy(char* __restrict__ dst, const char* __restrict__ src, size_t dstBufSiz)
 {
-    if (__builtin_expect(dst == NULL, false)) return dst;
+    if (__builtin_expect(dst == NULL, false) || dstBufSiz == 0) return dst;
 
     size_t len = strnlen(src, dstBufSiz - 1);
     memcpy(dst, src, len);

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig confi`
`39`	`39`
`40`	`40`	`switch (options->tempUnit)`
`41`	`41`	`{`
	`42`	`+ case FF_TEMPERATURE_UNIT_DEFAULT:`
`42`	`43`	`case FF_TEMPERATURE_UNIT_CELSIUS:`
`43`	`44`	`ffStrbufAppendF(buffer, "%.*f°C", options->tempNdigits, celsius);`
`44`	`45`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -722,11 +722,12 @@`
`722`	`722`	`"arg": {`
`723`	`723`	`"type": "enum",`
`724`	`724`	`"enum": {`
	`725`	`+ "D": "Default",`
`725`	`726`	`"C": "Celsius",`
`726`	`727`	`"F": "Fahrenheit",`
`727`	`728`	`"K": "Kelvin"`
`728`	`729`	`},`
`729`		`- "default": "C"`
	`730`	`+ "default": "D"`
`730`	`731`	`}`
`731`	`732`	`},`
`732`	`733`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ static void paSinkInfoCallback(pa_context c, const pa_sink_info i, int eol, vo`
`18`	`18`	`ffStrbufInitS(&device->name, i->description);`
`19`	`19`	`ffStrbufTrimRightSpace(&device->name);`
`20`	`20`	`ffStrbufTrimLeft(&device->name, ' ');`
`21`		`- device->volume = i->mute ? 0 : (uint8_t) (i->volume.values[0] * 100 / PA_VOLUME_NORM);`
	`21`	`+ device->volume = i->mute ? 0 : (uint8_t) ((i->volume.values[0] * 100 + PA_VOLUME_NORM / 2 /round/) / PA_VOLUME_NORM);`
`22`	`22`	`device->active = i->active_port && i->active_port->available != PA_PORT_AVAILABLE_NO;`
`23`	`23`	`device->main = false;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ const char* ffDetectSound(FFlist* devices)`
`41`	`41`	`ffStrbufInitS(&device->name, ad.name);`
`42`	`42`	`ffStrbufTrimRightSpace(&device->name);`
`43`	`43`	`ffStrbufInitF(&device->platformApi, "%s", "SunAudio");`
`44`		`- device->volume = (uint8_t) (ai.play.gain * 100 / AUDIO_MAX_GAIN);`
	`44`	`+ device->volume = (uint8_t) ((ai.play.gain * 100 + AUDIO_MAX_GAIN / 2) / AUDIO_MAX_GAIN);`
`45`	`45`	`device->active = true;`
`46`	`46`	`device->main = defaultDev == idev;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ const char* ffDetectSound(FFlist* devices)`
`80`	`80`	`if (!bundle.mute[i])`
`81`	`81`	`totalLevel += bundle.level[i];`
`82`	`82`	`}`
`83`		`- device->volume = (uint8_t) (totalLevel * 100 / bundle.iLevel);`
	`83`	`+ device->volume = (uint8_t) ((totalLevel * 100 + bundle.iLevel / 2) / bundle.iLevel);`
`84`	`84`
`85`	`85`	`return NULL;`
`86`	`86`	`}`