From 9adc4dc1e7a2230d24ef1dada9b888b16aec374c Mon Sep 17 00:00:00 2001 From: mackarelfish Date: Sat, 30 May 2020 12:36:18 +0700 Subject: Added support for multiple char delimiter --- dwmblocks.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'dwmblocks.c') diff --git a/dwmblocks.c b/dwmblocks.c index 92e9570..391ee0d 100644 --- a/dwmblocks.c +++ b/dwmblocks.c @@ -75,11 +75,12 @@ void getcmd(const Block *block, char *output) return; char c; int i = strlen(block->icon); - fgets(output+i, CMDLENGTH-2, cmdf); + fgets(output+i, CMDLENGTH-(strlen(delim)+1), cmdf); remove_all(output, '\n'); i = strlen(output); - if (delim != '\0' && i) - output[i++] = delim; + if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])) + strcat(output, delim); + i+=strlen(delim); output[i++] = '\0'; pclose(cmdf); } @@ -130,8 +131,11 @@ int getstatus(char *str, char *last) { strcpy(last, str); str[0] = '\0'; - for(int i = 0; i < LENGTH(blocks); i++) + for(int i = 0; i < LENGTH(blocks); i++) { strcat(str, statusbar[i]); + if (i == LENGTH(blocks) - 1) + strcat(str, " "); + } str[strlen(str)-1] = '\0'; return strcmp(str, last);//0 if they are the same } @@ -218,7 +222,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]; else if(!strcmp("-p",argv[i])) writestatus = pstdout; } -- cgit v1.2.3-13-gbd6f