diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | components/Linux/uptime.c | 24 | ||||
| -rw-r--r-- | components/OpenBSD/uptime.c (renamed from components/uptime.c) | 25 |
3 files changed, 26 insertions, 25 deletions
@@ -22,7 +22,7 @@ COM =\ components/run_command\ components/$(OS)/swap \ components/$(OS)/temperature \ - components/uptime\ + components/$(OS)/uptime \ components/user\ components/volume\ components/wifi diff --git a/components/Linux/uptime.c b/components/Linux/uptime.c new file mode 100644 index 0000000..e7afc8e --- /dev/null +++ b/components/Linux/uptime.c @@ -0,0 +1,24 @@ +/* See LICENSE file for copyright and license details. */ +#include <errno.h> +#include <stdio.h> +#include <string.h> +#include <sys/sysinfo.h> + +#include "../../util.h" + +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); +} diff --git a/components/uptime.c b/components/OpenBSD/uptime.c index debe4cb..637e2e0 100644 --- a/components/uptime.c +++ b/components/OpenBSD/uptime.c @@ -2,33 +2,11 @@ #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" +#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) { @@ -60,4 +38,3 @@ uptime(void) return bprintf("%dh %dm", h, m); } -#endif |