#include "keys-from-name.h"
#include "keys-to-name.h"
+#include "util.h"
#define MAX_SCANCODES 1024
int fd;
char fn[PATH_MAX];
- if (strncmp(dev, "/dev", 4) != 0) {
+ if (!startswith(dev, "/dev")) {
snprintf(fn, sizeof(fn), "/dev/%s", dev);
dev = fn;
}
/* Keymap file argument is a filename */
/* Open override file if present, otherwise default file */
char keymap_path[PATH_MAX];
+ FILE *f;
snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
- FILE *f = fopen(keymap_path, "r");
+ f = fopen(keymap_path, "r");
if (f) {
merge_table(fd, f);
} else {