Blob Blame History Raw
From d419a0daa59a3afbbc14354feed2701ed2109afb Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Fri, 28 Dec 2018 06:01:10 +0100
Subject: [PATCH] If do_beep() sees error from API, exit program

---
 beep.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/beep.c b/beep.c
index 2a7404e..1b9d8ca 100644
--- a/beep.c
+++ b/beep.c
@@ -114,7 +114,11 @@ void do_beep(unsigned int freq) {
   switch (console_type) {
   case BEEP_TYPE_CONSOLE: if (1) {
       const uintptr_t argp = ((freq != 0) ? (CLOCK_TICK_RATE/freq) : freq) & 0xffff;
-      (void) ioctl(console_fd, KIOCSOUND, argp);
+      if (-1 == ioctl(console_fd, KIOCSOUND, argp)) {
+	/* If we cannot use the sound API, we cannot silence the sound either */
+	perror("ioctl KIOCSOUND");
+	exit(1);
+      }
     }
     break;
   case BEEP_TYPE_EVDEV: if (1) {
@@ -125,7 +129,11 @@ void do_beep(unsigned int freq) {
       e.code = SND_TONE;
       e.value = freq;
 
-      (void) write(console_fd, &e, sizeof(struct input_event));
+      if (sizeof(e) != write(console_fd, &e, sizeof(e))) {
+	/* If we cannot use the sound API, we cannot silence the sound either */
+	perror("write EV_SND");
+	exit(1);
+      }
     }
     break;
   case BEEP_TYPE_UNSET: