uptime: Port to OpenBSD.

In OpenBSD uptime gets fetched using sysctl now.

diff --git a/README b/README
index ddd295bc304c1394d5ba4be8f20405e436bb9db5..0eac61a25db82ea1becccffb65b3a8c44b6fb796 100644 (file)
--- a/README
+++ b/README
@@ -62,7 +62,6 @@ Todo
 Porting to OpenBSD is the current goal before thinking about a release.
 
 The following functions are not portable at the moment:
-- uptime
 - ipv{4,6}
 - ram_{free,perc,total,used}
 - wifi_{perc,essid}

diff --git a/components/uptime.c b/components/uptime.c
index 36f03b1f39d366784de643ab1caa9df41aebc144..c5e28ee0892093fa31e587201ad91621282a3378 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,20 +1,45 @@
 /* See LICENSE file for copyright and license details. */
+#include <stdio.h>
 #ifdef __linux__
 #include <sys/sysinfo.h>
+#elif __OpenBSD__
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#endif
 
 #include "../util.h"
 
 const char *
 uptime(void)
 {
+       int h;
+       int m;
+       int uptime = 0;
+#ifdef __linux__
        struct sysinfo info;
-       int h = 0;
-       int m = 0;
 
        sysinfo(&info);
-       h = info.uptime / 3600;
-       m = (info.uptime - h * 3600 ) / 60;
+       uptime = info.uptime;
+#elif __OpenBSD__
+       int mib[2];
+       size_t size;
+       time_t now;
+       struct timeval boottime;
+
+       time(&now);
+
+       mib[0] = CTL_KERN;
+       mib[1] = KERN_BOOTTIME;
+
+       size = sizeof(boottime);
+
+       if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
+               uptime = now - boottime.tv_sec;
+       else
+               return NULL;
+#endif
+       h = uptime / 3600;
+       m = (uptime - h * 3600) / 60;
 
        return bprintf("%dh %dm", h, m);
 }
-#endif