From: Aidan <torrinfail@gmail.com>
Date: Mon, 4 Nov 2019 22:34:34 +0000 (-0700)
Subject: Changed delimeter to accept multiple characters.
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=3da92ebccb863394a3501ce2d9cbe60ad9aafc8c;p=dwmblocks.git

Changed delimeter to accept multiple characters.
---

diff --git a/blocks.h b/blocks.h
index 31e98af..3493ce1 100644
--- a/blocks.h
+++ b/blocks.h
@@ -16,5 +16,5 @@ static const Block blocks[] = {
 	{"", "~/bin/statusbar/clock",						5,		0},
 };
 
-//sets delimeter between status commands. NULL character ('\0') means no delimeter.
-static char delim = '|';
+//sets delimeter between status commands. Empty string ("") means no delimeter.
+static char* delim = "|";
diff --git a/dwmblocks.c b/dwmblocks.c
index 2db3489..76e7377 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -56,13 +56,20 @@ void getcmd(const Block *block, char *output)
 		return;
 	//int N = strlen(output);
 	char c;
-	int i = strlen(block->icon);
+	int sl;
+	int i = sl = strlen(block->icon);
 	while((c = fgetc(cmdf)) != EOF)
 		output[i++] = c;
-	if (delim != '\0' && --i)
-		output[i++] = delim;
-	output[i++] = '\0';
 	pclose(cmdf);
+	if (i == sl) { //return empty string if command has no output
+		output[0] = '\0';
+		return;
+	}
+	if (delim[0] != '\0' && --i)
+		for (int j = 0; delim[j]; j++)
+			output[i++] = delim[j];
+	else 
+		output[--i] = '\0';
 }
 
 void getcmds(int time)
@@ -104,7 +111,8 @@ void getstatus(char *str)
 	{	
 		strcpy(str + j, statusbar[i]);
 	}
-	str[--j] = '\0';
+	for (int i = 0; delim[i]; i++)
+		str[--j] = '\0';
 
 }
 
@@ -159,7 +167,7 @@ int main(int argc, char** argv)
 	for(int i = 0; i < argc; i++)
 	{	
 		if (!strcmp("-d",argv[i]))
-			delim = argv[++i][0];
+			delim = argv[++i];
 	}
 	signal(SIGTERM, termhandler);
 	signal(SIGINT, termhandler);