Patch from vodz:

[oweals/busybox.git] / libbb / get_console.c

diff --git a/libbb/get_console.c b/libbb/get_console.c
index 04a6bd1a6eedb1b45246acc4b1e2293001431cd0..1b24ceb57732703cddebbc0a85242d9bf4f62a3d 100644 (file)
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -2,8 +2,8 @@
 /*
  * Utility routines.
  *
- * Copyright (C) many different people.  If you wrote this, please
- * acknowledge your work.
+ * Copyright (C) many different people.  
+ * If you wrote this, please acknowledge your work.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
@@ -109,7 +106,7 @@ int get_console_fd(char *tty_name)
                if (is_a_console(fd))
                        return fd;
 
-       error_msg("Couldn't get a file descriptor referring to the console");
+       bb_error_msg("Couldn't get a file descriptor referring to the console");
        return -1;                                      /* total failure */
 }