X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/c3ce506b7fe4c9615c8bf1b6936dd235d6c04750..a1ac203d16c379d7fc05765545af2977a7a3584d:/components/temperature.c?ds=sidebyside

diff --git a/components/temperature.c b/components/temperature.c
index e2c6a77..8462d0f 100644
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -1,45 +1,71 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#if defined(__OpenBSD__)
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/sensors.h>
-#endif
+#include <stddef.h>
 
 #include "../util.h"
 
+
 #if defined(__linux__)
-const char *
-temp(const char *file)
-{
-	int temp;
-
-	return (pscanf(file, "%d", &temp) == 1) ?
-	       bprintf("%d", temp / 1000) : NULL;
-}
+	#include <stdint.h>
+
+	const char *
+	temp(const char *file)
+	{
+		uintmax_t temp;
+
+		if (pscanf(file, "%ju", &temp) != 1) {
+			return NULL;
+		}
+
+		return bprintf("%ju", temp / 1000);
+	}
 #elif defined(__OpenBSD__)
-const char *
-temp(const char *null)
-{
-	int mib[5];
-	size_t size;
-	struct sensor temp;
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_SENSORS;
-	mib[2] = 0; /* cpu0 */
-	mib[3] = SENSOR_TEMP;
-	mib[4] = 0; /* temp0 */
-
-	size = sizeof(temp);
-
-	if (sysctl(mib, 5, &temp, &size, NULL, 0) == -1) {
-		fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", strerror(errno));
-		return NULL;
+	#include <stdio.h>
+	#include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
+	#include <sys/sensors.h>
+	#include <sys/sysctl.h>
+
+	const char *
+	temp(const char *unused)
+	{
+		int mib[5];
+		size_t size;
+		struct sensor temp;
+
+		mib[0] = CTL_HW;
+		mib[1] = HW_SENSORS;
+		mib[2] = 0; /* cpu0 */
+		mib[3] = SENSOR_TEMP;
+		mib[4] = 0; /* temp0 */
+
+		size = sizeof(temp);
+
+		if (sysctl(mib, 5, &temp, &size, NULL, 0) < 0) {
+			warn("sysctl 'SENSOR_TEMP':");
+			return NULL;
+		}
+
+		/* kelvin to celsius */
+		return bprintf("%d", (temp.value - 273150000) / 1E6);
 	}
+#elif defined(__FreeBSD__)
+	#include <stdio.h>
+	#include <stdlib.h>
+	#include <sys/sysctl.h>
 
-	return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
-}
+	const char *
+	temp(const char *zone)
+	{
+		char buf[256];
+		int temp;
+		size_t len;
+
+		len = sizeof(temp);
+		snprintf(buf, sizeof(buf), "hw.acpi.thermal.%s.temperature", zone);
+		if (sysctlbyname(buf, &temp, &len, NULL, 0) == -1
+				|| !len)
+			return NULL;
+
+		/* kelvin to decimal celcius */
+		return bprintf("%d.%d", (temp - 2731) / 10, abs((temp - 2731) % 10));
+	}
 #endif