diff options
| author | David Leonard <d@cvs.openbsd.org> | 1999-12-12 15:03:49 +0000 |
|---|---|---|
| committer | David Leonard <d@cvs.openbsd.org> | 1999-12-12 15:03:49 +0000 |
| commit | 15d98bab3fa6181d9728063e21766b1e57c64b17 (patch) | |
| tree | 72dafdf083ba8aa32b3d6c61fdf597ac60c5cd9d /games | |
| parent | 189d567f2fc4306e06db1ee2599175fce9fca9ab (diff) | |
Catch some bad draw characters (like NUL).
Use display_beep() instead of write(,"\7",)
Report read errors from stdin.
reviewed by pjanzen@
Diffstat (limited to 'games')
| -rw-r--r-- | games/hunt/hunt/playit.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/games/hunt/hunt/playit.c b/games/hunt/hunt/playit.c index 8444648c49f..4fe9ce34e74 100644 --- a/games/hunt/hunt/playit.c +++ b/games/hunt/hunt/playit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: playit.c,v 1.4 1999/02/01 06:53:55 d Exp $ */ +/* $OpenBSD: playit.c,v 1.5 1999/12/12 15:03:48 d Exp $ */ /* $NetBSD: playit.c,v 1.4 1997/10/20 00:37:15 lukem Exp $ */ /* * Hunt @@ -127,6 +127,8 @@ playit() ch = GETCHR(); /* FALLTHROUGH */ default: + if (!isprint(ch)) + ch = ' '; display_put_ch(ch); if (Otto_mode) switch (ch) { @@ -175,7 +177,7 @@ one_more_time: if (FD_ISSET(STDIN_FILENO, &readfds)) send_stuff(); - if (! FD_ISSET(Socket, &readfds)) + if (!FD_ISSET(Socket, &readfds)) goto one_more_time; icnt = read(Socket, ibuf, sizeof ibuf); if (icnt <= 0) { @@ -201,11 +203,13 @@ send_stuff() /* Drain the user's keystrokes: */ count = read(STDIN_FILENO, Buf, sizeof Buf); - if (count <= 0) + if (count < 0) + err(1, "read"); + if (count == 0) return; if (nchar_send <= 0 && !no_beep) { - (void) write(1, "\7", 1); /* CTRL('G') */ + display_beep(); return; } |