6f7f04e747
+- Use new upstream tarball beep-1.3.tar.gz (yes, it has changed!) +- Add a few fixes from upstream git repo +- Move our Makefile cleanup to upstream pull request
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From d3aee6c489852108c91dc22abcacff364e9429f2 Mon Sep 17 00:00:00 2001
|
|
From: Chris Wong <chrisyco@gmail.com>
|
|
Date: Wed, 23 Nov 2011 11:34:55 +1300
|
|
Subject: [PATCH 2/6] Add more error detection
|
|
|
|
---
|
|
beep.c | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/beep.c b/beep.c
|
|
index 452fc08..14fac3e 100644
|
|
--- a/beep.c
|
|
+++ b/beep.c
|
|
@@ -98,11 +98,11 @@ char *console_device = NULL;
|
|
|
|
|
|
void do_beep(int freq) {
|
|
- if (console_type == BEEP_TYPE_CONSOLE) {
|
|
- if(ioctl(console_fd, KIOCSOUND, freq != 0
|
|
- ? (int)(CLOCK_TICK_RATE/freq)
|
|
- : freq) < 0) {
|
|
- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
|
|
+ int period = (freq != 0 ? (int)(CLOCK_TICK_RATE/freq) : freq);
|
|
+
|
|
+ if(console_type == BEEP_TYPE_CONSOLE) {
|
|
+ if(ioctl(console_fd, KIOCSOUND, period) < 0) {
|
|
+ putchar('\a'); /* Output the only beep we can, in an effort to fall back on usefulness */
|
|
perror("ioctl");
|
|
}
|
|
} else {
|
|
@@ -113,7 +113,10 @@ void do_beep(int freq) {
|
|
e.code = SND_TONE;
|
|
e.value = freq;
|
|
|
|
- write(console_fd, &e, sizeof(struct input_event));
|
|
+ if(write(console_fd, &e, sizeof(struct input_event)) < 0) {
|
|
+ putchar('\a'); /* See above */
|
|
+ perror("write");
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
1.8.4.2
|
|
|