From f2dea576d5051a860a6708c6bd170d35be18700d Mon Sep 17 00:00:00 2001
From: Christoph Lohmann <20h@r-36.net>
Date: Wed, 28 Dec 2022 19:09:11 +0100
Subject: Add Surf status to dwmstatus.

---
 dwmstatus.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dwmstatus.c b/dwmstatus.c
index ce7914a..a8cd4ac 100644
--- a/dwmstatus.c
+++ b/dwmstatus.c
@@ -208,6 +208,7 @@ main(void)
 	char *t0;
 	char *t1;
 	char *kbmap;
+	char *surfs;
 
 	if (!(dpy = XOpenDisplay(NULL))) {
 		fprintf(stderr, "dwmstatus: cannot open display.\n");
@@ -221,14 +222,16 @@ main(void)
 		tmutc = mktimes("%H:%M", tzutc);
 		tmbln = mktimes("KW %W %a %d %b %H:%M %Z %Y", tzberlin);
 		kbmap = execscript("setxkbmap -query | grep layout | cut -d':' -f 2- | tr -d ' '");
+		surfs = execscript("surf-status");
 		t0 = gettemperature("/sys/devices/virtual/thermal/thermal_zone0", "temp");
 		t1 = gettemperature("/sys/devices/virtual/thermal/thermal_zone1", "temp");
 
-		status = smprintf("K:%s T:%s|%s L:%s B:%s A:%s U:%s %s",
-				kbmap, t0, t1, avgs, bat, tmar, tmutc,
+		status = smprintf("S:%s K:%s T:%s|%s L:%s B:%s A:%s U:%s %s",
+				surfs, kbmap, t0, t1, avgs, bat, tmar, tmutc,
 				tmbln);
 		setstatus(status);
 
+		free(surfs);
 		free(kbmap);
 		free(t0);
 		free(t1);
-- 
cgit v1.2.3


From a30f9f5bd1c9c3fcd96b32e3919206df0e9306bf Mon Sep 17 00:00:00 2001
From: Christoph Lohmann <20h@r-36.net>
Date: Wed, 28 Dec 2022 19:09:24 +0100
Subject: Add dwmstatus-restart script as an example.

---
 dwmstatus-restart | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 dwmstatus-restart

diff --git a/dwmstatus-restart b/dwmstatus-restart
new file mode 100755
index 0000000..eec88d0
--- /dev/null
+++ b/dwmstatus-restart
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if pgrep -x dwmstatus 2>&1 >/dev/null;
+then
+	printf "Killing old dwmstatus instances ... "
+	pkill -KILL -x dwmstatus
+	printf "done.\n"
+fi
+
+if [ -e $HOME/.xinitrc ];
+then
+	cat $HOME/.xinitrc | grep dwmstatus | sh
+else
+	dwmstatus &
+fi
+
-- 
cgit v1.2.3


From 81cdc8f4a2528374842049c214937349b30fbebc Mon Sep 17 00:00:00 2001
From: Christoph Lohmann <20h@r-36.net>
Date: Sun, 29 Jan 2023 12:15:22 +0100
Subject: Close fd if there was an empty return.

* Not closing will use up all file descriptors over time.
---
 dwmstatus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dwmstatus.c b/dwmstatus.c
index a8cd4ac..1b53292 100644
--- a/dwmstatus.c
+++ b/dwmstatus.c
@@ -106,8 +106,10 @@ readfile(char *base, char *file)
 	if (fd == NULL)
 		return NULL;
 
-	if (fgets(line, sizeof(line)-1, fd) == NULL)
+	if (fgets(line, sizeof(line)-1, fd) == NULL) {
+		fclose(fd);
 		return NULL;
+	}
 	fclose(fd);
 
 	return smprintf("%s", line);
-- 
cgit v1.2.3