[hackers] [slstatus] uptime: OS split || Quentin Rameau

From: <git_AT_suckless.org>
Date: Mon, 30 Apr 2018 15:44:42 +0200 (CEST)

commit 19f3c8f545237f9db5e994220f3529b192b4bf39
Author: Quentin Rameau <quinq_AT_fifth.space>
AuthorDate: Mon Apr 30 15:14:38 2018 +0200
Commit: Aaron Marcher <me_AT_drkhsh.at>
CommitDate: Mon Apr 30 15:42:08 2018 +0200

    uptime: OS split

diff --git a/Makefile b/Makefile
index c06e81d..067ef57 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -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
_AT_@ -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
similarity index 63%
rename from components/uptime.c
rename to components/OpenBSD/uptime.c
index debe4cb..637e2e0 100644
--- a/components/uptime.c
+++ b/components/OpenBSD/uptime.c
_AT_@ -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)
 {
_AT_@ -60,4 +38,3 @@ uptime(void)
 
         return bprintf("%dh %dm", h, m);
 }
-#endif
Received on Mon Apr 30 2018 - 15:44:42 CEST