From 338268d09fa2c32ee8c8da0525b366315c4a59c6 Mon Sep 17 00:00:00 2001 From: andersen Date: Mon, 16 Sep 2002 06:22:25 +0000 Subject: Apply vodz' last_patch52 git-svn-id: svn://busybox.net/trunk/busybox@5496 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- libbb/get_console.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libbb') 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; -- cgit v1.2.3-55-g6feb