Xinqi Bao's Git
projects
/
slstatus.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
signal handling to exit gracefully + small coding style fixes
[slstatus.git]
/
slstatus.c
diff --git
a/slstatus.c
b/slstatus.c
index
6c25f3f
..
cb5f1f2
100644
(file)
--- a/
slstatus.c
+++ b/
slstatus.c
@@
-8,6
+8,7
@@
#include <linux/wireless.h>
#include <netdb.h>
#include <pwd.h>
#include <linux/wireless.h>
#include <netdb.h>
#include <pwd.h>
+#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
@@
-62,8
+63,11
@@
static char *username(void);
static char *vol_perc(const char *);
static char *wifi_perc(const char *);
static char *wifi_essid(const char *);
static char *vol_perc(const char *);
static char *wifi_perc(const char *);
static char *wifi_essid(const char *);
+static void sighandler(const int);
+static unsigned short int delay;
static Display *dpy;
static Display *dpy;
+static int done = 0;
#include "config.h"
#include "config.h"
@@
-126,7
+130,7
@@
battery_perc(const char *battery)
static char *
cpu_perc(void)
static char *
cpu_perc(void)
-{
/* FIXME: ugly function, would be better without sleep(), see below */
+{
int perc;
long double a[4], b[4];
FILE *fp = fopen("/proc/stat","r");
int perc;
long double a[4], b[4];
FILE *fp = fopen("/proc/stat","r");
@@
-139,7
+143,8
@@
cpu_perc(void)
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
fclose(fp);
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
fclose(fp);
- sleep(1);
+ delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
+ sleep(delay);
fp = fopen("/proc/stat","r");
if (fp == NULL) {
fp = fopen("/proc/stat","r");
if (fp == NULL) {
@@
-468,26
+473,26
@@
uid(void)
}
}
-static char *
+static char *
vol_perc(const char *snd_card)
vol_perc(const char *snd_card)
-{ /*
thanks to botika for this function
*/
+{ /*
FIX THIS SHIT!
*/
long int vol, max, min;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *s_elem;
snd_mixer_open(&handle, 0);
long int vol, max, min;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *s_elem;
snd_mixer_open(&handle, 0);
- snd_mixer_attach(handle,
"default"
);
+ snd_mixer_attach(handle,
snd_card
);
snd_mixer_selem_register(handle, NULL, NULL);
snd_mixer_load(handle);
snd_mixer_selem_id_malloc(&s_elem);
snd_mixer_selem_register(handle, NULL, NULL);
snd_mixer_load(handle);
snd_mixer_selem_id_malloc(&s_elem);
- snd_mixer_selem_id_set_name(s_elem,
snd_card
);
+ snd_mixer_selem_id_set_name(s_elem,
ALSA_CHANNEL
);
elem = snd_mixer_find_selem(handle, s_elem);
if (elem == NULL) {
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
elem = snd_mixer_find_selem(handle, s_elem);
if (elem == NULL) {
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
-
perror("alsa error
");
+
warn("error: ALSA
");
return smprintf(UNKNOWN_STR);
}
return smprintf(UNKNOWN_STR);
}
@@
-498,7
+503,7
@@
vol_perc(const char *snd_card)
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
- return smprintf("%d", (
vol * 100) / max
);
+ return smprintf("%d", (
(uint_fast16_t)(vol * 100) / max)
);
}
static char *
}
static char *
@@
-510,11
+515,11
@@
wifi_perc(const char *wificard)
char status[5];
FILE *fp;
char status[5];
FILE *fp;
- ccat(3, "/sys/class/net", wificard, "/operstate");
+ ccat(3, "/sys/class/net
/
", wificard, "/operstate");
fp = fopen(concat, "r");
fp = fopen(concat, "r");
- if(fp == NULL) {
+ if
(fp == NULL) {
warn("Error opening wifi operstate file");
return smprintf(UNKNOWN_STR);
}
warn("Error opening wifi operstate file");
return smprintf(UNKNOWN_STR);
}
@@
-556,7
+561,7
@@
wifi_essid(const char *wificard)
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
sprintf(wreq.ifr_name, wificard);
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
sprintf(wreq.ifr_name, wificard);
- if(sockfd == -1) {
+ if
(sockfd == -1) {
warn("Cannot open socket for interface: %s", wificard);
return smprintf(UNKNOWN_STR);
}
warn("Cannot open socket for interface: %s", wificard);
return smprintf(UNKNOWN_STR);
}
@@
-566,12
+571,22
@@
wifi_essid(const char *wificard)
return smprintf(UNKNOWN_STR);
}
return smprintf(UNKNOWN_STR);
}
+ close(sockfd);
+
if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
return smprintf(UNKNOWN_STR);
else
return smprintf("%s", (char *)wreq.u.essid.pointer);
}
if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
return smprintf(UNKNOWN_STR);
else
return smprintf("%s", (char *)wreq.u.essid.pointer);
}
+static void
+sighandler(int signo)
+{
+ if (signo == SIGTERM || signo == SIGINT) {
+ done = 1;
+ }
+}
+
int
main(void)
{
int
main(void)
{
@@
-579,11
+594,17
@@
main(void)
char status_string[4096];
char *res, *element;
struct arg argument;
char status_string[4096];
char *res, *element;
struct arg argument;
+ struct sigaction act;
+
+ memset(&act, 0, sizeof(act));
+ act.sa_handler = sighandler;
+ sigaction(SIGINT, &act, 0);
+ sigaction(SIGTERM, &act, 0);
dpy = XOpenDisplay(NULL);
dpy = XOpenDisplay(NULL);
-
for (;;
) {
-
memset(status_string, 0, sizeof(status_string))
;
+
while (!done
) {
+
status_string[0] = '\0'
;
for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
argument = args[i];
if (argument.args == NULL)
for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
argument = args[i];
if (argument.args == NULL)
@@
-601,7
+622,12
@@
main(void)
}
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
XSync(dpy, False);
}
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
XSync(dpy, False);
- sleep(UPDATE_INTERVAL - 1); /* FIXME: ugly cpu function which uses 1 second */
+ /*
+ * subtract delay time spend in function
+ * calls from the actual global delay time
+ */
+ sleep(UPDATE_INTERVAL - delay);
+ delay = 0;
}
XCloseDisplay(dpy);
}
XCloseDisplay(dpy);