kbd/kbd-1.15.2-dumpkeys-C-opt.patch

Index: docs/man/man1/dumpkeys.1.in
===================================================================
--- docs/man/man1/dumpkeys.1.in.orig	2013-08-27 22:45:33.000000000 +0200
+++ docs/man/man1/dumpkeys.1.in	2014-09-12 13:42:01.557871837 +0200
@@ -4,6 +4,7 @@
 dumpkeys \- dump keyboard translation tables
 .SH SYNOPSIS
 .B dumpkeys
+.RI [ \-C\ '<vc>' | \-\-console='<vc>' ]
 [
 .B \-hilfn
 .BI \-c charset
@@ -197,6 +198,12 @@
 loadkeys how to interpret the keymap. (For example, "division" is
 0xf7 in iso-8859-1 but 0xba in iso-8859-8.)
 .LP
+The affected console device can be specified using the 
+.I -C 
+(or
+.I --console
+) option. This option supports exactly one device name.
+.LP
 .SH FILES
 .PD 0
 .TP 20
Index: src/dumpkeys.c
===================================================================
--- src/dumpkeys.c.orig	2014-06-15 20:33:18.000000000 +0200
+++ src/dumpkeys.c	2014-09-12 13:47:09.633866557 +0200
@@ -41,6 +41,8 @@
 	   --funcs-only	    display only the function key strings\n\
 	   --keys-only	    display only key bindings\n\
 	   --compose-only   display only compose key combinations\n\
+	-C <vc>\n\
+	   --console=<vc>   Indicate the virtual console device to be used.\n\
 	-c --charset="));
 	lk_list_charsets(stderr);
 	fprintf(stderr, _("\
@@ -52,7 +54,7 @@
 
 int
 main (int argc, char *argv[]) {
-	const char *short_opts = "hilvsnf1tkdS:c:V";
+	const char *short_opts = "hilvsnf1tkdS:C:c:V";
 	const struct option long_opts[] = {
 		{ "help",	no_argument,		NULL, 'h' },
 		{ "short-info",	no_argument,		NULL, 'i' },
@@ -65,6 +67,7 @@
 		{ "keys-only",	no_argument,		NULL, 'k' },
 		{ "compose-only",no_argument,		NULL, 'd' },
 		{ "charset",	required_argument,	NULL, 'c' },
+		{ "console",	required_argument,	NULL, 'C' },
 		{ "verbose",	no_argument,		NULL, 'v' },
 		{ "version",	no_argument,		NULL, 'V' },
 		{ NULL,	0, NULL, 0 }
@@ -79,6 +82,7 @@
 	char funcs_only = 0;
 	char keys_only = 0;
 	char diac_only = 0;
+        char * console = NULL;
 
 	struct lk_ctx *ctx;
 
@@ -135,6 +139,9 @@
 				}
 				printf("charset \"%s\"\n", optarg);
 				break;
+			case 'C':
+				console = optarg;
+				break;
 			case 'V':
 				print_version_and_exit();
 			case 'h':
@@ -146,7 +153,7 @@
 	if (optind < argc)
 		usage();
 
-	fd = getfd(NULL);
+	fd = getfd(console);
 
 	/* check whether the keyboard is in Unicode mode */
 	if (ioctl(fd, KDGKBMODE, &kbd_mode)) {