Merge pull request #20 from R41z/master fix division by zero in vol_perc, and hostname() rewrite
Aaron Marcher info@nulltime.net
Sun, 09 Oct 2016 13:50:02 +0200
1 files changed,
6 insertions(+),
7 deletions(-)
jump to
M
slstatus.c
→
slstatus.c
@@ -271,14 +271,10 @@ {
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); }@@ -501,7 +497,10 @@
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 *