pinosaur
/
dwmblocks.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed output from commands without a newline end.
[dwmblocks.git]
/
dwmblocks.c
diff --git
a/dwmblocks.c
b/dwmblocks.c
index
5abd10d
..
b6f696f
100644
(file)
--- 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);
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;
if (!cmdf)
return;
- char c;
int i = strlen(block->icon);
fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
i = strlen(output);
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);
else
output[i++] = '\0';
pclose(cmdf);