From: Olivier Mehani <shtrom@ssji.net>
To: <kbd@lists.altlinux.org>
Cc: Olivier Mehani <olivier.mehani@nicta.com.au>
Subject: [kbd] [PATCH] [loadkeys] Don't open console on --bkeymap
Date: Sun, 25 Apr 2010 17:12:08 +1000 [thread overview]
Message-ID: <1272179528-32543-1-git-send-email-shtrom@ssji.net> (raw)
From: Olivier Mehani <olivier.mehani@nicta.com.au>
Check that -b hasn't specified, similarly to -m, before loadkeys tries to open
the console. As for --mktable, --bkeymap doesn't need it. This allows to dump
binary keymaps in a larger range of situations where ownership of the console
device is not guarranteed e.g., when running from an Xterm.
Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>
---
src/loadkeys.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/loadkeys.c b/src/loadkeys.c
index a827f8e..a610722 100644
--- a/src/loadkeys.c
+++ b/src/loadkeys.c
@@ -2090,7 +2090,7 @@ main(int argc, char *argv[]) {
}
prefer_unicode = optu;
- if (!optm) {
+ if (!optm && !optb) {
/* check whether the keyboard is in Unicode mode */
fd = getfd(NULL);
if (ioctl(fd, KDGKBMODE, &kbd_mode)) {
--
1.7.0.5
next reply other threads:[~2010-04-25 7:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-25 7:12 Olivier Mehani [this message]
2010-04-25 9:57 ` [kbd] [PATCH] [loadkeys] Don't open console on --bkeymap Alexey Gladkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1272179528-32543-1-git-send-email-shtrom@ssji.net \
--to=shtrom@ssji.net \
--cc=kbd@lists.altlinux.org \
--cc=olivier.mehani@nicta.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).