From e6158e300d3134e44f741e01108dd088297c476f Mon Sep 17 00:00:00 2001
From: "Ali H. Fardan" <raiz@firemail.cc>
Date: Mon, 12 Sep 2016 13:51:43 +0300
Subject: [PATCH 1/4] subtraction is unneeded
---
slstatus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slstatus.c b/slstatus.c
index e38b963..70d8fbb 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -260,7 +260,7 @@ hostname(void)
fgets(hostname, sizeof(hostname), fp);
/* FIXME: needs improvement */
- memset(&hostname[strlen(hostname)-1], '\0',
+ memset(&hostname[strlen(hostname)], '\0',
sizeof(hostname) - strlen(hostname));
fclose(fp);
From 3e04f1d910b2bab606e2bcaa61a0cee4f9cfe8b8 Mon Sep 17 00:00:00 2001
From: "Ali H. Fardan" <raiz@firemail.cc>
Date: Wed, 14 Sep 2016 03:31:01 +0300
Subject: [PATCH 2/4] minor improvements and memory leak fix
---
slstatus.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/slstatus.c b/slstatus.c
index 840ceb0..69fb6a5 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -66,9 +66,8 @@ static char *wifi_perc(const char *);
static char *wifi_essid(const char *);
static void sighandler(const int);
-static unsigned short int delay;
+static unsigned short int delay, done;
static Display *dpy;
-static int done = 0;
#include "config.h"
@@ -117,7 +116,7 @@ battery_perc(const char *battery)
static char *
battery_state(const char *battery)
{
- char *state = malloc(sizeof(char)*12);
+ char *state[12];
FILE *fp;
if (!state) {
@@ -132,7 +131,7 @@ battery_state(const char *battery)
warn("Error opening battery file: %s", concat);
return smprintf(UNKNOWN_STR);
}
- fscanf(fp, "%s", state);
+ fscanf(fp, "%12s", state);
fclose(fp);
if (strcmp(state, "Charging") == 0)
@@ -509,7 +508,7 @@ vol_perc(const char *soundcard)
if (elem == NULL) {
snd_mixer_selem_id_free(s_elem);
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);
}
@@ -599,15 +598,14 @@ wifi_essid(const char *wificard)
static void
sighandler(const int signo)
{
- if (signo == SIGTERM || signo == SIGINT) {
+ if (signo == SIGTERM || signo == SIGINT)
done = 1;
- }
}
int
main(void)
{
- size_t i;
+ unsigned short int i;
char status_string[4096];
char *res, *element, *status_old;
struct arg argument;
@@ -620,8 +618,6 @@ main(void)
dpy = XOpenDisplay(NULL);
- XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
-
while (!done) {
status_string[0] = '\0';
for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
@@ -649,7 +645,7 @@ main(void)
delay = 0;
}
- XStoreName(dpy, DefaultRootWindow(dpy), status_old);
+ XStoreName(dpy, DefaultRootWindow(dpy), NULL);
XSync(dpy, False);
XCloseDisplay(dpy);
From f28e2682fdea5991891bf5f784292dc8fe7603a5 Mon Sep 17 00:00:00 2001
From: "Ali H. Fardan" <raiz@firemail.cc>
Date: Wed, 14 Sep 2016 03:35:09 +0300
Subject: [PATCH 3/4] * != **
---
slstatus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/slstatus.c b/slstatus.c
index 69fb6a5..f0d9544 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -116,7 +116,7 @@ battery_perc(const char *battery)
static char *
battery_state(const char *battery)
{
- char *state[12];
+ char state[12];
FILE *fp;
if (!state) {
@@ -607,7 +607,7 @@ main(void)
{
unsigned short int i;
char status_string[4096];
- char *res, *element, *status_old;
+ char *res, *element;
struct arg argument;
struct sigaction act;
From bc38677f4734e9239d6f2dc3df8e4c56c330167a Mon Sep 17 00:00:00 2001
From: "Ali H. Fardan" <raiz@firemail.cc>
Date: Wed, 14 Sep 2016 03:35:53 +0300
Subject: [PATCH 4/4] malloc sucks, you know?
---
slstatus.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/slstatus.c b/slstatus.c
index f0d9544..ea8fc20 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -119,12 +119,6 @@ battery_state(const char *battery)
char state[12];
FILE *fp;
- if (!state) {
- warn("Failed to get battery state.");
- return smprintf(UNKNOWN_STR);
- }
-
-
ccat(3, "/sys/class/power_supply/", battery, "/status");
fp = fopen(concat, "r");
if (fp == NULL) {