X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/f4a383382cdd4a1aba1bb3f731e14ba85e6d0b4a..cc1bb3a3445696466e9be24f4dae0d9453896eb0:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 34fd951..e7c1c3f 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,11 +1,4 @@
-/*
- * Copyright (C) 2016, drkhsh
- * Copyright (C) 2016, Ali H. Fardan (Raiz) <raiz@firemail.cc>
- * see LICENSE for copyright details
- */
-
-#define _GNU_SOURCE
-#define VERSION "2.0"
+/* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>
 #include <err.h>
@@ -95,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);
@@ -275,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);
 }
@@ -507,7 +496,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 *