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

diff --git a/slstatus.c b/slstatus.c
index ba7f95a..0a0f743 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -269,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);
 }
@@ -405,17 +400,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,9 +499,9 @@ vol_perc(const char *card)
 	snd_mixer_close(handle);
 
 	if (max == 0)
-		return smprintf("%d%%", 0);
+		return smprintf("0%%");
 	else
-		return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max));
+		return smprintf("%lu%%", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *
@@ -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));