X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/0fe8e5a961a32e56412a06b4a31a6ba543fd2dfb..8830aeef77392ca0950aa49469ae390b2929c65c:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index 49b14de..d442776 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -6,6 +6,7 @@
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>
+#include <locale.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <signal.h>
@@ -89,8 +90,7 @@ smprintf(const char *fmt, ...)
 
 	ret = malloc(++len);
 	if (ret == NULL) {
-		warn("Malloc failed.");
-		return "n/a";
+		err(1, "malloc");
 	}
 
 	va_start(ap, fmt);
@@ -270,16 +270,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 +401,19 @@ static char *
 run_command(const char *cmd)
 {
 	FILE *fp;
-	char buf[64] = "n/a";
+	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 +499,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 *
@@ -613,7 +613,7 @@ main(int argc, char *argv[])
 			oflag = 1;
 			break;
 		case 'v':
-			printf("%s version %s (c) 2016 slstatus engineers\n", argv0, VERSION);
+			printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
 			return 0;
 		default:
 			usage();
@@ -622,8 +622,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));
@@ -635,6 +635,8 @@ main(int argc, char *argv[])
 		dpy = XOpenDisplay(NULL);
 	}
 
+	setlocale(LC_ALL, "");
+
 	while (!done) {
 		status_string[0] = '\0';