sheldonmlee/slstatus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16 from R41z/master

Browse Source 
several improvements && memory leak fix.
This commit is contained in:
Aaron Marcher 2016-09-14 10:58:14 +02:00 committed by GitHub
commit bca9b5246a
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
slstatus.c
View File

@ -66,9 +66,8 @@ static char *wifi_perc(const char *);
static char *wifi_essid(const char *); static char *wifi_essid(const char *);
static void sighandler(const int); static void sighandler(const int);
static unsigned short int delay; static unsigned short int delay, done;
static Display *dpy; static Display *dpy;
static int done = 0;
#include "config.h" #include "config.h"
@ -117,22 +116,16 @@ battery_perc(const char *battery)
static char * static char *
battery_state(const char *battery) battery_state(const char *battery)
{ {
char *state = malloc(sizeof(char)*12); char state[12];
FILE *fp; FILE *fp;
if (!state) {
warn("Failed to get battery state.");
return smprintf(UNKNOWN_STR);
}
ccat(3, "/sys/class/power_supply/", battery, "/status"); ccat(3, "/sys/class/power_supply/", battery, "/status");
fp = fopen(concat, "r"); fp = fopen(concat, "r");
if (fp == NULL) { if (fp == NULL) {
warn("Error opening battery file: %s", concat); warn("Error opening battery file: %s", concat);
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
fscanf(fp, "%s", state); fscanf(fp, "%12s", state);
fclose(fp); fclose(fp);
if (strcmp(state, "Charging") == 0) if (strcmp(state, "Charging") == 0)
@ -280,7 +273,7 @@ hostname(void)
fgets(hostname, sizeof(hostname), fp); fgets(hostname, sizeof(hostname), fp);
/* FIXME: needs improvement */ /* FIXME: needs improvement */
memset(&hostname[strlen(hostname)-1], '\0', memset(&hostname[strlen(hostname)], '\0',
sizeof(hostname) - strlen(hostname)); sizeof(hostname) - strlen(hostname));
fclose(fp); fclose(fp);
@ -509,7 +502,7 @@ vol_perc(const char *soundcard)
if (elem == NULL) { if (elem == NULL) {
snd_mixer_selem_id_free(s_elem); snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle); snd_mixer_close(handle);
warn("Failed to get volume percentage for: %s.", soundcard); warn("Failed to get volume percentage for: %s", soundcard);
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
@ -599,17 +592,16 @@ wifi_essid(const char *wificard)
static void static void
sighandler(const int signo) sighandler(const int signo)
{ {
if (signo == SIGTERM || signo == SIGINT) { if (signo == SIGTERM || signo == SIGINT)
done = 1; done = 1;
} }
}
int int
main(void) main(void)
{ {
size_t i; unsigned short int i;
char status_string[4096]; char status_string[4096];
char *res, *element, *status_old; char *res, *element;
struct arg argument; struct arg argument;
struct sigaction act; struct sigaction act;
@ -620,8 +612,6 @@ main(void)
dpy = XOpenDisplay(NULL); dpy = XOpenDisplay(NULL);
XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
while (!done) { while (!done) {
status_string[0] = '\0'; status_string[0] = '\0';
for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
@ -649,7 +639,7 @@ main(void)
delay = 0; delay = 0;
} }
XStoreName(dpy, DefaultRootWindow(dpy), status_old); XStoreName(dpy, DefaultRootWindow(dpy), NULL);
XSync(dpy, False); XSync(dpy, False);
XCloseDisplay(dpy); XCloseDisplay(dpy);