Your message dated Wed, 22 May 2013 22:44:11 +0200
with message-id <20130522204411.GA3998@graeme>
and subject line Re: Bug#709373: kbd: loadkeys -d no longer works
has caused the Debian Bug report #709373,
regarding kbd: loadkeys -d no longer works
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
709373: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709373
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: kbd
Version: 1.15.3-9
Severity: normal
"loadkeys -d" is supposed to load the default keymap. Instead it loads stdin.
"loadkeys -d somefile" should load the default keymap, then somefile.
This patch fixes all the usage cases, I think, but the loop logic is getting
ugly so you might want to rework it.
Index: kbd-1.15.3/src/loadkeys.y
===================================================================
--- kbd-1.15.3.orig/src/loadkeys.y 2013-05-22 05:32:30.378879662 -0500
+++ kbd-1.15.3/src/loadkeys.y 2013-05-22 05:36:37.890876881 -0500
@@ -1163,7 +1163,8 @@
close(fd);
}
- for (i = optind; argv[i]; i++) {
+ int did_optd = 0;
+ for (i = optind; optd || argv[i]; i++) {
FILE *f;
char *ev;
@@ -1177,8 +1178,10 @@
}
if (optd) {
+ --i;
/* first read default map - search starts in . */
optd = 0;
+ did_optd = 1;
if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) {
fprintf(stderr, _("Cannot find %s\n"), DEFMAP);
exit(EXIT_FAILURE);
@@ -1199,7 +1202,7 @@
parse_keymap(f);
}
- if (optind == argc) {
+ if (optind == argc && !did_optd) {
strcpy(pathname, "<stdin>");
parse_keymap(stdin);
}
-- System Information:
Debian Release: 7.0
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.8.2+ (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Versions of packages kbd depends on:
ii libc6 2.13-38
ii lsb-base 4.1+Debian8
Versions of packages kbd recommends:
ii console-data 2:1.12-2
kbd suggests no packages.
-- Configuration Files:
/etc/kbd/config changed [not included]
/etc/kbd/remap [Errno 2] No such file or directory: u'/etc/kbd/remap'
-- no debconf information
--- End Message ---
--- Begin Message ---
Package: kbd
Version: 1.15.5-1
Hey Alan,
On Wed, May 22, 2013 at 08:05:29PM +0000, Alan Curry wrote:
> "loadkeys -d" is supposed to load the default keymap. Instead it loads stdin.
>
> "loadkeys -d somefile" should load the default keymap, then somefile.
>
> This patch fixes all the usage cases, I think, but the loop logic is getting
> ugly so you might want to rework it.
Thanks for your report and your work on the patch. I’m afraid you’ll
have to live with this in Wheezy. kbd 1.15.4 has fixed this regression
and 1.15.5 is already in Jessie, so I am closing this bug.
All the best,
Michael
signature.asc
Description: Digital signature
--- End Message ---
