X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/bad8dc682dc81018a7f95080b5720cc467c17a6f..5e7aa2a321c0a60c03021b0f25bec1c15a713dab:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index fd27570..6417305 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -88,8 +88,9 @@ smprintf(const char *fmt, ...)
 	va_end(ap);
 
 	ret = malloc(++len);
-	if (ret == NULL)
+	if (ret == NULL) {
 		err(1, "malloc");
+	}
 
 	va_start(ap, fmt);
 	vsnprintf(ret, len, fmt, ap);
@@ -270,14 +271,10 @@ 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(1, "hostname");
 		return smprintf(UNKNOWN_STR);
 	}
-	fgets(buf, sizeof(buf), fp);
-	buf[strlen(buf)-1] = '\0';
-	fclose(fp);
 
 	return smprintf("%s", buf);
 }
@@ -500,7 +497,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("%d%%", 0);
+	else
+		return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *