uptime: Improve typing and sort headers

[slstatus.git] / components / uptime.c

diff --git a/components/uptime.c b/components/uptime.c
index c5e28ee..f957f17 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,45 +1,23 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

+#include <inttypes.h>

 #include <stdio.h>
 #include <stdio.h>

-#ifdef __linux__
-#include <sys/sysinfo.h>
-#elif __OpenBSD__
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#endif
+#include <time.h>

 
 #include "../util.h"
 
 const char *
 uptime(void)
 {
 
 #include "../util.h"
 
 const char *
 uptime(void)
 {

-       int h;
-       int m;
-       int uptime = 0;
-#ifdef __linux__
-       struct sysinfo info;
+       uint64_t h, m;
+       struct timespec uptime;

 
 

-       sysinfo(&info);
-       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
+       if (clock_gettime(CLOCK_BOOTTIME, &uptime) < 0) {
+               warn("clock_gettime 'CLOCK_BOOTTIME'");

                return NULL;
                return NULL;

-#endif
-       h = uptime / 3600;
-       m = (uptime - h * 3600) / 60;
+       }
+
+       h = uptime.tv_sec / 3600;
+       m = uptime.tv_sec % 3600 / 60;

 
 

-       return bprintf("%dh %dm", h, m);
+       return bprintf("%" PRIu64 "h %" PRIu64 "m", h, m);

 }
 }