udev-acl: allow to skip ACL handling

[elogind.git] / extras / keymap / keymap.c

diff --git a/extras/keymap/keymap.c b/extras/keymap/keymap.c
index 18e577a3a44cd209becb9531de3f4d19d1bdca7d..b565c33e2fa010180ad3543b1df8ad16ea90dd8f 100644 (file)
--- a/extras/keymap/keymap.c
+++ b/extras/keymap/keymap.c
@@ -247,7 +247,7 @@ static const char* default_keymap_path(const char* path)
 {
        static char result[PATH_MAX];
 
-       /* If keymap file is given without a path, assume udev diretory; must end with '/' * */
+       /* If keymap file is given without a path, assume udev directory; must end with '/' * */
        if (!strchr(path, '/')) {
                snprintf(result, sizeof(result), "%s%s", LIBEXECDIR "/keymaps/", path);
                return result;
@@ -258,15 +258,22 @@ static const char* default_keymap_path(const char* path)
 static void print_key(struct input_event *event)
 {
        static int cur_scancode = 0;
+       const char *keyname;
 
        /* save scan code for next EV_KEY event */
        if (event->type == EV_MSC && event->code == MSC_SCAN)
            cur_scancode = event->value;
 
        /* key press */
-       if (event->type == EV_KEY && event->value)
-           printf("scan code: 0x%02X   key code: %s\n", cur_scancode,
-                   format_keyname(key_names[event->code]));
+       if (event->type == EV_KEY && event->value) {
+               keyname = key_names[event->code];
+               if (keyname != NULL)
+                       printf("scan code: 0x%02X   key code: %s\n", cur_scancode,
+                           format_keyname(key_names[event->code]));
+               else
+                       printf("scan code: 0x%02X   key code: %03X\n", cur_scancode,
+                           event->code);
+       }
 }
 
 static void interactive(int fd)