Patch from vodz:

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

diff --git a/libbb/get_console.c b/libbb/get_console.c
index 4be9adc84166ef1688099e64891e7c515f30d157..1b24ceb57732703cddebbc0a85242d9bf4f62a3d 100644 (file)
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -2,9 +2,8 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to 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
@@ -19,10 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
- *
  */
 
 #include <stdio.h>
@@ -41,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;
 
@@ -87,26 +82,23 @@ 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("/dev/tty");
+       fd = open_a_console(CURRENT_TTY);
        if (fd >= 0)
                return fd;
 
-       fd = open_a_console("/dev/tty0");
+       fd = open_a_console(CURRENT_VC);
        if (fd >= 0)
                return fd;
 
-       fd = open_a_console("/dev/console");
+       fd = open_a_console(CONSOLE_DEV);
        if (fd >= 0)
                return fd;
 
@@ -114,7 +106,7 @@ int get_console_fd(char *tty_name)
                if (is_a_console(fd))
                        return fd;
 
-       error_msg("Couldnt 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 */
 }