diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/get_console.c | 8 | ||||
| -rw-r--r-- | libbb/libbb.h | 28 |
2 files changed, 32 insertions, 4 deletions
diff --git a/libbb/get_console.c b/libbb/get_console.c index 4be9adc84..3b36a59e7 100644 --- a/libbb/get_console.c +++ b/libbb/get_console.c @@ -98,15 +98,15 @@ int get_console_fd(char *tty_name) 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 +114,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"); + error_msg("Couldn't get a file descriptor referring to the console"); return -1; /* total failure */ } diff --git a/libbb/libbb.h b/libbb/libbb.h index c167e10bc..3cf932dc4 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -288,4 +288,32 @@ extern const char * const name_longer_than_foo; extern const char * const unknown; extern const char * const can_not_create_raw_socket; +#ifdef BB_FEATURE_DEVFS +# define CURRENT_VC "/dev/vc/0" +# define VC_1 "/dev/vc/1" +# define VC_2 "/dev/vc/2" +# define VC_3 "/dev/vc/3" +# define VC_4 "/dev/vc/4" +# define VC_5 "/dev/vc/5" +# define SC_0 "/dev/tts/0" +# define SC_1 "/dev/tts/1" +# define VC_FORMAT "/dev/vc/%d" +# define SC_FORMAT "/dev/tts/%d" +#else +# define CURRENT_VC "/dev/tty0" +# define VC_1 "/dev/tty1" +# define VC_2 "/dev/tty2" +# define VC_3 "/dev/tty3" +# define VC_4 "/dev/tty4" +# define VC_5 "/dev/tty5" +# define SC_0 "/dev/ttyS0" +# define SC_1 "/dev/ttyS1" +# define VC_FORMAT "/dev/tty%d" +# define SC_FORMAT "/dev/ttyS%d" +#endif + +/* The following devices are the same on devfs and non-devfs systems. */ +#define CURRENT_TTY "/dev/tty" +#define CONSOLE_DEV "/dev/console" + #endif /* __LIBBB_H__ */ |