X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/0aefd57f9f469aba25ffbe9bdda04e894b9d739a..7710c9ed8514767af3d1fdc86d0e64d7621fc5d9:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index 163b44e..55e638f 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,12 +1,11 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>
-#include <arpa/inet.h>
+#include <err.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>
-#include <locale.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <stdarg.h>
@@ -28,15 +27,16 @@
 
 #include "strlcat.h"
 #include "strlcpy.h"
+#include "concat.h"
+
+char concat[];
 
-typedef char *(*op_fun)();
 struct arg {
-	op_fun func;
+	char *(*func)();
 	const char *format;
 	const char *args;
 };
 
-static void setstatus(const char *);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
@@ -67,14 +67,6 @@ static Display *dpy;
 
 #include "config.h"
 
-static void
-setstatus(const char *str)
-{
-	/* set WM_NAME via X11 */
-	XStoreName(dpy, DefaultRootWindow(dpy), str);
-	XSync(dpy, False);
-}
-
 static char *
 smprintf(const char *fmt, ...)
 {
@@ -103,34 +95,24 @@ static char *
 battery_perc(const char *battery)
 {
 	int now, full, perc;
-	char batterynowfile[64];
-	char batteryfullfile[64];
-	FILE *fp = fopen(batterynowfile, "r");
-
-	strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
-	strlcat(batterynowfile, battery, sizeof(batterynowfile));
-	strlcat(batterynowfile, "/", sizeof(batterynowfile));
-	strlcat(batterynowfile, BATTERY_NOW, sizeof(batterynowfile));
-
-	strlcpy(batteryfullfile, BATTERY_PATH, sizeof(batteryfullfile));
-	strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
-	strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
-	strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
-
-	if (fp == NULL ) {
-		fprintf(stderr, "Error opening battery file: %s: %s\n",
-						batterynowfile,
-						strerror(errno));
+	FILE *fp;
+
+	ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW);
+
+	fp = fopen(concat, "r");
+	if (fp == NULL) {
+		warn("Error opening battery file: %s", concat);
 		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%i", &now);
 	fclose(fp);
 
-	fp = fopen(batteryfullfile, "r");
+	ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
+
+	fp = fopen(concat, "r");
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening battery file: %s\n",
-						strerror(errno));
+		warn("Error opening battery file: %s", concat);
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -150,21 +132,18 @@ cpu_perc(void)
 	FILE *fp = fopen("/proc/stat","r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening stat file: %s\n",
-						strerror(errno));
+		warn("Error opening stat file");
 		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
 	fclose(fp);
 
-	/* wait a second (for avg values) */
 	sleep(1);
 
 	fp = fopen("/proc/stat","r");
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening stat file: %s\n",
-						strerror(errno));
+		warn("Error opening stat file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -193,8 +172,7 @@ disk_free(const char *mountpoint)
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info: %s\n",
-						strerror(errno));
+		warn("Could not get filesystem info");
 		return smprintf(UNKNOWN_STR);
 	}
 	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
@@ -207,8 +185,7 @@ disk_perc(const char *mountpoint)
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info: %s\n",
-						strerror(errno));
+		warn("Could not get filesystem info");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -222,8 +199,7 @@ disk_total(const char *mountpoint)
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info: %s\n",
-						strerror(errno));
+		warn("Could not get filesystem info");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -236,8 +212,7 @@ disk_used(const char *mountpoint)
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info: %s\n",
-						strerror(errno));
+		warn("Could not get filesystem info");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -251,7 +226,7 @@ entropy(void)
 	FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Could not open entropy file.\n");
+		warn("Could not open entropy file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -263,8 +238,7 @@ entropy(void)
 static char *
 gid(void)
 {
-	gid_t gid = getgid();
-	return smprintf("%d", gid);
+	return smprintf("%d", getgid());
 }
 
 static char *
@@ -274,8 +248,7 @@ hostname(void)
 	FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Could not open hostname file: %s\n",
-						strerror(errno));
+		warn("Could not open hostname file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -295,8 +268,7 @@ ip(const char *interface)
 	char host[NI_MAXHOST];
 
 	if (getifaddrs(&ifaddr) == -1) {
-		fprintf(stderr, "Error getting IP address: %s\n",
-						strerror(errno));
+		warn("Error getting IP address");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -310,7 +282,7 @@ ip(const char *interface)
 
 		if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
 			if (s != 0) {
-				fprintf(stderr, "Error getting IP address.\n");
+				warnx("Error getting IP address.");
 				return smprintf(UNKNOWN_STR);
 			}
 			return smprintf("%s", host);
@@ -329,7 +301,7 @@ load_avg(void)
 	double avgs[3];
 
 	if (getloadavg(avgs, 3) < 0) {
-		fprintf(stderr, "Error getting load avg.\n");
+		warnx("Error getting load avg.");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -343,8 +315,7 @@ ram_free(void)
 	FILE *fp = fopen("/proc/meminfo", "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening meminfo file: %s\n",
-						strerror(errno));
+		warn("Error opening meminfo file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -361,8 +332,7 @@ ram_perc(void)
 	FILE *fp = fopen("/proc/meminfo", "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening meminfo file: %s\n",
-						strerror(errno));
+		warn("Error opening meminfo file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -383,8 +353,7 @@ ram_total(void)
 	FILE *fp = fopen("/proc/meminfo", "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening meminfo file: %s\n",
-						strerror(errno));
+		warn("Error opening meminfo file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -400,8 +369,7 @@ ram_used(void)
 	FILE *fp = fopen("/proc/meminfo", "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening meminfo file: %s\n",
-						strerror(errno));
+		warn("Error opening meminfo file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -423,8 +391,7 @@ run_command(const char* command)
 	char buffer[64];
 
 	if (fp == NULL) {
-		fprintf(stderr, "Could not get command output for: %s: %s\n",
-						command, strerror(errno));
+		warn("Could not get command output for: %s", command);
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -448,8 +415,7 @@ temp(const char *file)
 	FILE *fp = fopen(file, "r");
 
 	if (fp == NULL) {
-		fprintf(stderr, "Could not open temperature file: %s\n",
-							strerror(errno));
+		warn("Could not open temperature file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -475,82 +441,54 @@ uptime(void)
 static char *
 username(void)
 {
-	register struct passwd *pw;
-	register uid_t uid;
+	uid_t uid = geteuid();
+	struct passwd *pw = getpwuid(uid);
 
-	uid = geteuid();
-	pw = getpwuid(uid);
-
-	if (pw)
+	if (pw == NULL)
 		return smprintf("%s", pw->pw_name);
-	else {
-		fprintf(stderr, "Could not get username: %s\n",
-					strerror(errno));
-		return smprintf(UNKNOWN_STR);
-	}
 
+	warn("Could not get username");
 	return smprintf(UNKNOWN_STR);
 }
 
 static char *
 uid(void)
 {
-	/* FIXME: WHY USE register modifier? */
-	register uid_t uid;
-
-	uid = geteuid();
-
-	if (uid)
-		return smprintf("%d", uid);
-	else {
-		fprintf(stderr, "Could not get uid.\n");
-		return smprintf(UNKNOWN_STR);
-	}
-
-	return smprintf(UNKNOWN_STR);
+	return smprintf("%d", geteuid());
 }
 
 
-static char *
-vol_perc(const char *soundcard)
-{
-	int mute = 0;
-	long vol = 0, max = 0, min = 0;
+static char * 
+vol_perc(const char *snd_card)
+{ /* thanks to botika for this function */
+	long int vol, max, min;
 	snd_mixer_t *handle;
-	snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-	snd_mixer_selem_id_t *vol_info, *mute_info;
+	snd_mixer_elem_t *elem;
+	snd_mixer_selem_id_t *s_elem;
 
 	snd_mixer_open(&handle, 0);
-	snd_mixer_attach(handle, soundcard);
+	snd_mixer_attach(handle, "default");
 	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);
+	elem = snd_mixer_find_selem(handle, s_elem);
 
-	snd_mixer_selem_id_malloc(&vol_info);
-	snd_mixer_selem_id_malloc(&mute_info);
-	if (vol_info == NULL || mute_info == NULL) {
-		fprintf(stderr, "Could not get alsa volume.\n");
+	if (elem == NULL) {
+		snd_mixer_selem_id_free(s_elem);
+		snd_mixer_close(handle);
+		perror("alsa error");
 		return smprintf(UNKNOWN_STR);
 	}
-	snd_mixer_selem_id_set_name(vol_info, ALSA_CHANNEL);
-	snd_mixer_selem_id_set_name(mute_info, ALSA_CHANNEL);
-	pcm_mixer = snd_mixer_find_selem(handle, vol_info);
-	mas_mixer = snd_mixer_find_selem(handle, mute_info);
-
-	snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
-	snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
-	snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
-
-	if (vol_info)
-		snd_mixer_selem_id_free(vol_info);
-	if (mute_info)
-		snd_mixer_selem_id_free(mute_info);
-	if (handle)
-		snd_mixer_close(handle);
 
-	if (!mute)
-		return smprintf("mute");
-	else
-		return smprintf("%d%%", (vol * 100) / max);
+	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_id_free(s_elem);
+	snd_mixer_close(handle);
+
+	return smprintf("%d", (vol * 100) / max);
 }
 
 static char *
@@ -559,18 +497,15 @@ wifi_perc(const char *wificard)
 	int strength;
 	char buf[255];
 	char *datastart;
-	char path[64];
 	char status[5];
-	char needle[strlen(wificard)+2];
-	FILE *fp = fopen(path, "r");
+	FILE *fp;
+
+	ccat(3, "/sys/class/net", wificard, "/operstate");
 
-	strlcpy(path, "/sys/class/net/", sizeof(path));
-	strlcat(path, wificard, sizeof(path));
-	strlcat(path, "/operstate", sizeof(path));
+	fp = fopen(concat, "r");
 
 	if(fp == NULL) {
-		fprintf(stderr, "Error opening wifi operstate file: %s\n",
-							strerror(errno));
+		warn("Error opening wifi operstate file");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -581,18 +516,16 @@ wifi_perc(const char *wificard)
 
 	fp = fopen("/proc/net/wireless", "r");
 	if (fp == NULL) {
-		fprintf(stderr, "Error opening wireless file: %s\n",
-						strerror(errno));
+		warn("Error opening wireless file");
 		return smprintf(UNKNOWN_STR);
 	}
 
-	strlcpy(needle, wificard, sizeof(needle));
-	strlcat(needle, ":", sizeof(needle));
+	ccat(2, wificard, ":");
 	fgets(buf, sizeof(buf), fp);
 	fgets(buf, sizeof(buf), fp);
 	fgets(buf, sizeof(buf), fp);
 
-	datastart = strstr(buf, needle);
+	datastart = strstr(buf, concat);
 	if (datastart != NULL) {
 		datastart = strstr(buf, ":");
 		sscanf(datastart + 1, " %*d   %d  %*d  %*d		  %*d	   %*d		%*d		 %*d	  %*d		 %*d", &strength);
@@ -613,14 +546,12 @@ wifi_essid(const char *wificard)
 	wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
 	sprintf(wreq.ifr_name, wificard);
 	if(sockfd == -1) {
-		fprintf(stderr, "Cannot open socket for interface: %s: %s\n",
-						wificard, strerror(errno));
+		warn("Cannot open socket for interface: %s", wificard);
 		return smprintf(UNKNOWN_STR);
 	}
 	wreq.u.essid.pointer = id;
 	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
-		fprintf(stderr, "Get ESSID ioctl failed for interface %s: %s\n",
-						wificard, strerror(errno));
+		warn("Get ESSID ioctl failed for interface %s", wificard);
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -638,11 +569,7 @@ main(void)
 	char *res, *element;
 	struct arg argument;
 
-	dpy = XOpenDisplay(0x0);
-	if (!dpy) {
-		fprintf(stderr, "Cannot open display!\n");
-		exit(1);
-	}
+	dpy = XOpenDisplay(NULL);
 
 	for (;;) {
 		memset(status_string, 0, sizeof(status_string));
@@ -655,17 +582,16 @@ main(void)
 			element = smprintf(argument.format, res);
 			if (element == NULL) {
 				element = smprintf(UNKNOWN_STR);
-				fprintf(stderr, "Failed to format output.\n");
+				warnx("Failed to format output.");
 			}
 			strlcat(status_string, element, sizeof(status_string));
 			free(res);
 			free(element);
 		}
-
-		setstatus(status_string);
-		sleep(UPDATE_INTERVAL -1);
+		XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+		XSync(dpy, False);
 	}
-
 	XCloseDisplay(dpy);
+
 	return 0;
 }