slstatus

Unnamed repository; edit this file 'description' to name the repository.
git clone https://git.beauhilton.com/slstatus.git
Log | Files | Refs | README | LICENSE

commit 5e7aa2a321c0a60c03021b0f25bec1c15a713dab
parent 6239e5de17cd1e008f5dfc532d4549642217101c
Author: Aaron Marcher <info@nulltime.net>
Date:   Sun,  9 Oct 2016 13:50:02 +0200

Merge pull request #20 from R41z/master

fix division by zero in vol_perc, and hostname() rewrite
Diffstat:
Mslstatus.c | 13++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/slstatus.c b/slstatus.c @@ -271,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); } @@ -501,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 *