X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b231cd90ebe54eef8649996fc80cabc3a420c9e5..0d1f19d7779e3b6b3940a6c7aff5935bbbd7971e:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index ac4c962..6d2e89e 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 
-#include <alsa/asoundlib.h>
 #include <err.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
@@ -18,6 +17,7 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/socket.h>
+#include <sys/soundcard.h>
 #include <sys/sysinfo.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
@@ -25,12 +25,7 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
-#undef strlcat
-#undef strlcpy
-
-#include "extern/arg.h"
-#include "extern/strlcat.h"
-#include "extern/concat.h"
+#include "arg.h"
 
 struct arg {
 	char *(*func)();
@@ -51,6 +46,7 @@ static char *entropy(void);
 static char *gid(void);
 static char *hostname(void);
 static char *ip(const char *iface);
+static char *kernel_release(void);
 static char *load_avg(void);
 static char *ram_free(void);
 static char *ram_perc(void);
@@ -68,12 +64,10 @@ static char *username(void);
 static char *vol_perc(const char *card);
 static char *wifi_perc(const char *iface);
 static char *wifi_essid(const char *iface);
-static char *kernel_release(void);
 static void sighandler(const int signo);
-static void usage(int);
+static void usage(const int eval);
 
 char *argv0;
-char concat[];
 static unsigned short int delay = 0;
 static unsigned short int done;
 static unsigned short int dflag, oflag;
@@ -108,12 +102,13 @@ static char *
 battery_perc(const char *bat)
 {
 	int perc;
+	char path[PATH_MAX];
 	FILE *fp;
 
-	ccat(3, "/sys/class/power_supply/", bat, "/capacity");
-	fp = fopen(concat, "r");
+	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
+	fp = fopen(path, "r");
 	if (fp == NULL) {
-		warn("Failed to open file %s", concat);
+		warn("Failed to open file %s", path);
 		return smprintf("%s", UNKNOWN_STR);
 	}
 	fscanf(fp, "%i", &perc);
@@ -125,13 +120,14 @@ battery_perc(const char *bat)
 static char *
 battery_state(const char *bat)
 {
+	char path[PATH_MAX];
 	char state[12];
 	FILE *fp;
 
-	ccat(3, "/sys/class/power_supply/", bat, "/status");
-	fp = fopen(concat, "r");
+	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
+	fp = fopen(path, "r");
 	if (fp == NULL) {
-		warn("Failed to open file %s", concat);
+		warn("Failed to open file %s", path);
 		return smprintf("%s", UNKNOWN_STR);
 	}
 	fscanf(fp, "%12s", state);
@@ -314,6 +310,18 @@ ip(const char *iface)
 	return smprintf("%s", UNKNOWN_STR);
 }
 
+static char *
+kernel_release(void)
+{
+	struct utsname udata;
+
+	if (uname(&udata) < 0) {
+		return smprintf(UNKNOWN_STR);
+	}
+
+	return smprintf("%s", udata.release);
+}
+
 static char *
 load_avg(void)
 {
@@ -415,7 +423,7 @@ run_command(const char *cmd)
 	}
 	fgets(buf, sizeof(buf), fp);
 	pclose(fp);
-	buf[strlen(buf)] = '\0';
+	buf[sizeof(buf)] = '\0';
 
 	if ((nlptr = strstr(buf, "\n")) != NULL) {
 		nlptr[0] = '\0';
@@ -630,41 +638,30 @@ uid(void)
 static char *
 vol_perc(const char *card)
 {
-	int mute;
-	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, card);
-	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, "Master");
-	elem = snd_mixer_find_selem(handle, s_elem);
+	unsigned int i;
+	int v, afd, devmask;
+	char *vnames[] = SOUND_DEVICE_NAMES;
 
-	if (elem == NULL) {
-		snd_mixer_selem_id_free(s_elem);
-		snd_mixer_close(handle);
-		warn("Failed to get volume percentage for %s", card);
-		return smprintf("%s", UNKNOWN_STR);
+	afd = open(card, O_RDONLY);
+	if (afd < 0) {
+		warn("Cannot open %s", card);
+		return smprintf(UNKNOWN_STR);
 	}
 
-	snd_mixer_handle_events(handle);
-	snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
-	snd_mixer_selem_get_playback_volume(elem, 0, &vol);
-	snd_mixer_selem_get_playback_switch(elem, 0, &mute);
-
-	snd_mixer_selem_id_free(s_elem);
-	snd_mixer_close(handle);
+	ioctl(afd, MIXER_READ(SOUND_MIXER_DEVMASK), &devmask);
+	for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) {
+		if (devmask & (1 << i)) {
+			if (!strcmp("vol", vnames[i])) {
+				ioctl(afd, MIXER_READ(i), &v);
+			}
+		}
+	}
 
-	if (!mute)
+	close(afd);
+	if (v == 0) {
 		return smprintf("mute");
-	else if (max == 0)
-		return smprintf("0%%");
-	else
-		return smprintf("%lu%%", ((uint_fast16_t)(vol * 100) / max));
+	}
+	return smprintf("%d%%", v & 0xff);
 }
 
 static char *
@@ -673,13 +670,14 @@ wifi_perc(const char *iface)
 	int perc;
 	char buf[255];
 	char *datastart;
+	char path[PATH_MAX];
 	char status[5];
 	FILE *fp;
 
-	ccat(3, "/sys/class/net/", iface, "/operstate");
-	fp = fopen(concat, "r");
+	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
+	fp = fopen(path, "r");
 	if (fp == NULL) {
-		warn("Failed to open file %s", concat);
+		warn("Failed to open file %s", path);
 		return smprintf("%s", UNKNOWN_STR);
 	}
 	fgets(status, 5, fp);
@@ -693,13 +691,13 @@ wifi_perc(const char *iface)
 		warn("Failed to open file /proc/net/wireless");
 		return smprintf("%s", UNKNOWN_STR);
 	}
-	ccat(2, iface, ":");
+
 	fgets(buf, sizeof(buf), fp);
 	fgets(buf, sizeof(buf), fp);
 	fgets(buf, sizeof(buf), fp);
 	fclose(fp);
 
-	if ((datastart = strstr(buf, concat)) == NULL) {
+	if ((datastart = strstr(buf, iface)) == NULL) {
 		return smprintf("%s", UNKNOWN_STR);
 	}
 	datastart = (datastart+(strlen(iface)+1));
@@ -737,16 +735,6 @@ wifi_essid(const char *iface)
 		return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 
-static char *
-kernel_release(void)
-{
-	struct utsname udata;
-	if (uname(&udata) < 0)
-		return smprintf("%s", UNKNOWN_STR);
-
-	return smprintf("%s", udata.release);
-}
-
 static void
 sighandler(const int signo)
 {
@@ -756,7 +744,7 @@ sighandler(const int signo)
 }
 
 static void
-usage(int eval)
+usage(const int eval)
 {
 	fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0);
 	exit(eval);
@@ -779,7 +767,7 @@ main(int argc, char *argv[])
 			oflag = 1;
 			break;
 		case 'v':
-			printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
+			printf("slstatus (C) 2016-2017 slstatus engineers\n");
 			return 0;
 		case 'h':
 			usage(0);
@@ -820,9 +808,7 @@ main(int argc, char *argv[])
 				element = smprintf("%s", UNKNOWN_STR);
 				warnx("Failed to format output");
 			}
-			if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string)) {
-				warnx("Output too long");
-			}
+			strncat(status_string, element, sizeof(status_string) - strlen(status_string) - 1);
 			free(res);
 			free(element);
 		}