Revert component-split

this reverts the commits from 92ab9ef52e up to
d42870d6ca.

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.

LICENSE

@@ -7,7 +7,7 @@ Copyright 2016 Vincent Loupmon <vincentloupmon@gmail.com>
 Copyright 2016 Daniel Walter <d.walter@0x90.at>
 Copyright 2016-2018 Ali H. Fardan <raiz@firemail.cc>
 Copyright 2016 Jody Leonard <me@jodyleonard.com>
-Copyright 2016-2018 Quentin Rameau <quinq@fifth.space>
+Copyright 2016-2017 Quentin Rameau <quinq@fifth.space>
 Copyright 2016 Mike Coddington <mike@coddington.us>
 Copyright 2016-2018 parazyd <parazyd@dyne.org>
 Copyright 2017 Tobias Stoeckmann <tobias@stoeckmann.org>

Makefile

@@ -2,34 +2,29 @@
 # slstatus - suckless status monitor
 .POSIX:
 
-include os.mk
 include config.mk
 
 REQ = util
 COM =\
-	components/$(OS)/battery \
+	components/battery\
-	components/$(OS)/cpu \
+	components/cpu\
 	components/datetime\
 	components/disk\
-	components/$(OS)/entropy \
+	components/entropy\
 	components/hostname\
 	components/ip\
 	components/kernel_release\
 	components/keyboard_indicators\
 	components/load_avg\
 	components/num_files\
-	components/$(OS)/ram \
+	components/ram\
 	components/run_command\
-	components/$(OS)/swap \
+	components/swap\
-	components/$(OS)/temperature \
+	components/temperature\
-	components/$(OS)/uptime \
+	components/uptime\
 	components/user\
 	components/volume\
-	components/$(OS)/wifi
+	components/wifi
-
-SLSCFLAGS  = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS)
-SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS)
-SLSLIBS    = -lX11 $(OSLIBS) $(LIBS)
 
 all: slstatus
 
@@ -41,18 +36,14 @@ config.h:
 	cp config.def.h $@
 
 .o:
-	$(CC) -o $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
+	$(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
 
 .c.o:
-	$(CC) -o $@ -c $(SLSCFLAGS) $<
+	$(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
 
 clean:
 	rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
 
-distclean:
-	for os in Linux OpenBSD; do make OS="$$os" clean; done
-	rm -f os.mk
-
 dist:
 	rm -rf "slstatus-$(VERSION)"
 	mkdir -p "slstatus-$(VERSION)/components"

README

@@ -36,9 +36,8 @@ In order to build slstatus you need the Xlib header files.
 
 Installation
 ------------
-Run ./configure first to detect your operating system.
+Edit config.mk to match your local setup (slstatus is installed into the
-Optionally edit config.mk to match your local setup (slstatus is installed into
+/usr/local namespace by default). Uncomment OSSLIBS on OpenBSD.
-the /usr/local namespace by default). Uncomment OSSLIBS on OpenBSD.
 
 Afterwards enter the following command to build and install slstatus (if
 necessary as root):

components/Linux/ram.c

@@ -1,52 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "../../util.h"
-
-const char *
-ram_free(void)
-{
-	long free;
-
-	return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
-	       bprintf("%f", (float)free / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_perc(void)
-{
-	long total, free, buffers, cached;
-
-	return (pscanf("/proc/meminfo",
-	               "MemTotal: %ld kB\n"
-	               "MemFree: %ld kB\n"
-	               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-	               "Cached: %ld kB\n",
-	               &total, &free, &buffers, &buffers, &cached) == 5) ?
-	       bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
-	       NULL;
-}
-
-const char *
-ram_total(void)
-{
-	long total;
-
-	return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-	       bprintf("%f", (float)total / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_used(void)
-{
-	long total, free, buffers, cached;
-
-	return (pscanf("/proc/meminfo",
-	               "MemTotal: %ld kB\n"
-	               "MemFree: %ld kB\n"
-	               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-	               "Cached: %ld kB\n",
-	               &total, &free, &buffers, &buffers, &cached) == 5) ?
-	       bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
-	       NULL;
-}

components/Linux/temperature.c

@@ -1,15 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../../util.h"
-
-const char *
-temp(const char *file)
-{
-	int temp;
-
-	return (pscanf(file, "%d", &temp) == 1) ?
-	       bprintf("%d", temp / 1000) : NULL;
-}

components/Linux/uptime.c

@@ -1,24 +0,0 @@
-/* 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);
-}

components/OpenBSD/battery.c

@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-
-#include "../../util.h"
-
-const char *
-battery_perc(const char *null)
-{
-	struct apm_power_info apm_info;
-	int fd;
-
-	fd = open("/dev/apm", O_RDONLY);
-	if (fd < 0) {
-		fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
-		return NULL;
-	}
-
-	if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-		fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
-		close(fd);
-		return NULL;
-	}
-	close(fd);
-
-	return bprintf("%d", apm_info.battery_life);
-}

components/OpenBSD/cpu.c

@@ -1,26 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysctl.h>
-
-#include "../../util.h"
-
-const char *
-cpu_freq(void)
-{
-	int freq, mib[2];
-	size_t size;
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_CPUSPEED;
-
-	size = sizeof(freq);
-
-	if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
-		fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
-		return NULL;
-	}
-
-	return bprintf("%d", freq);
-}

components/OpenBSD/ram.c

@@ -1,77 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "../../util.h"
-
-inline int
-load_uvmexp(struct uvmexp *uvmexp)
-{
-	int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
-	size_t size;
-
-	size = sizeof(*uvmexp);
-
-	return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
-}
-
-const char *
-ram_free(void)
-{
-	struct uvmexp uvmexp;
-	float free;
-	int free_pages;
-
-	if (load_uvmexp(&uvmexp)) {
-		free_pages = uvmexp.npages - uvmexp.active;
-		free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
-		return bprintf("%f", free);
-	}
-
-	return NULL;
-}
-
-const char *
-ram_perc(void)
-{
-	struct uvmexp uvmexp;
-	int percent;
-
-	if (load_uvmexp(&uvmexp)) {
-		percent = uvmexp.active * 100 / uvmexp.npages;
-		return bprintf("%d", percent);
-	}
-
-	return NULL;
-}
-
-const char *
-ram_total(void)
-{
-	struct uvmexp uvmexp;
-	float total;
-
-	if (load_uvmexp(&uvmexp)) {
-		total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
-		return bprintf("%f", total);
-	}
-
-	return NULL;
-}
-
-const char *
-ram_used(void)
-{
-	struct uvmexp uvmexp;
-	float used;
-
-	if (load_uvmexp(&uvmexp)) {
-		used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
-		return bprintf("%f", used);
-	}
-
-	return NULL;
-}

components/battery.c

@@ -2,11 +2,19 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__linux__)
 #include <limits.h>
 #include <string.h>
+#elif defined(__OpenBSD__)
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <machine/apmvar.h>
+#endif
 
-#include "../../util.h"
+#include "../util.h"
 
+#if defined(__linux__)
 const char *
 battery_perc(const char *bat)
 {
@@ -17,7 +25,31 @@ battery_perc(const char *bat)
 	return (pscanf(path, "%i", &perc) == 1) ?
 	       bprintf("%d", perc) : NULL;
 }
+#elif defined(__OpenBSD__)
+const char *
+battery_perc(const char *null)
+{
+	struct apm_power_info apm_info;
+	int fd;
 
+	fd = open("/dev/apm", O_RDONLY);
+	if (fd < 0) {
+		fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+		return NULL;
+	}
+
+	if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+		fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
+		close(fd);
+		return NULL;
+	}
+	close(fd);
+
+	return bprintf("%d", apm_info.battery_life);
+}
+#endif
+
+#if defined(__linux__)
 const char *
 battery_power(const char *bat)
 {
@@ -56,3 +88,4 @@ battery_state(const char *bat)
 	}
 	return (i == LEN(map)) ? "?" : map[i].symbol;
 }
+#endif

components/cpu.c

@@ -2,9 +2,13 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__OpenBSD__)
+#include <sys/sysctl.h>
+#endif
 
-#include "../../util.h"
+#include "../util.h"
 
+#if defined(__linux__)
 const char *
 cpu_freq(void)
 {
@@ -62,3 +66,23 @@ cpu_iowait(void)
 
 	return bprintf("%d", perc);
 }
+#elif defined(__OpenBSD__)
+const char *
+cpu_freq(void)
+{
+	int freq, mib[2];
+	size_t size;
+
+	mib[0] = CTL_HW;
+	mib[1] = HW_CPUSPEED;
+
+	size = sizeof(freq);
+
+	if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
+		fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+		return NULL;
+	}
+
+	return bprintf("%d", freq);
+}
+#endif

components/entropy.c

@@ -1,7 +1,8 @@
 /* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
 #include <stdio.h>
 
-#include "../../util.h"
+#include "../util.h"
 
 const char *
 entropy(void)
@@ -11,3 +12,4 @@ entropy(void)
 	return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
 	               bprintf("%d", num) : NULL;
 }
+#endif

components/ram.c

@@ -0,0 +1,129 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+#if defined (__OpenBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+ram_free(void)
+{
+	long free;
+
+	return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
+	       bprintf("%f", (float)free / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_perc(void)
+{
+	long total, free, buffers, cached;
+
+	return (pscanf("/proc/meminfo",
+	               "MemTotal: %ld kB\n"
+	               "MemFree: %ld kB\n"
+	               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+	               "Cached: %ld kB\n",
+	               &total, &free, &buffers, &buffers, &cached) == 5) ?
+	       bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
+	       NULL;
+}
+
+const char *
+ram_total(void)
+{
+	long total;
+
+	return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
+	       bprintf("%f", (float)total / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_used(void)
+{
+	long total, free, buffers, cached;
+
+	return (pscanf("/proc/meminfo",
+	               "MemTotal: %ld kB\n"
+	               "MemFree: %ld kB\n"
+	               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+	               "Cached: %ld kB\n",
+	               &total, &free, &buffers, &buffers, &cached) == 5) ?
+	       bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
+	       NULL;
+}
+#elif defined(__OpenBSD__)
+inline int
+load_uvmexp(struct uvmexp *uvmexp)
+{
+	int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
+	size_t size;
+
+	size = sizeof(*uvmexp);
+
+	return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
+}
+
+const char *
+ram_free(void)
+{
+	struct uvmexp uvmexp;
+	float free;
+	int free_pages;
+
+	if (load_uvmexp(&uvmexp)) {
+		free_pages = uvmexp.npages - uvmexp.active;
+		free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
+		return bprintf("%f", free);
+	}
+
+	return NULL;
+}
+
+const char *
+ram_perc(void)
+{
+	struct uvmexp uvmexp;
+	int percent;
+
+	if (load_uvmexp(&uvmexp)) {
+		percent = uvmexp.active * 100 / uvmexp.npages;
+		return bprintf("%d", percent);
+	}
+
+	return NULL;
+}
+
+const char *
+ram_total(void)
+{
+	struct uvmexp uvmexp;
+	float total;
+
+	if (load_uvmexp(&uvmexp)) {
+		total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
+		return bprintf("%f", total);
+	}
+
+	return NULL;
+}
+
+const char *
+ram_used(void)
+{
+	struct uvmexp uvmexp;
+	float used;
+
+	if (load_uvmexp(&uvmexp)) {
+		used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
+		return bprintf("%f", used);
+	}
+
+	return NULL;
+}
+#endif

components/swap.c

@@ -1,9 +1,10 @@
 /* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "../../util.h"
+#include "../util.h"
 
 const char *
 swap_free(void)
@@ -134,3 +135,4 @@ swap_used(void)
 
 	return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
 }
+#endif

components/temperature.c

@@ -2,12 +2,24 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__OpenBSD__)
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/sensors.h>
+#endif
 
-#include "../../util.h"
+#include "../util.h"
 
+#if defined(__linux__)
+const char *
+temp(const char *file)
+{
+	int temp;
+
+	return (pscanf(file, "%d", &temp) == 1) ?
+	       bprintf("%d", temp / 1000) : NULL;
+}
+#elif defined(__OpenBSD__)
 const char *
 temp(const char *null)
 {
@@ -30,3 +42,4 @@ temp(const char *null)
 
 	return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
 }
+#endif

components/uptime.c

@@ -2,11 +2,33 @@
 #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)
 {
@@ -38,3 +60,4 @@ uptime(void)
 
 	return bprintf("%dh %dm", h, m);
 }
+#endif

components/wifi.c

@@ -1,4 +1,5 @@
 /* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
 #include <errno.h>
 #include <ifaddrs.h>
 #include <linux/wireless.h>
@@ -9,7 +10,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include "../../util.h"
+#include "../util.h"
 
 const char *
 wifi_perc(const char *iface)
@@ -88,3 +89,4 @@ wifi_essid(const char *iface)
 	else
 		return id;
 }
+#endif

config.mk

@@ -4,13 +4,20 @@ VERSION = 0
 # customize below to fit your system
 
 # paths
-PREFIX    = /usr/local
+PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
+# OpenBSD (uncomment)
+#OSSLIBS = -lossaudio
+
 # flags
+CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE
 CFLAGS   = -std=c99 -pedantic -Wall -Wextra -Os
-LDFLAGS  = -s
+LDFLAGS  = -L$(X11LIB) -s
-LIBS     = 
+LDLIBS   = -lX11 ${OSSLIBS}
+
+# compiler and linker
+CC = cc

configure

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-os="$(uname)"
-
-printf 'OS = %s\n' "$os" > os.mk
-
-if [ "$os" = "OpenBSD" ]
-then
-	printf 'OSLIBS = -lossaudio\n' >> os.mk
-fi