M Makefile → Makefile

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

A 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);
+}

M components/uptime.c → components/OpenBSD/uptime.c

@@ -2,33 +2,11 @@ /* 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;
+#include "../../util.h"
 
-	return bprintf("%dh %dm", h, m);
-}
-#elif defined(__OpenBSD__)
 const char *
 uptime(void)
 {
@@ -60,4 +38,3 @@ m = (uptime - h * 3600) / 60;
 
 	return bprintf("%dh %dm", h, m);
 }
-#endif