slstatus

Unnamed repository; edit this file 'description' to name the repository.
git clone https://git.beauhilton.com/slstatus.git
Log | Files | Refs | README | LICENSE

commit fc5d23212fdaec8c242db9b25770f290dd287212
parent 7e3f80c1a39e16973f3c9235d3f9d85df0d1b995
Author: Aaron Marcher <me@drkhsh.at>
Date:   Tue, 20 Mar 2018 00:48:10 +0100

uptime: Port to OpenBSD.

In OpenBSD uptime gets fetched using sysctl now.

Diffstat:
MREADME | 1-
Mcomponents/uptime.c | 35++++++++++++++++++++++++++++++-----
2 files changed, 30 insertions(+), 6 deletions(-)

diff --git 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 @@ -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