summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko2008-08-05 23:32:27 +0000
committerDenis Vlasenko2008-08-05 23:32:27 +0000
commit2afd5ab62ca5f2438a3953f37e738f73553595da (patch)
treef6406254bd52e449ac58851e370774ed29e449c2 /libbb
parente0143a1aad60e9141245034379469477006dba81 (diff)
downloadbusybox-2afd5ab62ca5f2438a3953f37e738f73553595da.zip
busybox-2afd5ab62ca5f2438a3953f37e738f73553595da.tar.gz
*: use get_console_fd() as appropriate, and make it fail on open error -
get_console_fd_or_die(). function old new delta get_console_fd_or_die - 163 +163 loadkmap_main 211 201 -10 loadfont_main 440 430 -10 dumpkmap_main 218 208 -10 kbd_mode_main 158 146 -12 setkeycodes_main 156 143 -13 get_console_fd 163 - -163 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/5 up/down: 163/-218) Total: -55 bytes
Diffstat (limited to 'libbb')
-rw-r--r--libbb/get_console.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/get_console.c b/libbb/get_console.c
index d042afa..ad56e74 100644
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -38,7 +38,7 @@ static int open_a_console(const char *fnam)
* if someone else used X (which does a chown on /dev/console).
*/
-int FAST_FUNC get_console_fd(void)
+int FAST_FUNC get_console_fd_or_die(void)
{
static const char *const console_names[] = {
DEV_CONSOLE, CURRENT_VC, CURRENT_TTY
@@ -65,8 +65,8 @@ int FAST_FUNC get_console_fd(void)
}
}
- bb_error_msg("can't open console");
- return fd; /* total failure */
+ bb_error_msg_and_die("can't open console");
+ /*return fd; - total failure */
}
/* From <linux/vt.h> */