jasper/dwmblocks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removing newlines

Browse Source
This commit is contained in:
Jasper Levin Spahl
2022-03-06 22:17:33 +01:00
parent 78912a350b
commit f0f9619c73
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,4 +1,4 @@
PREFIX ?= /usr/local PREFIX ?= ${HOME}/.local
CC ?= cc CC ?= cc
LDFLAGS = -lX11 LDFLAGS = -lX11

15
dwmblocks.c
View File

@@ -34,6 +34,7 @@ void getsigcmds(unsigned int signal);
void setupsignals(); void setupsignals();
void sighandler(int signum); void sighandler(int signum);
int getstatus(char *str, char *last); int getstatus(char *str, char *last);
void remove_all(char *str, char to_remove);
void statusloop(); void statusloop();
void termhandler(); void termhandler();
void pstdout(); void pstdout();
@@ -57,6 +58,19 @@ static char button[] = "\0";
static int statusContinue = 1; static int statusContinue = 1;
static int returnStatus = 0; static int returnStatus = 0;
void remove_all(char *str, char to_remove){
char *read = str;
char *write = str;
while(*read) {
if (*read == to_remove) {
read++;
*write = *read;
}
read++;
write++;
}
}
//opens process *cmd and stores output in *output //opens process *cmd and stores output in *output
void getcmd(const Block *block, char *output) void getcmd(const Block *block, char *output)
{ {
@@ -83,6 +97,7 @@ void getcmd(const Block *block, char *output)
return; return;
int i = strlen(block->icon); int i = strlen(block->icon);
fgets(output+i, CMDLENGTH-i-delimLen, cmdf); fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
remove_all(output, '\n');
i = strlen(output); i = strlen(output);
if (i == 0) { if (i == 0) {
//return if block and command output are both empty //return if block and command output are both empty