uptime: unification of the uptime function for linux/openbsd

diff --git a/components/uptime.c b/components/uptime.c
index 8f15d71a4b6729107362ab3bdca02c4a68c1efe3..274b41b286bce9a8ccb13f6db0139bc274bbd1e7 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,59 +1,19 @@
 /* See LICENSE file for copyright and license details. */
+#include <time.h>
 #include <stdio.h>
 
 #include "../util.h"
 
-static const char *
-format(int uptime)
+const char *
+uptime(void)
 {
        int h, m;
-
-       h = uptime / 3600;
-       m = (uptime - h * 3600) / 60;
-
+       struct timespec uptime;
+       if (clock_gettime(CLOCK_BOOTTIME, &uptime) < 0) {
+               warn("clock_gettime 'CLOCK_BOOTTIME'");
+               return NULL;
+       }
+       h = uptime.tv_sec / 3600;
+       m = uptime.tv_sec % 3600 / 60;
        return bprintf("%dh %dm", h, m);
 }
-
-#if defined(__linux__)
-       #include <sys/sysinfo.h>
-
-       const char *
-       uptime(void)
-       {
-               int uptime;
-               struct sysinfo info;
-
-               sysinfo(&info);
-               uptime = info.uptime;
-
-               return format(uptime);
-       }
-#elif defined(__OpenBSD__)
-       #include <sys/sysctl.h>
-       #include <sys/time.h>
-
-       const char *
-       uptime(void)
-       {
-               int mib[2], uptime;
-               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) < 0) {
-                       warn("sysctl 'KERN_BOOTTIME':");
-                       return NULL;
-               }
-
-               uptime = now - boottime.tv_sec;
-
-               return format(uptime);
-       }
-#endif