X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/2e1eb518afea7c93e3ba750804f1f4c4d0a51af4..24c4134df6e0f7dc86e5f3c57342d2b60b1e5dab:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 3ea29d1..90534d9 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -29,45 +29,45 @@
 #include "strlcat.h"
 #include "strlcpy.h"
 
-typedef char *(*op_fun) (const char *);
+typedef char *(*op_fun)();
 struct arg {
 	op_fun func;
 	const char *format;
 	const char *args;
 };
 
-void setstatus(const char *);
-char *smprintf(const char *, ...);
-char *battery_perc(const char *);
-char *cpu_perc(const char *);
-char *datetime(const char *);
-char *disk_free(const char *);
-char *disk_perc(const char *);
-char *disk_total(const char *);
-char *disk_used(const char *);
-char *entropy(const char *);
-char *gid(const char *);
-char *hostname(const char *);
-char *ip(const char *);
-char *load_avg(const char *);
-char *ram_free(const char *);
-char *ram_perc(const char *);
-char *ram_used(const char *);
-char *ram_total(const char *);
-char *run_command(const char *);
-char *temp(const char *);
-char *uid(const char *);
-char *uptime(const char *);
-char *username(const char *);
-char *vol_perc(const char *);
-char *wifi_perc(const char *);
-char *wifi_essid(const char *);
+static void setstatus(const char *);
+static char *smprintf(const char *, ...);
+static char *battery_perc(const char *);
+static char *cpu_perc(void);
+static char *datetime(const char *);
+static char *disk_free(const char *);
+static char *disk_perc(const char *);
+static char *disk_total(const char *);
+static char *disk_used(const char *);
+static char *entropy(void);
+static char *gid(void);
+static char *hostname(void);
+static char *ip(const char *);
+static char *load_avg(void);
+static char *ram_free(void);
+static char *ram_perc(void);
+static char *ram_used(void);
+static char *ram_total(void);
+static char *run_command(const char *);
+static char *temp(const char *);
+static char *uid(void);
+static char *uptime(void);
+static char *username(void);
+static char *vol_perc(const char *);
+static char *wifi_perc(const char *);
+static char *wifi_essid(const char *);
 
 static Display *dpy;
 
 #include "config.h"
 
-void
+static void
 setstatus(const char *str)
 {
 	/* set WM_NAME via X11 */
@@ -75,41 +75,44 @@ setstatus(const char *str)
 	XSync(dpy, False);
 }
 
-char *
+static char *
 smprintf(const char *fmt, ...)
 {
 	va_list fmtargs;
+	char tmp[120];
 	char *ret = NULL;
 
 	va_start(fmtargs, fmt);
-	if (vasprintf(&ret, fmt, fmtargs) < 0)
+	snprintf(tmp, sizeof(tmp)-1, fmt, fmtargs);
+	tmp[sizeof(tmp)] = '\0';
+	if (asprintf(&ret, "%s", tmp) < 0)
 		return NULL;
-	va_end(fmtargs);
 
+	va_end(fmtargs);
 	return ret;
 }
 
-char *
+static char *
 battery_perc(const char *battery)
 {
 	int now, full, perc;
-	char batterynowfile[64] = "";
-	char batteryfullfile[64] = "";
+	char batterynowfile[64];
+	char batteryfullfile[64];
 	FILE *fp;
 
-	strlcat(batterynowfile, batterypath, sizeof(batterynowfile));
+	strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
 	strlcat(batterynowfile, battery, sizeof(batterynowfile));
 	strlcat(batterynowfile, "/", sizeof(batterynowfile));
-	strlcat(batterynowfile, batterynow, sizeof(batterynowfile));
+	strlcat(batterynowfile, BATTERY_NOW, sizeof(batterynowfile));
 
-	strlcat(batteryfullfile, batterypath, sizeof(batteryfullfile));
+	strlcpy(batteryfullfile, BATTERY_PATH, sizeof(batteryfullfile));
 	strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
 	strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
-	strlcat(batteryfullfile, batteryfull, sizeof(batteryfullfile));
+	strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
 
 	if (!(fp = fopen(batterynowfile, "r"))) {
 		fprintf(stderr, "Error opening battery file: %s.\n", batterynowfile);
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%i", &now);
@@ -117,7 +120,7 @@ battery_perc(const char *battery)
 
 	if (!(fp = fopen(batteryfullfile, "r"))) {
 		fprintf(stderr, "Error opening battery file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%i", &full);
@@ -128,8 +131,8 @@ battery_perc(const char *battery)
 	return smprintf("%d%%", perc);
 }
 
-char *
-cpu_perc(const char *null)
+static char *
+cpu_perc(void)
 {
 	int perc;
 	long double a[4], b[4];
@@ -137,7 +140,7 @@ cpu_perc(const char *null)
 
 	if (!(fp = fopen("/proc/stat","r"))) {
 		fprintf(stderr, "Error opening stat file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
@@ -148,7 +151,7 @@ cpu_perc(const char *null)
 
 	if (!(fp = fopen("/proc/stat","r"))) {
 		fprintf(stderr, "Error opening stat file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
@@ -157,7 +160,7 @@ cpu_perc(const char *null)
 	return smprintf("%d%%", perc);
 }
 
-char *
+static char *
 datetime(const char *timeformat)
 {
 	time_t tm;
@@ -165,7 +168,7 @@ datetime(const char *timeformat)
 	char *buf = malloc(bufsize);
 	if (buf == NULL) {
 		fprintf(stderr, "Failed to get date/time.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	time(&tm);
@@ -174,7 +177,7 @@ datetime(const char *timeformat)
 		setlocale(LC_TIME, "C");
 		free(buf);
 		fprintf(stderr, "Strftime failed.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	setlocale(LC_TIME, "C");
@@ -183,19 +186,19 @@ datetime(const char *timeformat)
 	return ret;
 }
 
-char *
+static char *
 disk_free(const char *mountpoint)
 {
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
 		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
 }
 
-char *
+static char *
 disk_perc(const char *mountpoint)
 {
 	int perc = 0;
@@ -203,48 +206,48 @@ disk_perc(const char *mountpoint)
 
 	if (statvfs(mountpoint, &fs) < 0) {
 		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
 	return smprintf("%d%%", perc);
 }
 
-char *
+static char *
 disk_total(const char *mountpoint)
 {
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
 		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
 }
 
-char *
+static char *
 disk_used(const char *mountpoint)
 {
 	struct statvfs fs;
 
 	if (statvfs(mountpoint, &fs) < 0) {
 		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
 }
 
-char *
-entropy(const char *null)
+static char *
+entropy(void)
 {
 	int entropy = 0;
 	FILE *fp;
 
 	if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
 		fprintf(stderr, "Could not open entropy file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%d", &entropy);
@@ -252,28 +255,22 @@ entropy(const char *null)
 	return smprintf("%d", entropy);
 }
 
-char *
-gid(const char *null)
+static char *
+gid(void)
 {
-	gid_t gid;
-
-	if ((gid = getgid()) < 0) {
-		fprintf(stderr, "Could no get gid.\n");
-		return smprintf(unknowntext);
-	} else
-		return smprintf("%d", gid);
-	return smprintf(unknowntext);
+	gid_t gid = getgid();
+	return smprintf("%d", gid);
 }
 
-char *
-hostname(const char *null)
+static char *
+hostname(void)
 {
 	char hostname[HOST_NAME_MAX];
 	FILE *fp;
 
 	if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
 		fprintf(stderr, "Could not open hostname file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%s\n", hostname);
@@ -281,7 +278,7 @@ hostname(const char *null)
 	return smprintf("%s", hostname);
 }
 
-char *
+static char *
 ip(const char *interface)
 {
 	struct ifaddrs *ifaddr, *ifa;
@@ -290,7 +287,7 @@ ip(const char *interface)
 
 	if (getifaddrs(&ifaddr) == -1) {
 		fprintf(stderr, "Error getting IP address.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	/* get the ip address */
@@ -303,7 +300,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");
-				return smprintf(unknowntext);
+				return smprintf(UNKNOWN_STR);
 			}
 			return smprintf("%s", host);
 		}
@@ -312,31 +309,31 @@ ip(const char *interface)
 	/* free the address */
 	freeifaddrs(ifaddr);
 
-	return smprintf(unknowntext);
+	return smprintf(UNKNOWN_STR);
 }
 
-char *
-load_avg(const char *null)
+static char *
+load_avg(void)
 {
 	double avgs[3];
 
 	if (getloadavg(avgs, 3) < 0) {
 		fprintf(stderr, "Error getting load avg.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
 }
 
-char *
-ram_free(const char *null)
+static char *
+ram_free(void)
 {
 	long free;
 	FILE *fp;
 
 	if (!(fp = fopen("/proc/meminfo", "r"))) {
 		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "MemFree: %ld kB\n", &free);
@@ -344,8 +341,8 @@ ram_free(const char *null)
 	return smprintf("%f", (float)free / 1024 / 1024);
 }
 
-char *
-ram_perc(const char *null)
+static char *
+ram_perc(void)
 {
 	int perc;
 	long total, free, buffers, cached;
@@ -353,7 +350,7 @@ ram_perc(const char *null)
 
 	if (!(fp = fopen("/proc/meminfo", "r"))) {
 		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "MemTotal: %ld kB\n", &total);
@@ -366,15 +363,15 @@ ram_perc(const char *null)
 	return smprintf("%d%%", perc);
 }
 
-char *
-ram_total(const char *null)
+static char *
+ram_total(void)
 {
 	long total;
 	FILE *fp;
 
 	if (!(fp = fopen("/proc/meminfo", "r"))) {
 		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "MemTotal: %ld kB\n", &total);
@@ -382,15 +379,15 @@ ram_total(const char *null)
 	return smprintf("%f", (float)total / 1024 / 1024);
 }
 
-char *
-ram_used(const char *null)
+static char *
+ram_used(void)
 {
 	long free, total, buffers, cached, used;
 	FILE *fp;
 
 	if (!(fp = fopen("/proc/meminfo", "r"))) {
 		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "MemTotal: %ld kB\n", &total);
@@ -403,7 +400,7 @@ ram_used(const char *null)
 	return smprintf("%f", (float)used / 1024 / 1024);
 }
 
-char *
+static char *
 run_command(const char* command)
 {
 	int good;
@@ -412,7 +409,7 @@ run_command(const char* command)
 
 	if (!(fp = popen(command, "r"))) {
 		fprintf(stderr, "Could not get command output for: %s.\n", command);
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fgets(buffer, sizeof(buffer) - 1, fp);
@@ -428,7 +425,7 @@ run_command(const char* command)
 	return smprintf("%s", buffer);
 }
 
-char *
+static char *
 temp(const char *file)
 {
 	int temperature;
@@ -436,7 +433,7 @@ temp(const char *file)
 
 	if (!(fp = fopen(file, "r"))) {
 		fprintf(stderr, "Could not open temperature file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fscanf(fp, "%d", &temperature);
@@ -444,8 +441,8 @@ temp(const char *file)
 	return smprintf("%d°C", temperature / 1000);
 }
 
-char *
-uptime(const char *null)
+static char *
+uptime(void)
 {
 	struct sysinfo info;
 	int hours = 0;
@@ -458,8 +455,8 @@ uptime(const char *null)
 	return smprintf("%dh %dm", hours, minutes);
 }
 
-char *
-username(const char *null)
+static char *
+username(void)
 {
 	register struct passwd *pw;
 	register uid_t uid;
@@ -471,14 +468,14 @@ username(const char *null)
 		return smprintf("%s", pw->pw_name);
 	else {
 		fprintf(stderr, "Could not get username.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
-	return smprintf(unknowntext);
+	return smprintf(UNKNOWN_STR);
 }
 
-char *
-uid(const char *null)
+static char *
+uid(void)
 {
 	register uid_t uid;
 
@@ -488,14 +485,14 @@ uid(const char *null)
 		return smprintf("%d", uid);
 	else {
 		fprintf(stderr, "Could not get uid.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
-	return smprintf(unknowntext);
+	return smprintf(UNKNOWN_STR);
 }
 
 
-char *
+static char *
 vol_perc(const char *soundcard)
 {
 	int mute = 0;
@@ -513,10 +510,10 @@ vol_perc(const char *soundcard)
 	snd_mixer_selem_id_malloc(&mute_info);
 	if (vol_info == NULL || mute_info == NULL) {
 		fprintf(stderr, "Could not get alsa volume.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
-	snd_mixer_selem_id_set_name(vol_info, channel);
-	snd_mixer_selem_id_set_name(mute_info, channel);
+	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);
 
@@ -537,7 +534,7 @@ vol_perc(const char *soundcard)
 		return smprintf("%d%%", (vol * 100) / max);
 }
 
-char *
+static char *
 wifi_perc(const char *wificard)
 {
 	int bufsize = 255;
@@ -556,17 +553,17 @@ wifi_perc(const char *wificard)
 
 	if(!(fp = fopen(path, "r"))) {
 		fprintf(stderr, "Error opening wifi operstate file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	fgets(status, 5, fp);
 	fclose(fp);
 	if(strcmp(status, "up\n") != 0)
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 
 	if (!(fp = fopen("/proc/net/wireless", "r"))) {
 		fprintf(stderr, "Error opening wireless file.\n");
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	strlcpy(needle, wificard, sizeof(needle));
@@ -583,7 +580,7 @@ wifi_perc(const char *wificard)
 	return smprintf("%d%%", strength);
 }
 
-char *
+static char *
 wifi_essid(const char *wificard)
 {
 	char id[IW_ESSID_MAX_SIZE+1];
@@ -595,16 +592,16 @@ wifi_essid(const char *wificard)
 	sprintf(wreq.ifr_name, wificard);
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
 		fprintf(stderr, "Cannot open socket for interface: %s\n", wificard);
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 	wreq.u.essid.pointer = id;
 	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
 		fprintf(stderr, "Get ESSID ioctl failed for interface %s\n", wificard);
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	}
 
 	if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
-		return smprintf(unknowntext);
+		return smprintf(UNKNOWN_STR);
 	else
 		return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
@@ -612,7 +609,9 @@ wifi_essid(const char *wificard)
 int
 main(void)
 {
-	char status_string[1024];
+	size_t i;
+	char status_string[4096];
+	char *res, *element;
 	struct arg argument;
 
 	if (!(dpy = XOpenDisplay(0x0))) {
@@ -622,12 +621,15 @@ main(void)
 
 	for (;;) {
 		memset(status_string, 0, sizeof(status_string));
-		for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
+		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
 			argument = args[i];
-			char *res = argument.func(argument.args);
-			char *element = smprintf(argument.format, res);
+			if (argument.args == NULL)
+				res = argument.func();
+			else
+				res = argument.func(argument.args);
+			element = smprintf(argument.format, res);
 			if (element == NULL) {
-				element = smprintf(unknowntext);
+				element = smprintf(UNKNOWN_STR);
 				fprintf(stderr, "Failed to format output.\n");
 			}
 			strlcat(status_string, element, sizeof(status_string));
@@ -636,7 +638,7 @@ main(void)
 		}
 
 		setstatus(status_string);
-		sleep(update_interval -1);
+		sleep(UPDATE_INTERVAL -1);
 	}
 
 	XCloseDisplay(dpy);