pk
/
slstatus
mirror of https://github.com/pikami/slstatus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uptime: OS split

This commit is contained in:
Quentin Rameau 2018-04-30 15:14:38 +02:00 committed by Aaron Marcher
parent 71eb1d321d
commit 19f3c8f545
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -22,7 +22,7 @@ COM =\
components/run_command\ components/run_command\
components/$(OS)/swap \ components/$(OS)/swap \
components/$(OS)/temperature \ components/$(OS)/temperature \
components/uptime\ components/$(OS)/uptime \
components/user\ components/user\
components/volume\ components/volume\
components/wifi components/wifi

24
components/Linux/uptime.c Normal file
View File

@ -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);
}

25
components/uptime.c → components/OpenBSD/uptime.c
View File

@ -2,33 +2,11 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if defined(__linux__)
#include <sys/sysinfo.h>
#elif defined(__OpenBSD__)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/time.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 * const char *
uptime(void) uptime(void)
{ {
@ -60,4 +38,3 @@ uptime(void)
return bprintf("%dh %dm", h, m); return bprintf("%dh %dm", h, m);
} }
#endif