This is useful when using commands such as tr -d '\n' to strip newlines
from output.
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");
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);