diff options
| author | Bernhard Reutner-Fischer | 2009-10-26 23:27:08 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2009-10-27 17:17:34 +0100 |
| commit | a48308701a4d89d7cc0d0557cfabaec94a0bb3b0 (patch) | |
| tree | a7b2baa086249a6c37c3479f28f4a680a1133a64 /console-tools | |
| parent | ca254490d703c750390042c9afa21d1537c90e9a (diff) | |
| download | busybox-a48308701a4d89d7cc0d0557cfabaec94a0bb3b0.zip busybox-a48308701a4d89d7cc0d0557cfabaec94a0bb3b0.tar.gz | |
add and use xopen_nonblocking (-18b)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/kbd_mode.c | 2 | ||||
| -rw-r--r-- | console-tools/loadfont.c | 2 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c index 544bbb7..e1d8523 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 3364180..e833474 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 ac2c0a6..a6b9a86 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); |