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;
- char c;
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);
void getcmds(int time)
{
const Block* current;
- for(unsigned int i = 0; i < LENGTH(blocks); i++)
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
{
#ifndef __OpenBSD__
/* initialize all real time signals with dummy handler */
- for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+ for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
signal(i, dummysighandler);
#endif
- for(unsigned int i = 0; i < LENGTH(blocks); i++)
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
if (blocks[i].signal > 0)
signal(SIGMINUS+blocks[i].signal, sighandler);
{
strcpy(last, str);
str[0] = '\0';
- for(unsigned int i = 0; i < LENGTH(blocks); i++)
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
strcat(str, statusbar[i]);
str[strlen(str)-strlen(delim)] = '\0';
return strcmp(str, last);//0 if they are the same
setupsignals();
int i = 0;
getcmds(-1);
- while(statusContinue)
+ while (statusContinue)
{
- getcmds(i);
+ getcmds(i++);
writestatus();
sleep(1.0);
- i++;
}
}
int main(int argc, char** argv)
{
- for(int i = 0; i < argc; i++)
+ for (int i = 0; i < argc; i++) //Handle command line arguments
{
if (!strcmp("-d",argv[i]))
strncpy(delim, argv[++i], delimLen);
- else if(!strcmp("-p",argv[i]))
+ else if (!strcmp("-p",argv[i]))
writestatus = pstdout;
}
delimLen = MIN(delimLen, strlen(delim));