X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/4dcba6b7e8219e6f06be344aba2035263c5cf3c8..3971c1f47c6b6b7b87a50efa24674c7820d24ac1:/slstatus.c?ds=inline

diff --git a/slstatus.c b/slstatus.c
index e1d271f..0a0f743 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -26,45 +26,45 @@
 #undef strlcat
 #undef strlcpy
 
-#include "arg.h"
-#include "strlcat.h"
-#include "strlcpy.h"
-#include "concat.h"
+#include "extern/arg.h"
+#include "extern/strlcat.h"
+#include "extern/strlcpy.h"
+#include "extern/concat.h"
 
 struct arg {
 	char *(*func)();
-	const char *format;
+	const char *fmt;
 	const char *args;
 };
 
-static char *smprintf(const char *, ...);
-static char *battery_perc(const char *);
-static char *battery_state(const char *);
+static char *smprintf(const char *fmt, ...);
+static char *battery_perc(const char *bat);
+static char *battery_state(const char *bat);
 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 *datetime(const char *fmt);
+static char *disk_free(const char *mnt);
+static char *disk_perc(const char *mnt);
+static char *disk_total(const char *mnt);
+static char *disk_used(const char *mnt);
 static char *entropy(void);
 static char *gid(void);
 static char *hostname(void);
-static char *ip(const char *);
+static char *ip(const char *iface);
 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 *run_command(const char *cmd);
+static char *temp(const char *file);
 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 void set_status(const char *);
-static void sighandler(const int);
+static char *vol_perc(const char *card);
+static char *wifi_perc(const char *iface);
+static char *wifi_essid(const char *iface);
+static void set_status(const char *str);
+static void sighandler(const int signo);
 static void usage(void);
 
 char *argv0;
@@ -89,8 +89,7 @@ smprintf(const char *fmt, ...)
 
 	ret = malloc(++len);
 	if (ret == NULL) {
-		warn("Malloc failed.");
-		exit(1);
+		err(1, "malloc");
 	}
 
 	va_start(ap, fmt);
@@ -270,16 +269,11 @@ static char *
 hostname(void)
 {
 	char buf[HOST_NAME_MAX];
-	FILE *fp;
 
-	fp = fopen("/proc/sys/kernel/hostname", "r");
-	if (fp == NULL) {
-		warn("Failed to open file /proc/sys/kernel/hostname");
+	if (gethostname(buf, sizeof(buf)) == -1) {
+		warn("hostname");
 		return smprintf(UNKNOWN_STR);
 	}
-	fgets(buf, sizeof(buf), fp);
-	buf[strlen(buf)-1] = '\0';
-	fclose(fp);
 
 	return smprintf("%s", buf);
 }
@@ -406,17 +400,19 @@ static char *
 run_command(const char *cmd)
 {
 	FILE *fp;
-	char buf[64] = "\0";
+	char buf[1024] = "n/a";
 
 	fp = popen(cmd, "r");
 	if (fp == NULL) {
 		warn("Failed to get command output for %s", cmd);
 		return smprintf(UNKNOWN_STR);
 	}
-	fgets(buf, sizeof(buf), fp);
-	buf[sizeof(buf)-1] = '\0';
+	fgets(buf, sizeof(buf)-1, fp);
 	pclose(fp);
 
+	buf[strlen(buf)] = '\0';
+	strtok(buf, "\n");
+
 	return smprintf("%s", buf);
 }
 
@@ -502,7 +498,10 @@ vol_perc(const char *card)
 	snd_mixer_selem_id_free(s_elem);
 	snd_mixer_close(handle);
 
-	return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max));
+	if (max == 0)
+		return smprintf("0%%");
+	else
+		return smprintf("%lu%%", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *
@@ -592,15 +591,10 @@ sighandler(const int signo)
 static void
 usage(void)
 {
-	fprintf(stderr,
-		"slstatus (c) 2016, drkhsh\n"
-		"usage: %s [-dho]\n",
-		argv0);
+	fprintf(stderr, "usage: %s [-dhov]\n", argv0);
 	exit(1);
 }
 
-
-
 int
 main(int argc, char *argv[])
 {
@@ -617,6 +611,9 @@ main(int argc, char *argv[])
 		case 'o':
 			oflag = 1;
 			break;
+		case 'v':
+			printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
+			return 0;
 		default:
 			usage();
 	} ARGEND
@@ -624,8 +621,8 @@ main(int argc, char *argv[])
 	if (dflag && oflag) {
 		usage();
 	}
-	if (dflag) {
-		(void)daemon(1, 1);
+	if (dflag && daemon(1, 1) < 0) {
+		err(1, "daemon");
 	}
 
 	memset(&act, 0, sizeof(act));
@@ -633,7 +630,9 @@ main(int argc, char *argv[])
 	sigaction(SIGINT,  &act, 0);
 	sigaction(SIGTERM, &act, 0);
 
-	dpy = XOpenDisplay(NULL);
+	if (!oflag) {
+		dpy = XOpenDisplay(NULL);
+	}
 
 	while (!done) {
 		status_string[0] = '\0';
@@ -645,7 +644,7 @@ main(int argc, char *argv[])
 			} else {
 				res = argument.func(argument.args);
 			}
-			element = smprintf(argument.format, res);
+			element = smprintf(argument.fmt, res);
 			if (element == NULL) {
 				element = smprintf(UNKNOWN_STR);
 				warnx("Failed to format output");
@@ -671,9 +670,8 @@ main(int argc, char *argv[])
 
 	if (!oflag) {
 		set_status(NULL);
+		XCloseDisplay(dpy);
 	}
 
-	XCloseDisplay(dpy);
-
 	return 0;
 }