temperature: OS split

[slstatus.git] / components / uptime.c

diff --git a/components/uptime.c b/components/uptime.c
index c5e28ee..debe4cb 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,26 +1,41 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
 #include <stdio.h>
-#ifdef __linux__
+#include <string.h>
+#if defined(__linux__)
 #include <sys/sysinfo.h>
-#elif __OpenBSD__
+#elif defined(__OpenBSD__)
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #endif
 
 #include "../util.h"
 
+#if defined(__linux__)
 const char *
 uptime(void)
 {
        int h;
        int m;
        int uptime = 0;
-#ifdef __linux__
        struct sysinfo info;
 
        sysinfo(&info);
        uptime = info.uptime;
-#elif __OpenBSD__
+
+       h = uptime / 3600;
+       m = (uptime - h * 3600) / 60;
+
+       return bprintf("%dh %dm", h, m);
+}
+#elif defined(__OpenBSD__)
+const char *
+uptime(void)
+{
+       int h;
+       int m;
+       int uptime = 0;
+
        int mib[2];
        size_t size;
        time_t now;
@@ -35,11 +50,14 @@ uptime(void)
 
        if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
                uptime = now - boottime.tv_sec;
-       else
+       else {
+               fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
                return NULL;
-#endif
+       }
+
        h = uptime / 3600;
        m = (uptime - h * 3600) / 60;
 
        return bprintf("%dh %dm", h, m);
 }
+#endif