X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b1e7c40b2103a4850340044fac685954e76e954b..ac1a57ec30e8729166b6b890a0f33256218d1ef6:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 6deb68c..9e6aca0 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -447,11 +447,11 @@ run_command(const char *cmd)
 		warn("Failed to get command output for %s", cmd);
 		return smprintf("%s", UNKNOWN_STR);
 	}
-	fgets(buf, sizeof(buf) - 1, fp);
+	fgets(buf, sizeof(buf), fp);
 	pclose(fp);
 	buf[sizeof(buf) - 1] = '\0';
 
-	if ((nlptr = strstr(buf, "\n")) != NULL) {
+	if ((nlptr = strrchr(buf, '\n')) != NULL) {
 		nlptr[0] = '\0';
 	}
 
@@ -643,8 +643,7 @@ uptime(void)
 static char *
 username(void)
 {
-	uid_t uid = geteuid();
-	struct passwd *pw = getpwuid(uid);
+	struct passwd *pw = getpwuid(geteuid());
 
 	if (pw == NULL) {
 		warn("Failed to get username");
@@ -668,17 +667,23 @@ vol_perc(const char *card)
 	int v, afd, devmask;
 	char *vnames[] = SOUND_DEVICE_NAMES;
 
-	afd = open(card, O_RDONLY);
-	if (afd < 0) {
+	afd = open(card, O_RDONLY | O_NONBLOCK);
+	if (afd == -1) {
 		warn("Cannot open %s", card);
 		return smprintf(UNKNOWN_STR);
 	}
 
-	ioctl(afd, MIXER_READ(SOUND_MIXER_DEVMASK), &devmask);
+	if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
+		warn("Cannot get volume for %s", card);
+		close(afd);
+		return smprintf("%s", UNKNOWN_STR);
+	}
 	for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) {
-		if (devmask & (1 << i)) {
-			if (!strcmp("vol", vnames[i])) {
-				ioctl(afd, MIXER_READ(i), &v);
+		if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
+			if (ioctl(afd, MIXER_READ(i), &v) == -1) {
+				warn("vol_perc: ioctl");
+				close(afd);
+				return smprintf("%s", UNKNOWN_STR);
 			}
 		}
 	}