From a48308701a4d89d7cc0d0557cfabaec94a0bb3b0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 26 Oct 2009 23:27:08 +0100 Subject: add and use xopen_nonblocking (-18b) Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Denys Vlasenko --- console-tools/kbd_mode.c | 2 +- console-tools/loadfont.c | 2 +- console-tools/loadkmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'console-tools') diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c index 544bbb789..e1d85231c 100644 --- a/console-tools/kbd_mode.c +++ b/console-tools/kbd_mode.c @@ -25,7 +25,7 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv) const char *tty_name = CURRENT_TTY; opt = getopt32(argv, "sakuC:", &tty_name); - fd = xopen(tty_name, O_NONBLOCK); + fd = xopen_nonblocking(tty_name); opt &= 0xf; /* clear -C bit, see (*) */ if (!opt) { /* print current setting */ diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 336418061..e83347432 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -277,7 +277,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv) opts = getopt32(argv, "m:C:", &mapfilename, &tty_name); argv += optind; - fd = xopen(tty_name, O_NONBLOCK); + fd = xopen_nonblocking(tty_name); if (sizeof(CONFIG_DEFAULT_SETFONT_DIR) > 1) { // if not "" if (*argv[0] != '/') { diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index ac2c0a6e0..a6b9a86aa 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c @@ -36,7 +36,7 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) fd = get_console_fd_or_die(); /* or maybe: opt = getopt32(argv, "C:", &tty_name); - fd = xopen(tty_name, O_NONBLOCK); + fd = xopen_nonblocking(tty_name); */ xread(STDIN_FILENO, flags, 7); -- cgit v1.2.3