uptime: Improve typing and sort headers

[slstatus.git] / components / uptime.c

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

-#include <errno.h>
+#include <inttypes.h>

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

-#include <string.h>
+#include <time.h>

 
 #include "../util.h"
 
 
 #include "../util.h"
 

-#if defined(__linux__)
-       #include <sys/sysinfo.h>
+const char *
+uptime(void)
+{
+       uint64_t h, m;
+       struct timespec uptime;

 
 

-       const char *
-       uptime(void)
-       {
-               int h;
-               int m;
-               int uptime = 0;
-               struct sysinfo info;
-
-               sysinfo(&info);
-               uptime = info.uptime;
-
-               h = uptime / 3600;
-               m = (uptime - h * 3600) / 60;
-
-               return bprintf("%dh %dm", h, m);
+       if (clock_gettime(CLOCK_BOOTTIME, &uptime) < 0) {
+               warn("clock_gettime 'CLOCK_BOOTTIME'");
+               return NULL;

        }
        }

-#elif defined(__OpenBSD__)
-       #include <sys/sysctl.h>
-       #include <sys/time.h>
-
-       const char *
-       uptime(void)
-       {
-               int h;
-               int m;
-               int uptime = 0;
-
-               int mib[2];
-               size_t size;
-               time_t now;
-               struct timeval boottime;

 
 

-               time(&now);
+       h = uptime.tv_sec / 3600;
+       m = uptime.tv_sec % 3600 / 60;

 
 

-               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 {
-                       fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
-                       return NULL;
-               }
-
-               h = uptime / 3600;
-               m = (uptime - h * 3600) / 60;
-
-               return bprintf("%dh %dm", h, m);
-       }
-#endif
+       return bprintf("%" PRIu64 "h %" PRIu64 "m", h, m);
+}