42edfea89a
this reverts the commits from92ab9ef52eup tod42870d6ca. After heavy consideration, the component split has more disadvantages than advantages, especially given there will be utility-functions sharing quite a lot of code that would then need to be duplicated, as it does not fit into the util.c due to its speciality. One big advantage of the component-wise build is readability, and without doubt, this was achieved here. This point will be addressed with a different approach that will be visible in the upcoming commits. One big disadvantage of the component build is the fact that it introduces state to the build process which is not necessary. Before its introduction, the only influencing factors where the system-defines __linux__ and __OpenBSD__. With the components, we are also relying on the output of uname(1). Additionally, if the os.mk is not present, make gives the output $ make Makefile:5: os.mk: No such file or directory make: *** No rule to make target 'os.mk'. Stop. This could easily be fixed by providing some sort of meta-rule for this file, however, it indicates the problem we have here, and this entire statefulness will heavily complicate packaging of this tool and makes the build process much more complex than it actually has to be.
64 lines
1 KiB
C
64 lines
1 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#if defined(__linux__)
|
|
#include <sys/sysinfo.h>
|
|
#elif defined(__OpenBSD__)
|
|
#include <sys/sysctl.h>
|
|
#include <sys/time.h>
|
|
#endif
|
|
|
|
#include "../util.h"
|
|
|
|
#if defined(__linux__)
|
|
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);
|
|
}
|
|
#elif defined(__OpenBSD__)
|
|
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);
|
|
|
|
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
|