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

Switched to fgets instead of using fgetc

Browse Source
This commit is contained in:
Aidan
2019-11-30 14:43:33 -07:00
parent 09a00ab345
commit 377f990331
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dwmblocks.c
View File

@@ -5,6 +5,7 @@
#include<signal.h> #include<signal.h>
#include<X11/Xlib.h> #include<X11/Xlib.h>
#define LENGTH(X) (sizeof(X) / sizeof (X[0])) #define LENGTH(X) (sizeof(X) / sizeof (X[0]))
#define CMDLENGTH 50
typedef struct { typedef struct {
char* icon; char* icon;
@@ -20,7 +21,6 @@ void setupsignals();
int getstatus(char *str, char *last); int getstatus(char *str, char *last);
void setroot(); void setroot();
void statusloop(); void statusloop();
void statusinit();
void sighandler(int signum); void sighandler(int signum);
void termhandler(int signum); void termhandler(int signum);
@@ -30,7 +30,7 @@ void termhandler(int signum);
static Display *dpy; static Display *dpy;
static int screen; static int screen;
static Window root; static Window root;
static char statusbar[LENGTH(blocks)][50] = {0}; static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
static char statusstr[2][256]; static char statusstr[2][256];
static int statusContinue = 1; static int statusContinue = 1;
static void (*writestatus) () = setroot; static void (*writestatus) () = setroot;
@@ -53,12 +53,8 @@ void getcmd(const Block *block, char *output)
return; return;
char c; char c;
int i = strlen(block->icon); int i = strlen(block->icon);
while((c = fgetc(cmdf)) != EOF) fgets(output+i, CMDLENGTH-i, cmdf);
{ i = strlen(output);
output[i++] = c;
if(c == '\n')
break;
}
if (delim != '\0' && --i) if (delim != '\0' && --i)
output[i++] = delim; output[i++] = delim;
output[i++] = '\0'; output[i++] = '\0';
@@ -102,9 +98,7 @@ int getstatus(char *str, char *last)
strcpy(last, str); strcpy(last, str);
str[0] = '\0'; str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++) for(int i = 0; i < LENGTH(blocks); i++)
{
strcat(str, statusbar[i]); strcat(str, statusbar[i]);
}
str[strlen(str)-1] = '\0'; str[strlen(str)-1] = '\0';
return strcmp(str, last);//0 if they are the same return strcmp(str, last);//0 if they are the same
} }
@@ -146,11 +140,6 @@ void statusloop()
} }
} }
void statusinit()
{
statusloop();
}
void sighandler(int signum) void sighandler(int signum)
{ {
@@ -175,5 +164,5 @@ int main(int argc, char** argv)
} }
signal(SIGTERM, termhandler); signal(SIGTERM, termhandler);
signal(SIGINT, termhandler); signal(SIGINT, termhandler);
statusinit(); statusloop();
} }