From: Jaroslav Skarvada <jskarvad@redhat.com>
To: Linux console tools development discussion <kbd@lists.altlinux.org>
Subject: Re: [kbd] kbd: loadkeys -d doesn't work
Date: Fri, 21 Oct 2011 10:56:28 -0400 (EDT)
Message-ID: <b4ac641f-87d0-440c-9509-13da9129c169@zmail07.collab.prod.int.phx2.redhat.com> (raw)
In-Reply-To: <4EA14C88.5060302@gmail.com>
----- Original Message -----
> 10.10.2011 11:48, Jaroslav Skarvada wrote:
> > The loadkeys -d doesn't work any more (kbd-1.15.3).
> > According to man and previous behaviour, I think it
> > should work. Possible fix is attached
>
> I fixed this bug in my git. Sorry for long delay.
> Can you confirm fix ?
>
I think it shouldn't read stdin in case of optd
Jaroslav
diff -up kbd-1.15.3/src/loadkeys.c.orig kbd-1.15.3/src/loadkeys.c
--- kbd-1.15.3/src/loadkeys.c.orig 2011-10-21 16:42:09.304296233 +0200
+++ kbd-1.15.3/src/loadkeys.c 2011-10-21 16:41:01.595072657 +0200
@@ -3021,7 +3021,7 @@ int main(int argc, char *argv[])
parse_keymap(f);
}
- if (optind == argc) {
+ if (!optd && optind == argc) {
strcpy(pathname, "<stdin>");
parse_keymap(stdin);
}
diff -up kbd-1.15.3/src/loadkeys.y.orig kbd-1.15.3/src/loadkeys.y
--- kbd-1.15.3/src/loadkeys.y.orig 2011-10-21 12:16:39.000000000 +0200
+++ kbd-1.15.3/src/loadkeys.y 2011-10-21 16:42:41.192924078 +0200
@@ -1210,7 +1210,7 @@ int main(int argc, char *argv[])
parse_keymap(f);
}
- if (optind == argc) {
+ if (!optd && optind == argc) {
strcpy(pathname, "<stdin>");
parse_keymap(stdin);
}
next prev parent reply other threads:[~2011-10-21 14:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-10 7:48 ` Jaroslav Skarvada
2011-10-21 10:42 ` Alexey Gladkov
2011-10-21 14:56 ` Jaroslav Skarvada [this message]
2011-10-21 22:54 ` Alexey Gladkov
2011-10-22 11:35 ` Jaroslav Skarvada
2011-10-22 19:52 ` 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=b4ac641f-87d0-440c-9509-13da9129c169@zmail07.collab.prod.int.phx2.redhat.com \
--to=jskarvad@redhat.com \
--cc=kbd@lists.altlinux.org \
/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
Linux console tools development discussion
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/kbd/0 kbd/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 kbd kbd/ http://lore.altlinux.org/kbd \
kbd@lists.altlinux.org kbd@lists.altlinux.ru kbd@lists.altlinux.com
public-inbox-index kbd
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.kbd
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git