diff options
author | Eric Andersen <andersen@codepoet.org> | 2002-09-16 10:22:25 +0400 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2002-09-16 10:22:25 +0400 |
commit | c38678d14b87f8e2d4f0d610d0aa61c656f17539 (patch) | |
tree | 8a08f41faae7672a634f32234dee4b5308cda39c /libbb/get_console.c | |
parent | 166fa4684f33579277f34d887537c2abefc9deb0 (diff) |
Apply vodz' last_patch52
Diffstat (limited to 'libbb/get_console.c')
-rw-r--r-- | libbb/get_console.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libbb/get_console.c b/libbb/get_console.c index 04a6bd1a6..794888fa7 100644 --- a/libbb/get_console.c +++ b/libbb/get_console.c @@ -36,7 +36,7 @@ static const int KDGKBTYPE = 0x4B33; /* get keyboard type */ static const int KB_84 = 0x01; static const int KB_101 = 0x02; /* this is what we always answer */ -int is_a_console(int fd) +static int is_a_console(int fd) { char arg; @@ -82,17 +82,14 @@ static int open_a_console(char *fnam) * if tty_name is non-NULL, try this one instead. */ -int get_console_fd(char *tty_name) +int get_console_fd(void) { int fd; - if (tty_name) { - if (-1 == (fd = open_a_console(tty_name))) + if (-1 == (fd = open_a_console("/dev/console"))) return -1; else return fd; - } - fd = open_a_console(CURRENT_TTY); if (fd >= 0) return fd; |