From 5cea8590eaa099be8087f363f80d0e6917382385 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Sat, 30 May 2009 00:52:44 +0100 Subject: Use relative path for bios Look for bios and other support files relative to qemu binary, rather than a hardcoded prefix. Signed-off-by: Paul Brook --- keymaps.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'keymaps.c') diff --git a/keymaps.c b/keymaps.c index 3b86dc15eb..23db4a0bdc 100644 --- a/keymaps.c +++ b/keymaps.c @@ -64,20 +64,20 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, kbd_layout_t * k) { FILE *f; - char file_name[1024]; + char * filename; char line[1024]; int len; - snprintf(file_name, sizeof(file_name), - "%s/keymaps/%s", bios_dir, language); + filename = qemu_find_file(QEMU_FILE_TYPE_KEYMAP, language); if (!k) k = qemu_mallocz(sizeof(kbd_layout_t)); - if (!(f = fopen(file_name, "r"))) { + if (!(filename && (f = fopen(filename, "r")))) { fprintf(stderr, - "Could not read keymap file: '%s'\n", file_name); + "Could not read keymap file: '%s'\n", language); return 0; } + qemu_free(filename); for(;;) { if (fgets(line, 1024, f) == NULL) break; -- cgit v1.2.1