From: torrinfail <torrinfail@gmail.com>
Date: Thu, 27 Aug 2020 06:51:30 +0000 (+0000)
Subject: Merge pull request #29 from keikari/patch-2
X-Git-Url: https://git.armaanb.net/?p=dwmblocks.git;a=commitdiff_plain;h=3d308cafb0f3a56e9247e6a9aaf9da6e279a5bc6;hp=d581dae18025f141d401747b8265fa9c84e8445a

Merge pull request #29 from keikari/patch-2

Fix, delimLen caused weird behaviour
---

diff --git a/Makefile b/Makefile
index 3cfa764..8b3a30e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 PREFIX ?= /usr/local
+CC ?= cc
 
 output: dwmblocks.c blocks.def.h blocks.h
-	cc `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks
+	${CC} `pkg-config --cflags x11 --libs x11` dwmblocks.c -o dwmblocks
 blocks.h:
 	cp blocks.def.h $@
 
diff --git a/README.md b/README.md
index 33f4e9d..00896ed 100644
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@ This is so you can edit your status bar commands and they will not get overwritt
 Here are some patches to dwmblocks that add features that I either don't want to merge in, or that require a dwm patch to work.
 I do not maintain these but I will take pull requests to update them.
 <br>
-<a href=https://gist.github.com/torrinfail/fb423345f0f9c340db25181c8159cdd2>dwmblocks-statuscmd-signal.diff</a>
+<a href=https://gist.github.com/toniz4/41d168719e22bf7bc4ecff09d424b7d2>dwmblocks-statuscmd-20200717-941f415.diff</a>
diff --git a/dwmblocks.c b/dwmblocks.c
index 2014eee..e3e34a1 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -50,16 +50,17 @@ static void (*writestatus) () = setroot;
 void getcmd(const Block *block, char *output)
 {
 	strcpy(output, block->icon);
-	char *cmd = block->command;
-	FILE *cmdf = popen(cmd,"r");
+	FILE *cmdf = popen(block->command, "r");
 	if (!cmdf)
 		return;
-	char c;
 	int i = strlen(block->icon);
 	fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
 	i = strlen(output);
-	if (delim[0] != '\0' && --i)
-		 strncpy(output+i, delim, delimLen); 
+	if (delim[0] != '\0') {
+		//only chop off newline if one is present at the end
+		i = output[i-1] == '\n' ? i-1 : i;
+		strncpy(output+i, delim, delimLen); 
+	}
 	else
 		output[i++] = '\0';
 	pclose(cmdf);
@@ -68,7 +69,7 @@ void getcmd(const Block *block, char *output)
 void getcmds(int time)
 {
 	const Block* current;
-	for(unsigned int i = 0; i < LENGTH(blocks); i++)
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
 	{
 		current = blocks + i;
 		if ((current->interval != 0 && time % current->interval == 0) || time == -1)
@@ -91,11 +92,11 @@ void setupsignals()
 {
 #ifndef __OpenBSD__
 	    /* initialize all real time signals with dummy handler */
-    for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+    for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
         signal(i, dummysighandler);
 #endif
 
-	for(unsigned int i = 0; i < LENGTH(blocks); i++)
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
 	{
 		if (blocks[i].signal > 0)
 			signal(SIGMINUS+blocks[i].signal, sighandler);
@@ -107,7 +108,7 @@ int getstatus(char *str, char *last)
 {
 	strcpy(last, str);
 	str[0] = '\0';
-	for(unsigned int i = 0; i < LENGTH(blocks); i++)
+	for (unsigned int i = 0; i < LENGTH(blocks); i++)
 		strcat(str, statusbar[i]);
 	str[strlen(str)-strlen(delim)] = '\0';
 	return strcmp(str, last);//0 if they are the same
@@ -141,12 +142,11 @@ void statusloop()
 	setupsignals();
 	int i = 0;
 	getcmds(-1);
-	while(statusContinue)
+	while (statusContinue)
 	{
-		getcmds(i);
+		getcmds(i++);
 		writestatus();
 		sleep(1.0);
-		i++;
 	}
 }
 
@@ -171,11 +171,11 @@ void termhandler()
 
 int main(int argc, char** argv)
 {
-	for(int i = 0; i < argc; i++)
+	for (int i = 0; i < argc; i++) //Handle command line arguments
 	{
 		if (!strcmp("-d",argv[i]))
 			strncpy(delim, argv[++i], delimLen);
-		else if(!strcmp("-p",argv[i]))
+		else if (!strcmp("-p",argv[i]))
 			writestatus = pstdout;
 	}
 	delimLen = MIN(delimLen, strlen(delim));